Re: [PATCH] net: phy: Remove residual magic from PHY drivers

[David Miller]

From: Andrew Lunn 
Date: Tue, 16 May 2017 18:29:11 +0200

> commit fa8cddaf903c ("net phylib: Remove unnecessary condition check in phy")
> removed the only place where the PHY flag PHY_HAS_MAGICANEG was
> checked. But it left the flag being set in the drivers. Remove the flag.
> 
> Signed-off-by: Andrew Lunn 

Applied to net-next, thanks.

[PATCH] net: phy: Remove residual magic from PHY drivers

[Andrew Lunn]

commit fa8cddaf903c ("net phylib: Remove unnecessary condition check in phy")
removed the only place where the PHY flag PHY_HAS_MAGICANEG was
checked. But it left the flag being set in the drivers. Remove the flag.

Signed-off-by: Andrew Lunn 
---
 drivers/net/phy/broadcom.c  | 30 +++---
 drivers/net/phy/micrel.c| 27 +--
 drivers/net/phy/microchip.c |  2 +-
 drivers/net/phy/smsc.c  | 12 ++--
 include/linux/phy.h |  3 +--
 5 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index a32dc5d11e89..1e9ad30a35c8 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -540,7 +540,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM5411",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= genphy_config_aneg,
.read_status= genphy_read_status,
@@ -551,7 +551,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM5421",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= genphy_config_aneg,
.read_status= genphy_read_status,
@@ -562,7 +562,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM54210E",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= genphy_config_aneg,
.read_status= genphy_read_status,
@@ -573,7 +573,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM5461",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= genphy_config_aneg,
.read_status= genphy_read_status,
@@ -584,7 +584,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM54612E",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= genphy_config_aneg,
.read_status= genphy_read_status,
@@ -595,7 +595,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM54616S",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= genphy_config_aneg,
.read_status= genphy_read_status,
@@ -606,7 +606,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM5464",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= genphy_config_aneg,
.read_status= genphy_read_status,
@@ -617,7 +617,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM5481",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= bcm5481_config_aneg,
.read_status= genphy_read_status,
@@ -628,7 +628,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM54810",
.features   = PHY_GBIT_FEATURES,
-   .flags  = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+   .flags  = PHY_HAS_INTERRUPT,
.config_init= bcm54xx_config_init,
.config_aneg= bcm5481_config_aneg,
.read_status= genphy_read_status,
@@ -639,7 +639,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask= 0xfff0,
.name   = "Broadcom BCM5482",
.features   = PHY_GBIT_FEATURES,
-   .flags  =