diff options
Diffstat (limited to 'drivers/net/phy/bcm84881.c')
| -rw-r--r-- | drivers/net/phy/bcm84881.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c index a72b693be846..65950e410ea1 100644 --- a/drivers/net/phy/bcm84881.c +++ b/drivers/net/phy/bcm84881.c @@ -136,7 +136,7 @@ static int bcm84881_aneg_done(struct phy_device *phydev) bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR); if (bmsr < 0) - return val; + return bmsr; return !!(val & MDIO_AN_STAT1_COMPLETE) && !!(bmsr & BMSR_ANEGCOMPLETE); @@ -162,7 +162,7 @@ static int bcm84881_read_status(struct phy_device *phydev) bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR); if (bmsr < 0) - return val; + return bmsr; phydev->autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) && !!(bmsr & BMSR_ANEGCOMPLETE); @@ -242,10 +242,10 @@ static int bcm84881_read_status(struct phy_device *phydev) /* The Broadcom BCM84881 in the Methode DM7052 is unable to provide a SGMII * or 802.3z control word, so inband will not work. */ -static unsigned int bcm84881_query_inband(struct phy_device *phydev, - phy_interface_t interface) +static unsigned int bcm84881_inband_caps(struct phy_device *phydev, + phy_interface_t interface) { - return LINK_INBAND_VALID; + return LINK_INBAND_DISABLE; } static struct phy_driver bcm84881_drivers[] = { @@ -253,7 +253,7 @@ static struct phy_driver bcm84881_drivers[] = { .phy_id = 0xae025150, .phy_id_mask = 0xfffffff0, .name = "Broadcom BCM84881", - .query_inband = bcm84881_query_inband, + .inband_caps = bcm84881_inband_caps, .config_init = bcm84881_config_init, .probe = bcm84881_probe, .get_features = bcm84881_get_features, @@ -266,7 +266,7 @@ static struct phy_driver bcm84881_drivers[] = { module_phy_driver(bcm84881_drivers); /* FIXME: module auto-loading for Clause 45 PHYs seems non-functional */ -static struct mdio_device_id __maybe_unused bcm84881_tbl[] = { +static const struct mdio_device_id __maybe_unused bcm84881_tbl[] = { { 0xae025150, 0xfffffff0 }, { }, }; |