staging: wilc1000: remove typedef from wilc_hif_func_t

This patch removes typedef from the struct wilc_hif_func_t and
renames it to wilc_hif_func.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 300c571e4e2d17d876e757a0e5c433b77cd2ae44..cfa76b26bb53a374a1d9dc947f2168487f810276 100644 (file)
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -992,7 +992,7 @@ static int sdio_sync_ext(int nint /*  how mant interrupts to enable. */)
  *
  ********************************************/
 
-wilc_hif_func_t hif_sdio = {
+struct wilc_hif_func hif_sdio = {
        sdio_init,
        sdio_deinit,
        sdio_read_reg,

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 599508beabf8b45445f38e5b2d17e656289c6f69..b09b3bde68c20245155088f6e1ff2a8b55449e8d 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -1256,7 +1256,7 @@ static int spi_sync_ext(int nint /*  how mant interrupts to enable. */)
  *      Global spi HIF function table
  *
  ********************************************/
-wilc_hif_func_t hif_spi = {
+struct wilc_hif_func hif_spi = {
        spi_init,
        spi_deinit,
        spi_read_reg,

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 7b8e70b391cd3220843fff116ba92e1ef88853a2..b6d784bcf98ef1a2f48522c2a5775a582635479f 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -2,14 +2,14 @@
 #include "wilc_wfi_netdevice.h"
 #include "wilc_wlan_cfg.h"
 
-extern wilc_hif_func_t hif_sdio;
-extern wilc_hif_func_t hif_spi;
+extern struct wilc_hif_func hif_sdio;
+extern struct wilc_hif_func hif_spi;
 u32 wilc_get_chipid(u8 update);
 
 typedef struct {
        int quit;
        wilc_wlan_io_func_t io_func;
-       wilc_hif_func_t hif_func;
+       struct wilc_hif_func hif_func;
        int cfg_frame_in_use;
        struct wilc_cfg_frame cfg_frame;
        u32 cfg_frame_offset;
@@ -1665,7 +1665,7 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
                        goto _fail_;
                }
                memcpy((void *)&g_wlan.hif_func, &hif_sdio,
-                      sizeof(wilc_hif_func_t));
+                      sizeof(struct wilc_hif_func));
        } else {
                if ((inp->io_func.io_type & 0x1) == HIF_SPI) {
                        if (!hif_spi.hif_init(inp, wilc_debug)) {
@@ -1673,7 +1673,7 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
                                goto _fail_;
                        }
                        memcpy((void *)&g_wlan.hif_func, &hif_spi,
-                              sizeof(wilc_hif_func_t));
+                              sizeof(struct wilc_hif_func));
                } else {
                        ret = -EIO;
                        goto _fail_;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 368b7ff3c49575c911503870a1016c00bdf18b1d..ff4872f1e675d29adbbffcee906082eb7eaaf1f9 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -236,7 +236,7 @@ struct rxq_entry_t {
  *
  ********************************************/
 
-typedef struct {
+struct wilc_hif_func {
        int (*hif_init)(wilc_wlan_inp_t *, wilc_debug_func);
        int (*hif_deinit)(void *);
        int (*hif_read_reg)(u32, u32 *);
@@ -253,7 +253,7 @@ typedef struct {
        int (*hif_sync_ext)(int);
        void (*hif_set_max_bus_speed)(void);
        void (*hif_set_default_bus_speed)(void);
-} wilc_hif_func_t;
+};
 
 /********************************************
  *