37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 2613f95f614b39681f77a5036046ea395e306e28 Mon Sep 17 00:00:00 2001
|
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Date: Fri, 6 Dec 2013 13:01:31 -0800
|
|
Subject: [PATCH] net: phy: use phy_init_hw instead of open-coding it
|
|
|
|
Use phy_init_hw() instead of open-coding it in phy_mii_ioctl(), this
|
|
improves consistenty and makes sure that we will not duplicate the same
|
|
routine somewhere else.
|
|
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/phy.c | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
|
|
index 05cb8fe..5d7101b 100644
|
|
--- a/drivers/net/phy/phy.c
|
|
+++ b/drivers/net/phy/phy.c
|
|
@@ -361,11 +361,8 @@ int phy_mii_ioctl(struct phy_device *phydev,
|
|
mii_data->reg_num, val);
|
|
|
|
if (mii_data->reg_num == MII_BMCR &&
|
|
- val & BMCR_RESET &&
|
|
- phydev->drv->config_init) {
|
|
- phy_scan_fixups(phydev);
|
|
- phydev->drv->config_init(phydev);
|
|
- }
|
|
+ val & BMCR_RESET)
|
|
+ phy_init_hw(phydev);
|
|
break;
|
|
|
|
case SIOCSHWTSTAMP:
|
|
--
|
|
2.3.5
|
|
|