net: phy: remove preliminary workaround for not loading PHY driver

This workaround attempt helped for some but not all affected users.
With commit 11287b693d03 ("r8169: load Realtek PHY driver module
before r8169") we have a better workaround now, so we an remove
the first attempt.

Signed-off-by: Heiner Kallweit <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 51990002d495e65eb857490d4f23d75788bf86e1..a2423cbb218dfe8083ccbb7cd55db7da57447be0 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -2250,14 +2250,6 @@ int phy_driver_register(struct phy_driver *new_driver, struct module *owner)
        new_driver->mdiodrv.driver.remove = phy_remove;
        new_driver->mdiodrv.driver.owner = owner;
 
-       /* The following works around an issue where the PHY driver doesn't bind
-        * to the device, resulting in the genphy driver being used instead of
-        * the dedicated driver. The root cause of the issue isn't known yet
-        * and seems to be in the base driver core. Once this is fixed we may
-        * remove this workaround.
-        */
-       new_driver->mdiodrv.driver.probe_type = PROBE_FORCE_SYNCHRONOUS;
-
        retval = driver_register(&new_driver->mdiodrv.driver);
        if (retval) {
                pr_err("%s: Error %d in registering driver\n",