net: dsa: mv88e6xxx: Push locking into stats snapshotting

This is more consistent with the driver's general structure.

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 07a22c74fe810ab0e1372db42335dd42aac603f7..4bd3ceffde1717a46e89684eb53db9110a4a1fce 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -943,10 +943,16 @@ error:
 
 static int mv88e6xxx_stats_snapshot(struct mv88e6xxx_chip *chip, int port)
 {
+       int err;
+
        if (!chip->info->ops->stats_snapshot)
                return -EOPNOTSUPP;
 
-       return chip->info->ops->stats_snapshot(chip, port);
+       mv88e6xxx_reg_lock(chip);
+       err = chip->info->ops->stats_snapshot(chip, port);
+       mv88e6xxx_reg_unlock(chip);
+
+       return err;
 }
 
 static struct mv88e6xxx_hw_stat mv88e6xxx_hw_stats[] = {
@@ -1284,16 +1290,11 @@ static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,
        struct mv88e6xxx_chip *chip = ds->priv;
        int ret;
 
-       mv88e6xxx_reg_lock(chip);
-
        ret = mv88e6xxx_stats_snapshot(chip, port);
-       mv88e6xxx_reg_unlock(chip);
-
        if (ret < 0)
                return;
 
        mv88e6xxx_get_stats(chip, port, data);
-
 }
 
 static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port)