mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

net: phy: improve phy_init_hw

Browse source 
Currently the soft reset (if defined) is done only if the driver also
implements the config_init callback. I think this dependency is a
mistake, so let's remove it.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2019-01-19 10:43:07 +01:00 committed by David S. Miller
parent 21e194425a
commit a5996989d5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/phy/phy_device.c
View file

@ -1072,7 +1072,7 @@ int phy_init_hw(struct phy_device *phydev)
/* Deassert the reset signal */
phy_device_reset(phydev, 0);
if (!phydev->drv || !phydev->drv->config_init)
if (!phydev->drv)
return 0;
if (phydev->drv->soft_reset)
@ -1085,7 +1085,10 @@ int phy_init_hw(struct phy_device *phydev)
if (ret < 0)
return ret;
return phydev->drv->config_init(phydev);
if (phydev->drv->config_init)
ret = phydev->drv->config_init(phydev);
return ret;
}
EXPORT_SYMBOL(phy_init_hw);