From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 07/10] net: phy: remove now unused of_phy_device_connect
Date: Wed, 21 May 2014 14:18:57 +0200 [thread overview]
Message-ID: <1400674740-6467-8-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1400674740-6467-1-git-send-email-s.hauer@pengutronix.de>
Since barebox handles phys from devicetree transparently we no longer
need of_phy_device_connect.
Signed-off-by: Sascha Hauer <s.hauer@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
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-05-21 12:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 12:18 [PATCH] devicetree support for ethernet phys Sascha Hauer
2014-05-21 12:18 ` [PATCH 01/10] net: phy: factor out phy_device_attach function Sascha Hauer
2014-05-21 12:18 ` [PATCH 02/10] net: phy: move setting of phy_map to phy_register_device Sascha Hauer
2014-05-21 12:18 ` [PATCH 03/10] net: phy: register phys specified in devicetree Sascha Hauer
2014-05-21 12:18 ` [PATCH 04/10] net: phy: Support finding a phy in the devicetree Sascha Hauer
2014-05-21 12:18 ` [PATCH 05/10] net: phy: Support limiting phy speed " Sascha Hauer
2014-05-21 12:28 ` Sebastian Hesselbarth
2014-05-21 12:18 ` [PATCH 06/10] net: orion-gbe: use transparent-to-driver of mdio functions Sascha Hauer
2014-05-21 12:29 ` Sebastian Hesselbarth
2014-05-22 20:09 ` Sebastian Hesselbarth
2014-08-02 17:44 ` Ezequiel Garcia
2014-08-04 18:42 ` Sascha Hauer
2014-05-21 12:18 ` Sascha Hauer [this message]
2014-05-21 12:18 ` [PATCH 08/10] net: phy: genphy: always write MII_CTRL1000 when available Sascha Hauer
2014-05-21 12:18 ` [PATCH 09/10] net: phy: genphy: Make it work with of_set_phy_supported Sascha Hauer
2014-05-21 12:19 ` [PATCH 10/10] net: fec_imx: Add devicetree support for mdio bus Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400674740-6467-8-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox