Commit 48d0aa97 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

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: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bcddd48b
...@@ -992,7 +992,7 @@ static int sdio_sync_ext(int nint /* how mant interrupts to enable. */) ...@@ -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_init,
sdio_deinit, sdio_deinit,
sdio_read_reg, sdio_read_reg,
......
...@@ -1256,7 +1256,7 @@ static int spi_sync_ext(int nint /* how mant interrupts to enable. */) ...@@ -1256,7 +1256,7 @@ static int spi_sync_ext(int nint /* how mant interrupts to enable. */)
* Global spi HIF function table * Global spi HIF function table
* *
********************************************/ ********************************************/
wilc_hif_func_t hif_spi = { struct wilc_hif_func hif_spi = {
spi_init, spi_init,
spi_deinit, spi_deinit,
spi_read_reg, spi_read_reg,
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
#include "wilc_wfi_netdevice.h" #include "wilc_wfi_netdevice.h"
#include "wilc_wlan_cfg.h" #include "wilc_wlan_cfg.h"
extern wilc_hif_func_t hif_sdio; extern struct wilc_hif_func hif_sdio;
extern wilc_hif_func_t hif_spi; extern struct wilc_hif_func hif_spi;
u32 wilc_get_chipid(u8 update); u32 wilc_get_chipid(u8 update);
typedef struct { typedef struct {
int quit; int quit;
wilc_wlan_io_func_t io_func; wilc_wlan_io_func_t io_func;
wilc_hif_func_t hif_func; struct wilc_hif_func hif_func;
int cfg_frame_in_use; int cfg_frame_in_use;
struct wilc_cfg_frame cfg_frame; struct wilc_cfg_frame cfg_frame;
u32 cfg_frame_offset; u32 cfg_frame_offset;
...@@ -1665,7 +1665,7 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp) ...@@ -1665,7 +1665,7 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
goto _fail_; goto _fail_;
} }
memcpy((void *)&g_wlan.hif_func, &hif_sdio, memcpy((void *)&g_wlan.hif_func, &hif_sdio,
sizeof(wilc_hif_func_t)); sizeof(struct wilc_hif_func));
} else { } else {
if ((inp->io_func.io_type & 0x1) == HIF_SPI) { if ((inp->io_func.io_type & 0x1) == HIF_SPI) {
if (!hif_spi.hif_init(inp, wilc_debug)) { 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) ...@@ -1673,7 +1673,7 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
goto _fail_; goto _fail_;
} }
memcpy((void *)&g_wlan.hif_func, &hif_spi, memcpy((void *)&g_wlan.hif_func, &hif_spi,
sizeof(wilc_hif_func_t)); sizeof(struct wilc_hif_func));
} else { } else {
ret = -EIO; ret = -EIO;
goto _fail_; goto _fail_;
......
...@@ -236,7 +236,7 @@ struct rxq_entry_t { ...@@ -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_init)(wilc_wlan_inp_t *, wilc_debug_func);
int (*hif_deinit)(void *); int (*hif_deinit)(void *);
int (*hif_read_reg)(u32, u32 *); int (*hif_read_reg)(u32, u32 *);
...@@ -253,7 +253,7 @@ typedef struct { ...@@ -253,7 +253,7 @@ typedef struct {
int (*hif_sync_ext)(int); int (*hif_sync_ext)(int);
void (*hif_set_max_bus_speed)(void); void (*hif_set_max_bus_speed)(void);
void (*hif_set_default_bus_speed)(void); void (*hif_set_default_bus_speed)(void);
} wilc_hif_func_t; };
/******************************************** /********************************************
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment