net: dsa: microchip: remove the struct ksz8

This patch removes the struct ksz8 from ksz8.h which is no longer
needed. The platform bus specific details are now deferenced through
dev->priv.

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/ksz8.h b/drivers/net/dsa/microchip/ksz8.h
index a4a2dc889b304a5509322ee6c8dbf67f3d1bc36a..42c50cc4d853613b7ef6595652b7c1c3aded6f64 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8.h
+++ b/drivers/net/dsa/microchip/ksz8.h
@@ -12,10 +12,6 @@
 #include <net/dsa.h>
 #include "ksz_common.h"
 
-struct ksz8 {
-       void *priv;
-};
-
 int ksz8_setup(struct dsa_switch *ds);
 u32 ksz8_get_port_addr(int port, int offset);
 void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member);

diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c
index d71df05b8b7b4e2646ae01c1dc4cbb5dff14429c..5247fdfb964d7b989293f9d18db397cc47a768b3 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8863_smi.c
+++ b/drivers/net/dsa/microchip/ksz8863_smi.c
@@ -26,11 +26,9 @@ static int ksz8863_mdio_read(void *ctx, const void *reg_buf, size_t reg_len,
        struct mdio_device *mdev;
        u8 reg = *(u8 *)reg_buf;
        u8 *val = val_buf;
-       struct ksz8 *ksz8;
        int i, ret = 0;
 
-       ksz8 = dev->priv;
-       mdev = ksz8->priv;
+       mdev = dev->priv;
 
        mutex_lock_nested(&mdev->bus->mdio_lock, MDIO_MUTEX_NESTED);
        for (i = 0; i < val_len; i++) {
@@ -55,13 +53,11 @@ static int ksz8863_mdio_write(void *ctx, const void *data, size_t count)
 {
        struct ksz_device *dev = ctx;
        struct mdio_device *mdev;
-       struct ksz8 *ksz8;
        int i, ret = 0;
        u32 reg;
        u8 *val;
 
-       ksz8 = dev->priv;
-       mdev = ksz8->priv;
+       mdev = dev->priv;
 
        val = (u8 *)(data + 4);
        reg = *(u32 *)data;
@@ -142,17 +138,10 @@ static int ksz8863_smi_probe(struct mdio_device *mdiodev)
 {
        struct regmap_config rc;
        struct ksz_device *dev;
-       struct ksz8 *ksz8;
        int ret;
        int i;
 
-       ksz8 = devm_kzalloc(&mdiodev->dev, sizeof(struct ksz8), GFP_KERNEL);
-       if (!ksz8)
-               return -ENOMEM;
-
-       ksz8->priv = mdiodev;
-
-       dev = ksz_switch_alloc(&mdiodev->dev, ksz8);
+       dev = ksz_switch_alloc(&mdiodev->dev, mdiodev);
        if (!dev)
                return -ENOMEM;
 

diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/ksz_spi.c
index 344ff92db0992e4c1b109daeff4d347c7c2fa6d3..69fabb190f26fb24a4af1d9794fa0fcba041d335 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_spi.c
+++ b/drivers/net/dsa/microchip/ksz_spi.c
@@ -14,7 +14,6 @@
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 
-#include "ksz8.h"
 #include "ksz_common.h"
 
 #define KSZ8795_SPI_ADDR_SHIFT                 12
@@ -45,16 +44,9 @@ static int ksz_spi_probe(struct spi_device *spi)
        struct device *ddev = &spi->dev;
        struct regmap_config rc;
        struct ksz_device *dev;
-       struct ksz8 *ksz8;
        int i, ret = 0;
 
-       ksz8 = devm_kzalloc(&spi->dev, sizeof(struct ksz8), GFP_KERNEL);
-       if (!ksz8)
-               return -ENOMEM;
-
-       ksz8->priv = spi;
-
-       dev = ksz_switch_alloc(&spi->dev, ksz8);
+       dev = ksz_switch_alloc(&spi->dev, spi);
        if (!dev)
                return -ENOMEM;