diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2014-02-11 20:27:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-12 19:08:19 -0500 |
commit | 76a423a3f8f16bfc7fb86360a620be18c775b94d (patch) | |
tree | 79afe85602c388647b06b9bf00c663ff44256244 /drivers/net/phy/phy.c | |
parent | a9fa6e6ac29709e7a623b60695c172da675df045 (diff) |
net: phy: allow driver to implement their own aneg_done
Some PHYs out there can be very quirky with respect to how they would
report the auto-negotiation is completed. Allow drivers to override the
generic aneg_done() implementation by providing their own.
Since not all drivers have been updated yet to use genphy_aneg_done() as
aneg_done() callback, we explicitely check that this callback is valid
before calling into it.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
-rw-r--r-- | drivers/net/phy/phy.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index db9c543bd2af..2fa4611709a4 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c | |||
@@ -114,12 +114,15 @@ static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts) | |||
114 | * phy_aneg_done - return auto-negotiation status | 114 | * phy_aneg_done - return auto-negotiation status |
115 | * @phydev: target phy_device struct | 115 | * @phydev: target phy_device struct |
116 | * | 116 | * |
117 | * Description: Reads the status register and returns 0 either if | 117 | * Description: Return the auto-negotiation status from this @phydev |
118 | * auto-negotiation is incomplete, or if there was an error. | 118 | * Returns > 0 on success or < 0 on error. 0 means that auto-negotiation |
119 | * Returns BMSR_ANEGCOMPLETE if auto-negotiation is done. | 119 | * is still pending. |
120 | */ | 120 | */ |
121 | static inline int phy_aneg_done(struct phy_device *phydev) | 121 | static inline int phy_aneg_done(struct phy_device *phydev) |
122 | { | 122 | { |
123 | if (phydev->drv->aneg_done) | ||
124 | return phydev->drv->aneg_done(phydev); | ||
125 | |||
123 | return genphy_aneg_done(phydev); | 126 | return genphy_aneg_done(phydev); |
124 | } | 127 | } |
125 | 128 | ||