OSDN Git Service

net: dsa: mv88e6xxx: refactor mv88e6352_g1_reset
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Tue, 4 Jun 2019 07:34:35 +0000 (07:34 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2019 03:07:57 +0000 (20:07 -0700)
The new mv88e6250_g1_reset() is identical to mv88e6352_g1_reset() except
for the call of mv88e6352_g1_wait_ppu_polling(), so refactor the 6352
version in term of the 6250 one. No functional change.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6xxx/global1.c

index fc10b6e..41c0792 100644 (file)
@@ -203,21 +203,9 @@ int mv88e6250_g1_reset(struct mv88e6xxx_chip *chip)
 
 int mv88e6352_g1_reset(struct mv88e6xxx_chip *chip)
 {
-       u16 val;
        int err;
 
-       /* Set the SWReset bit 15 */
-       err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &val);
-       if (err)
-               return err;
-
-       val |= MV88E6XXX_G1_CTL1_SW_RESET;
-
-       err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, val);
-       if (err)
-               return err;
-
-       err = mv88e6xxx_g1_wait_init_ready(chip);
+       err = mv88e6250_g1_reset(chip);
        if (err)
                return err;