mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 02:01:21 +00:00
baab6587a5
Rename LINUXFAMILY: marvell to mvebu Replace default kernel with 4.4.x branch from dev configuration
88 lines
2.7 KiB
Diff
88 lines
2.7 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Subject: [PATCH 17/30] phy: fixed-phy: remove fixed_phy_update_state()
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
mvneta is the only user of fixed_phy_update_state(), which has been
|
|
converted to use phylink instead. Remove fixed_phy_update_state().
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
drivers/net/phy/fixed_phy.c | 31 -------------------------------
|
|
include/linux/phy_fixed.h | 9 ---------
|
|
2 files changed, 40 deletions(-)
|
|
|
|
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
|
|
index 474cc39a5457..19ac47aab0ba 100644
|
|
--- a/drivers/net/phy/fixed_phy.c
|
|
+++ b/drivers/net/phy/fixed_phy.c
|
|
@@ -115,37 +115,6 @@ int fixed_phy_set_link_update(struct phy_device *phydev,
|
|
}
|
|
EXPORT_SYMBOL_GPL(fixed_phy_set_link_update);
|
|
|
|
-int fixed_phy_update_state(struct phy_device *phydev,
|
|
- const struct fixed_phy_status *status,
|
|
- const struct fixed_phy_status *changed)
|
|
-{
|
|
- struct fixed_mdio_bus *fmb = &platform_fmb;
|
|
- struct fixed_phy *fp;
|
|
-
|
|
- if (!phydev || phydev->bus != fmb->mii_bus)
|
|
- return -EINVAL;
|
|
-
|
|
- list_for_each_entry(fp, &fmb->phys, node) {
|
|
- if (fp->addr == phydev->addr) {
|
|
- write_seqcount_begin(&fp->seqcount);
|
|
-#define _UPD(x) if (changed->x) \
|
|
- fp->status.x = status->x
|
|
- _UPD(link);
|
|
- _UPD(speed);
|
|
- _UPD(duplex);
|
|
- _UPD(pause);
|
|
- _UPD(asym_pause);
|
|
-#undef _UPD
|
|
- fixed_phy_update(fp);
|
|
- write_seqcount_end(&fp->seqcount);
|
|
- return 0;
|
|
- }
|
|
- }
|
|
-
|
|
- return -ENOENT;
|
|
-}
|
|
-EXPORT_SYMBOL(fixed_phy_update_state);
|
|
-
|
|
int fixed_phy_add(unsigned int irq, int phy_addr,
|
|
struct fixed_phy_status *status,
|
|
int link_gpio)
|
|
diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
|
|
index 2400d2ea4f34..cf3f718c62b9 100644
|
|
--- a/include/linux/phy_fixed.h
|
|
+++ b/include/linux/phy_fixed.h
|
|
@@ -23,9 +23,6 @@ extern void fixed_phy_del(int phy_addr);
|
|
extern int fixed_phy_set_link_update(struct phy_device *phydev,
|
|
int (*link_update)(struct net_device *,
|
|
struct fixed_phy_status *));
|
|
-extern int fixed_phy_update_state(struct phy_device *phydev,
|
|
- const struct fixed_phy_status *status,
|
|
- const struct fixed_phy_status *changed);
|
|
#else
|
|
static inline int fixed_phy_add(unsigned int irq, int phy_id,
|
|
struct fixed_phy_status *status,
|
|
@@ -50,12 +47,6 @@ static inline int fixed_phy_set_link_update(struct phy_device *phydev,
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
-static inline int fixed_phy_update_state(struct phy_device *phydev,
|
|
- const struct fixed_phy_status *status,
|
|
- const struct fixed_phy_status *changed)
|
|
-{
|
|
- return -ENODEV;
|
|
-}
|
|
#endif /* CONFIG_FIXED_PHY */
|
|
|
|
#endif /* __PHY_FIXED_H */
|
|
--
|
|
2.1.0
|
|
|