From 75635f6926d2a3dcadd9b9c026aa21a16e113ee3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 21 May 2014 12:22:21 +0200 Subject: [PATCH] net: phy: remove now unused of_phy_device_connect Since barebox handles phys from devicetree transparently we no longer need of_phy_device_connect. Signed-off-by: Sascha Hauer --- 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 257df7437..b0e0c1e36 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 3cdbc6ebf..3229aa630 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);