[net-next] net: dsa: mv88e6xxx: remove unneeded cmode initialization
diff mbox series

Message ID 39f36f0d-212c-5605-471f-d674405b37f8@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series
  • [net-next] net: dsa: mv88e6xxx: remove unneeded cmode initialization
Related show

Commit Message

Heiner Kallweit March 23, 2019, 6:45 p.m. UTC
This partially reverts ed8fe20205ac ("net: dsa: mv88e6xxx: prevent
interrupt storm caused by mv88e6390x_port_set_cmode"). I missed
that chip->ports[].cmode is overwritten anyway by the cmode
caching in mv88e6xxx_setup().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
The old code causes no issues, therefore net-next.
---
 drivers/net/dsa/mv88e6xxx/chip.c | 11 -----------
 drivers/net/dsa/mv88e6xxx/port.h |  1 -
 2 files changed, 12 deletions(-)

Comments

David Miller March 27, 2019, 8:47 p.m. UTC | #1
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sat, 23 Mar 2019 19:45:13 +0100

> This partially reverts ed8fe20205ac ("net: dsa: mv88e6xxx: prevent
> interrupt storm caused by mv88e6390x_port_set_cmode"). I missed
> that chip->ports[].cmode is overwritten anyway by the cmode
> caching in mv88e6xxx_setup().
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> The old code causes no issues, therefore net-next.

This looks straight forward enough that I'll apply it without others
reviewing it.

Applied, thanks.

Patch
diff mbox series

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index f4e2db44a..65da6709a 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4631,14 +4631,6 @@  static int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,
 	return 0;
 }
 
-static void mv88e6xxx_ports_cmode_init(struct mv88e6xxx_chip *chip)
-{
-	int i;
-
-	for (i = 0; i < mv88e6xxx_num_ports(chip); i++)
-		chip->ports[i].cmode = MV88E6XXX_PORT_STS_CMODE_INVALID;
-}
-
 static enum dsa_tag_protocol mv88e6xxx_get_tag_protocol(struct dsa_switch *ds,
 							int port)
 {
@@ -4675,8 +4667,6 @@  static const char *mv88e6xxx_drv_probe(struct device *dsa_dev,
 	if (err)
 		goto free;
 
-	mv88e6xxx_ports_cmode_init(chip);
-
 	mutex_lock(&chip->reg_lock);
 	err = mv88e6xxx_switch_reset(chip);
 	mutex_unlock(&chip->reg_lock);
@@ -4915,7 +4905,6 @@  static int mv88e6xxx_probe(struct mdio_device *mdiodev)
 	if (err)
 		goto out;
 
-	mv88e6xxx_ports_cmode_init(chip);
 	mv88e6xxx_phy_init(chip);
 
 	if (chip->info->ops->get_eeprom) {
diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h
index c7bed263a..39c85e98f 100644
--- a/drivers/net/dsa/mv88e6xxx/port.h
+++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -52,7 +52,6 @@ 
 #define MV88E6185_PORT_STS_CMODE_1000BASE_X	0x0005
 #define MV88E6185_PORT_STS_CMODE_PHY		0x0006
 #define MV88E6185_PORT_STS_CMODE_DISABLED	0x0007
-#define MV88E6XXX_PORT_STS_CMODE_INVALID	0xff
 
 /* Offset 0x01: MAC (or PCS or Physical) Control Register */
 #define MV88E6XXX_PORT_MAC_CTL				0x01