net: dsa: mv88e6xxx: factorize GLOBAL_CONTROL_2 setup

[cascardo/linux.git] / drivers / net / dsa / mv88e6131.c

diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index c8e3974..b6ca07b 100644 (file)
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -61,22 +61,6 @@ static const char *mv88e6131_drv_probe(struct device *dsa_dev,
 static int mv88e6131_setup_global(struct dsa_switch *ds)
 {
        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
-       int ret;
-
-       /* Disable cascade port functionality unless this device
-        * is used in a cascade configuration, and set the switch's
-        * DSA device number.
-        */
-       if (ds->dst->pd->nr_chips > 1)
-               ret = mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_CONTROL_2,
-                                         GLOBAL_CONTROL_2_MULTIPLE_CASCADE |
-                                         (ds->index & 0x1f));
-       else
-               ret = mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_CONTROL_2,
-                                         GLOBAL_CONTROL_2_NO_CASCADE |
-                                         (ds->index & 0x1f));
-       if (ret)
-               return ret;
 
        /* Force the priority of IGMP/MLD snoop frames and ARP frames
         * to the highest setting.