From: Rasmus Villemoes Date: Tue, 4 Jun 2019 07:34:35 +0000 (+0000) Subject: net: dsa: mv88e6xxx: refactor mv88e6352_g1_reset X-Git-Tag: v5.3-rc1~140^2~333^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7358fd800c0e0a4feda388d2194379c5c3903a84;p=linux-block.git net: dsa: mv88e6xxx: refactor mv88e6352_g1_reset 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 Signed-off-by: Rasmus Villemoes Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/mv88e6xxx/global1.c b/drivers/net/dsa/mv88e6xxx/global1.c index fc10b6e495f5..41c0792a2e2b 100644 --- a/drivers/net/dsa/mv88e6xxx/global1.c +++ b/drivers/net/dsa/mv88e6xxx/global1.c @@ -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;