net: phy: reset the PHY even if probe() is not implemented (1dba6995) · Commits · 戴 / test

Currently we only call phy_device_reset() if the PHY driver implements the probe() callback. This is not mandatory and many drivers (e.g. realtek) don't need probe() for most devices but still can have reset GPIOs defined. There's no reason to depend on the presence of probe() here so pull the reset code out of the if clause. Signed-off-by:

Bartosz Golaszewski <bgolaszewski@baylibre.com> Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Reviewed-by:

Florian Fainelli <f.fainelli@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/phy_device.c

+12 −11

Original line number	Diff line number	Diff line
		@@ -2846,17 +2846,14 @@ static int phy_probe(struct device *dev)

		mutex_lock(&phydev->lock);

		if (phydev->drv->probe) {
		/* Deassert the reset signal */
		phy_device_reset(phydev, 0);

		if (phydev->drv->probe) {
		err = phydev->drv->probe(phydev);
		if (err) {
		/* Assert the reset signal */
		phy_device_reset(phydev, 1);
		if (err)
		goto out;
		}
		}

		/* Start out supporting everything. Eventually,
		* a controller will attach, and may modify one
		@@ -2917,6 +2914,10 @@ static int phy_probe(struct device *dev)
		phydev->state = PHY_READY;

		out:
		/* Assert the reset signal */
		if (err)
		phy_device_reset(phydev, 1);

		mutex_unlock(&phydev->lock);

		return err;
		@@ -2935,12 +2936,12 @@ static int phy_remove(struct device *dev)
		sfp_bus_del_upstream(phydev->sfp_bus);
		phydev->sfp_bus = NULL;

		if (phydev->drv && phydev->drv->remove) {
		if (phydev->drv && phydev->drv->remove)
		phydev->drv->remove(phydev);

		/* Assert the reset signal */
		phy_device_reset(phydev, 1);
		}

		phydev->drv = NULL;

		return 0;

Admin message