Commit efbd721e authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eee3bb7
...@@ -867,21 +867,6 @@ static int m88e1011_set_tunable(struct phy_device *phydev, ...@@ -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) static int m88e1116r_config_init(struct phy_device *phydev)
{ {
int err; int err;
...@@ -2201,7 +2186,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2201,7 +2186,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1011_get_tunable, .get_tunable = m88e1011_get_tunable,
.set_tunable = m88e1011_set_tunable, .set_tunable = m88e1011_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E1111, .phy_id = MARVELL_PHY_ID_88E1111,
...@@ -2223,7 +2207,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2223,7 +2207,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1111_get_tunable, .get_tunable = m88e1111_get_tunable,
.set_tunable = m88e1111_set_tunable, .set_tunable = m88e1111_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E1118, .phy_id = MARVELL_PHY_ID_88E1118,
...@@ -2264,7 +2247,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2264,7 +2247,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1011_get_tunable, .get_tunable = m88e1011_get_tunable,
.set_tunable = m88e1011_set_tunable, .set_tunable = m88e1011_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E1318S, .phy_id = MARVELL_PHY_ID_88E1318S,
...@@ -2308,7 +2290,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2308,7 +2290,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1111_get_tunable, .get_tunable = m88e1111_get_tunable,
.set_tunable = m88e1111_set_tunable, .set_tunable = m88e1111_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E1149R, .phy_id = MARVELL_PHY_ID_88E1149R,
...@@ -2364,7 +2345,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2364,7 +2345,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1011_get_tunable, .get_tunable = m88e1011_get_tunable,
.set_tunable = m88e1011_set_tunable, .set_tunable = m88e1011_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E1510, .phy_id = MARVELL_PHY_ID_88E1510,
...@@ -2390,7 +2370,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2390,7 +2370,6 @@ static struct phy_driver marvell_drivers[] = {
.set_loopback = genphy_loopback, .set_loopback = genphy_loopback,
.get_tunable = m88e1011_get_tunable, .get_tunable = m88e1011_get_tunable,
.set_tunable = m88e1011_set_tunable, .set_tunable = m88e1011_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E1540, .phy_id = MARVELL_PHY_ID_88E1540,
...@@ -2413,7 +2392,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2413,7 +2392,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1540_get_tunable, .get_tunable = m88e1540_get_tunable,
.set_tunable = m88e1540_set_tunable, .set_tunable = m88e1540_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E1545, .phy_id = MARVELL_PHY_ID_88E1545,
...@@ -2436,7 +2414,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2436,7 +2414,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1540_get_tunable, .get_tunable = m88e1540_get_tunable,
.set_tunable = m88e1540_set_tunable, .set_tunable = m88e1540_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
{ {
.phy_id = MARVELL_PHY_ID_88E3016, .phy_id = MARVELL_PHY_ID_88E3016,
...@@ -2479,7 +2456,6 @@ static struct phy_driver marvell_drivers[] = { ...@@ -2479,7 +2456,6 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats, .get_stats = marvell_get_stats,
.get_tunable = m88e1540_get_tunable, .get_tunable = m88e1540_get_tunable,
.set_tunable = m88e1540_set_tunable, .set_tunable = m88e1540_set_tunable,
.link_change_notify = m88e1011_link_change_notify,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment