net: phy: marvell: remove downshift warning now that phylib takes care

Now that phylib notifies the user of a downshift we can remove
this functionality from the driver.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 9a8bada..4714ca0 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -867,21 +867,6 @@ static int m88e1011_set_tunable(struct phy_device *phydev,
        }
 }
 
-static void m88e1011_link_change_notify(struct phy_device *phydev)
-{
-       int status;
-
-       if (phydev->state != PHY_RUNNING)
-               return;
-
-       /* we may be on fiber page currently */
-       status = phy_read_paged(phydev, MII_MARVELL_COPPER_PAGE,
-                               MII_M1011_PHY_SSR);
-
-       if (status > 0 && status & MII_M1011_PHY_SSR_DOWNSHIFT)
-               phydev_warn(phydev, "Downshift occurred! Cabling may be defective.\n");
-}
-
 static int m88e1116r_config_init(struct phy_device *phydev)
 {
        int err;
@@ -2201,7 +2186,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1011_get_tunable,
                .set_tunable = m88e1011_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E1111,
@@ -2223,7 +2207,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1111_get_tunable,
                .set_tunable = m88e1111_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E1118,
@@ -2264,7 +2247,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1011_get_tunable,
                .set_tunable = m88e1011_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E1318S,
@@ -2308,7 +2290,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1111_get_tunable,
                .set_tunable = m88e1111_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E1149R,
@@ -2364,7 +2345,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1011_get_tunable,
                .set_tunable = m88e1011_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E1510,
@@ -2390,7 +2370,6 @@ static struct phy_driver marvell_drivers[] = {
                .set_loopback = genphy_loopback,
                .get_tunable = m88e1011_get_tunable,
                .set_tunable = m88e1011_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E1540,
@@ -2413,7 +2392,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1540_get_tunable,
                .set_tunable = m88e1540_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E1545,
@@ -2436,7 +2414,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1540_get_tunable,
                .set_tunable = m88e1540_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
        {
                .phy_id = MARVELL_PHY_ID_88E3016,
@@ -2479,7 +2456,6 @@ static struct phy_driver marvell_drivers[] = {
                .get_stats = marvell_get_stats,
                .get_tunable = m88e1540_get_tunable,
                .set_tunable = m88e1540_set_tunable,
-               .link_change_notify = m88e1011_link_change_notify,
        },
 };