summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorDoug Berger <opendmb@gmail.com>2017-03-13 17:41:31 -0700
committerDavid S. Miller <davem@davemloft.net>2017-03-13 21:51:48 -0700
commitcda792c3f9b77acc3f42e4947d30f3a46e4da183 (patch)
treea6b6f29f19a40a2c66f87279ef47c2ce0257ee39 /drivers/net/phy
parentc55fa3cccbc2c672e7f118be8f7484e53a8e9e77 (diff)
downloadlinux-cda792c3f9b77acc3f42e4947d30f3a46e4da183.tar.gz
linux-cda792c3f9b77acc3f42e4947d30f3a46e4da183.tar.bz2
linux-cda792c3f9b77acc3f42e4947d30f3a46e4da183.zip
net: phy: bcm-phylib: replace obsolete EEE macro references
The macros MDIO_AN_EEE_ADV_100TX and MDIO_AN_EEE_ADV_1000T are now considered obsolete and are replaced in the kernel with the generic macros MDIO_EEE_100TX and MDIO_EEE_1000T respectively. Signed-off-by: Doug Berger <opendmb@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/bcm-phy-lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c
index ab9ad689617c..9656dbeb5de5 100644
--- a/drivers/net/phy/bcm-phy-lib.c
+++ b/drivers/net/phy/bcm-phy-lib.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Broadcom Corporation
+ * Copyright (C) 2015-2017 Broadcom
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -221,9 +221,9 @@ int bcm_phy_set_eee(struct phy_device *phydev, bool enable)
return val;
if (enable)
- val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
+ val |= (MDIO_EEE_100TX | MDIO_EEE_1000T);
else
- val &= ~(MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
+ val &= ~(MDIO_EEE_100TX | MDIO_EEE_1000T);
phy_write_mmd_indirect(phydev, BCM_CL45VEN_EEE_ADV,
MDIO_MMD_AN, (u32)val);