[PATCH 07/10] net: phy: remove now unused of_phy_device_connect
Sascha Hauer
s.hauer at pengutronix.de
Wed May 21 05:18:57 PDT 2014
Since barebox handles phys from devicetree transparently we no longer
need of_phy_device_connect.
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
drivers/net/phy/phy.c | 31 -------------------------------
include/linux/phy.h | 14 --------------
2 files changed, 45 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 257df74..b0e0c1e 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -376,37 +376,6 @@ out:
return ret;
}
-#if defined(CONFIG_OFTREE)
-int of_phy_device_connect(struct eth_device *edev, struct device_node *phy_np,
- void (*adjust_link) (struct eth_device *edev),
- u32 flags, phy_interface_t interface)
-{
- struct device_node *bus_np;
- struct mii_bus *miibus;
- int phy_addr = -ENODEV;
-
- if (!phy_np)
- return -EINVAL;
-
- of_property_read_u32(phy_np, "reg", &phy_addr);
-
- bus_np = of_get_parent(phy_np);
- if (!bus_np)
- return -ENODEV;
-
- for_each_mii_bus(miibus) {
- if (miibus->parent && miibus->parent->device_node == bus_np)
- return phy_device_connect(edev, miibus, phy_addr,
- adjust_link, flags, interface);
- }
-
- dev_err(&edev->dev, "unable to mdio bus for phy %s\n",
- phy_np->full_name);
-
- return -ENODEV;
-}
-#endif
-
/* Generic PHY support and helper functions */
/**
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 3cdbc6e..3229aa6 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -288,20 +288,6 @@ int phy_device_connect(struct eth_device *dev, struct mii_bus *bus, int addr,
void (*adjust_link) (struct eth_device *edev),
u32 flags, phy_interface_t interface);
-#if defined(CONFIG_OFTREE)
-int of_phy_device_connect(struct eth_device *edev, struct device_node *phy_np,
- void (*adjust_link) (struct eth_device *edev),
- u32 flags, phy_interface_t interface);
-#else
-static inline int of_phy_device_connect(struct eth_device *edev,
- struct device_node *phy_np,
- void (*adjust_link) (struct eth_device *edev),
- u32 flags, phy_interface_t interface)
-{
- return -ENOSYS;
-}
-#endif
-
int phy_update_status(struct phy_device *phydev);
int phy_wait_aneg_done(struct phy_device *phydev);
--
2.0.0.rc0
More information about the barebox
mailing list