diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-01 21:23:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-01 21:23:42 -0500 |
| commit | 96dbdc5d8c48d438bb372fc3662c9a34fb44b498 (patch) | |
| tree | a424bdde03d475ae4d4d5c8081187b8a5b10e470 /include | |
| parent | 5697b3e1445387e5fa190a4e6833e3f7da43c3f2 (diff) | |
| parent | 568477045f800ee1c68cb18f1e6e800c4365615c (diff) | |
| download | linux-96dbdc5d8c48d438bb372fc3662c9a34fb44b498.tar.bz2 | |
Merge branch 'net-phy-Reduce-duplication'
Florian Fainelli says:
====================
net: phy: Reduce duplication
This patch series reduces the duplication among 10G PHY drivers that just
essentially stub most functions, but do that while replicating what the existing
generic functions do.
Changes in v3:
- removed unused "reg" variable in teranetics.c
- fixed subject for patch 5 since we actually use gen10g_no_soft_reset()
Changes in v2:
- rename gen10g_soft_reset() to gen10g_no_soft_reset() to better illustrate
what it does (or does not)
- removed stray comment in marvell10g.c
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 5a0c3e53e7c2..6e38c699b753 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -994,6 +994,14 @@ int genphy_c45_pma_setup_forced(struct phy_device *phydev); int genphy_c45_an_disable_aneg(struct phy_device *phydev); int genphy_c45_read_mdix(struct phy_device *phydev); +/* The gen10g_* functions are the old Clause 45 stub */ +int gen10g_config_aneg(struct phy_device *phydev); +int gen10g_read_status(struct phy_device *phydev); +int gen10g_no_soft_reset(struct phy_device *phydev); +int gen10g_config_init(struct phy_device *phydev); +int gen10g_suspend(struct phy_device *phydev); +int gen10g_resume(struct phy_device *phydev); + static inline int phy_read_status(struct phy_device *phydev) { if (!phydev->drv) |