diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-02-13 12:44:46 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-02-15 16:11:59 +0100 |
commit | a10f1c61fb6997fc21cfc9a8147d67ea438e2fa4 (patch) | |
tree | e5660e4a883422cea19e44e77da6f0bfca638a78 | |
parent | 1dd442b74f4b8537421edd32a1df191bc06fe3de (diff) |
header: add phydev_get_addr()
This adds a phydev_get_addr() function which abstracts the access to
the phy address on a mdio bus away. This is needed since commit
e5a03bfd87 "phy: Add an mdio_device structure" in the mainline Linux
kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r-- | backport/backport-include/linux/phy.h | 14 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/0067-mdio-addr.cocci | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/backport/backport-include/linux/phy.h b/backport/backport-include/linux/phy.h index f727ac7d..bf283578 100644 --- a/backport/backport-include/linux/phy.h +++ b/backport/backport-include/linux/phy.h @@ -58,4 +58,18 @@ static inline void backport_mdiobus_unregister(struct mii_bus *bus) #define mdiobus_unregister LINUX_BACKPORT(mdiobus_unregister) #endif /* < 4.5 */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)) +#define phydev_get_addr LINUX_BACKPORT(phydev_get_addr) +static inline int phydev_get_addr(struct phy_device *phydev) +{ + return phydev->addr; +} +#else +#define phydev_get_addr LINUX_BACKPORT(phydev_get_addr) +static inline int phydev_get_addr(struct phy_device *phydev) +{ + return phydev->mdio.addr; +} +#endif + #endif /* __BACKPORT_LINUX_PHY_H */ diff --git a/patches/collateral-evolutions/network/0067-mdio-addr.cocci b/patches/collateral-evolutions/network/0067-mdio-addr.cocci new file mode 100644 index 00000000..1346585c --- /dev/null +++ b/patches/collateral-evolutions/network/0067-mdio-addr.cocci @@ -0,0 +1,5 @@ +@ r1 @ +struct phy_device *phydev; +@@ +-phydev->mdio.addr ++phydev_get_addr(phydev) |