net: dsa: microchip: rename shutdown to reset in ksz_dev_ops

This patch renames the shutdown to reset in ksz_dev_ops in order to use
the reset dev_ops in the ksz_setup.

Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 23ed05f4efcc7af98529ca7ecd8f25ebab336037..ad58112bda4450b6ec409edd17f9bea1bcfd5efe 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1379,7 +1379,7 @@ static int ksz8_setup(struct dsa_switch *ds)
        if (!dev->vlan_cache)
                return -ENOMEM;
 
-       ret = ksz8_reset_switch(dev);
+       ret = dev->dev_ops->reset(dev);
        if (ret) {
                dev_err(ds->dev, "failed to reset switch\n");
                return ret;
@@ -1545,7 +1545,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = {
        .mirror_add = ksz8_port_mirror_add,
        .mirror_del = ksz8_port_mirror_del,
        .get_caps = ksz8_get_caps,
-       .shutdown = ksz8_reset_switch,
+       .reset = ksz8_reset_switch,
        .init = ksz8_switch_init,
        .exit = ksz8_switch_exit,
 };

diff --git a/drivers/net/dsa/microchip/ksz8795_spi.c b/drivers/net/dsa/microchip/ksz8795_spi.c
index 961a74c359a8038a8dbd18e5a2b82eaea1594e6b..3f27aee9b6d39c38248f78fe5eba5f5bf8656afc 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795_spi.c
+++ b/drivers/net/dsa/microchip/ksz8795_spi.c
@@ -110,8 +110,8 @@ static void ksz8795_spi_shutdown(struct spi_device *spi)
        if (!dev)
                return;
 
-       if (dev->dev_ops->shutdown)
-               dev->dev_ops->shutdown(dev);
+       if (dev->dev_ops->reset)
+               dev->dev_ops->reset(dev);
 
        dsa_switch_shutdown(dev->ds);
 

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 5b4fc16e16923cd08a2a086c01cc3287e0c16a3a..4e0e9507e62ad9983e06645bb56e2e2e82c1344f 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1246,7 +1246,7 @@ static int ksz9477_setup(struct dsa_switch *ds)
        if (!dev->vlan_cache)
                return -ENOMEM;
 
-       ret = ksz9477_reset_switch(dev);
+       ret = dev->dev_ops->reset(dev);
        if (ret) {
                dev_err(ds->dev, "failed to reset switch\n");
                return ret;
@@ -1400,7 +1400,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = {
        .mdb_del = ksz9477_mdb_del,
        .change_mtu = ksz9477_change_mtu,
        .max_mtu = ksz9477_max_mtu,
-       .shutdown = ksz9477_reset_switch,
+       .reset = ksz9477_reset_switch,
        .init = ksz9477_switch_init,
        .exit = ksz9477_switch_exit,
 };

diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/ksz9477_i2c.c
index faa3163c86b05a55c72f4d32d0d1f2228fa9132b..4ade64387f3a553c0d30cca970c9acd8abe14207 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477_i2c.c
+++ b/drivers/net/dsa/microchip/ksz9477_i2c.c
@@ -71,8 +71,8 @@ static void ksz9477_i2c_shutdown(struct i2c_client *i2c)
        if (!dev)
                return;
 
-       if (dev->dev_ops->shutdown)
-               dev->dev_ops->shutdown(dev);
+       if (dev->dev_ops->reset)
+               dev->dev_ops->reset(dev);
 
        dsa_switch_shutdown(dev->ds);
 

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index ebcfa688ea2ccd19af872e60c81a11abba76daa3..44f60922be927945fbfb232036072a16a005a8d4 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -204,7 +204,7 @@ struct ksz_dev_ops {
        int (*max_mtu)(struct ksz_device *dev, int port);
        void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);
        void (*port_init_cnt)(struct ksz_device *dev, int port);
-       int (*shutdown)(struct ksz_device *dev);
+       int (*reset)(struct ksz_device *dev);
        int (*init)(struct ksz_device *dev);
        void (*exit)(struct ksz_device *dev);
 };