staging: wilc1000: remove gpio parameter from wilc_netdev_init()

Instead of passing the gpio as parameter to wilc_netdev_init() now
setting its value after finishing wilc_netdev_init() call. Avoided
passing of extra parameter to wilc_netdev_init().

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 2f4bf8e1f33e055cc16b1c560b949ee4b5a89fd3..8f43a1f6b30f88f7c72c5d00b66a661e222c6f24 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1053,7 +1053,7 @@ static const struct net_device_ops wilc_netdev_ops = {
 };
 
 int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
-                    int gpio, const struct wilc_hif_func *ops)
+                    const struct wilc_hif_func *ops)
 {
        int i, ret;
        struct wilc_vif *vif;
@@ -1066,7 +1066,6 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
 
        *wilc = wl;
        wl->io_type = io_type;
-       wl->gpio = gpio;
        wl->hif_func = ops;
        INIT_LIST_HEAD(&wl->txq_head.list);
        INIT_LIST_HEAD(&wl->rxq_head.list);

diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 4ab43f97646a6084d4267e15e72176d2c1c221bf..7a2fc79d6fcaed9f1577b284513fb16bfc7ed1ff 100644 (file)
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -118,14 +118,14 @@ static int linux_sdio_probe(struct sdio_func *func,
        }
 
        dev_dbg(&func->dev, "Initializing netdev\n");
-       ret = wilc_netdev_init(&wilc, &func->dev, HIF_SDIO, gpio,
-                              &wilc_hif_sdio);
+       ret = wilc_netdev_init(&wilc, &func->dev, HIF_SDIO, &wilc_hif_sdio);
        if (ret) {
                dev_err(&func->dev, "Couldn't initialize netdev\n");
                return ret;
        }
        sdio_set_drvdata(func, wilc);
        wilc->dev = &func->dev;
+       wilc->gpio = gpio;
 
        dev_info(&func->dev, "Driver Initializing success\n");
        return 0;

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 647526387784d7e557f8021190f982b64fa07f9c..69b2c3cc75dc96ef25ddb19b40cd49703a578144 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -113,12 +113,13 @@ static int wilc_bus_probe(struct spi_device *spi)
        if (gpio < 0)
                gpio = GPIO_NUM;
 
-       ret = wilc_netdev_init(&wilc, NULL, HIF_SPI, GPIO_NUM, &wilc_hif_spi);
+       ret = wilc_netdev_init(&wilc, NULL, HIF_SPI, &wilc_hif_spi);
        if (ret)
                return ret;
 
        spi_set_drvdata(spi, wilc);
        wilc->dev = &spi->dev;
+       wilc->gpio = gpio;
 
        return 0;
 }

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 765681a78105fb3fd9e50391a83cb5c12e112870..add76c707532f15cbdaf73e2584b1f253b3895ca 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -174,7 +174,7 @@ void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);
 void wilc_mac_indicate(struct wilc *wilc);
 void wilc_netdev_cleanup(struct wilc *wilc);
 int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
-                    int gpio, const struct wilc_hif_func *ops);
+                    const struct wilc_hif_func *ops);
 void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);
 int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode);