diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-14 22:43:12 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-14 22:43:12 +0300 |
| commit | f7f58ae0f81bf454030eb76444646d15b0bfba2c (patch) | |
| tree | 43a275f2ab4cfcdfefd2da7e376063080994beb2 /include | |
| parent | dc91d7efdc0ea7c1ff242fea17e0122aaeb87dc5 (diff) | |
| parent | 5bcbe0f35fb13e31fdd0b2dc9695f19ab0208207 (diff) | |
| download | linux-f7f58ae0f81bf454030eb76444646d15b0bfba2c.tar.xz | |
Merge branch 'dsa-cleanups'
Andrew Lunn says:
====================
DSA cleanup and fixes
The RFC patchset for re-architecturing DSA probing contains a few
standalone patches, either clean up or fixes. This pulls them out for
submission.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy_fixed.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h index 2400d2ea4f34..1d41ec44e39d 100644 --- a/include/linux/phy_fixed.h +++ b/include/linux/phy_fixed.h @@ -19,7 +19,7 @@ extern struct phy_device *fixed_phy_register(unsigned int irq, struct fixed_phy_status *status, int link_gpio, struct device_node *np); -extern void fixed_phy_del(int phy_addr); +extern void fixed_phy_unregister(struct phy_device *phydev); extern int fixed_phy_set_link_update(struct phy_device *phydev, int (*link_update)(struct net_device *, struct fixed_phy_status *)); @@ -40,9 +40,8 @@ static inline struct phy_device *fixed_phy_register(unsigned int irq, { return ERR_PTR(-ENODEV); } -static inline int fixed_phy_del(int phy_addr) +static inline void fixed_phy_unregister(struct phy_device *phydev) { - return -ENODEV; } static inline int fixed_phy_set_link_update(struct phy_device *phydev, int (*link_update)(struct net_device *, |