Commit fc17eaa1 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

staging: wilc1000: remove typedef from sdio_cmd53_t

This patch removes typedef from struct sdio_cmd53_t and renames it to
sdio_cmd53.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c44e80bc
...@@ -81,7 +81,7 @@ static int wilc_sdio_cmd52(struct wilc *wilc, struct sdio_cmd52 *cmd) ...@@ -81,7 +81,7 @@ static int wilc_sdio_cmd52(struct wilc *wilc, struct sdio_cmd52 *cmd)
} }
static int wilc_sdio_cmd53(struct wilc *wilc, sdio_cmd53_t *cmd) static int wilc_sdio_cmd53(struct wilc *wilc, struct sdio_cmd53 *cmd)
{ {
struct sdio_func *func = container_of(wilc->dev, struct sdio_func, dev); struct sdio_func *func = container_of(wilc->dev, struct sdio_func, dev);
int size, ret; int size, ret;
...@@ -396,7 +396,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) ...@@ -396,7 +396,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
goto _fail_; goto _fail_;
} }
} else { } else {
sdio_cmd53_t cmd; struct sdio_cmd53 cmd;
/** /**
* set the AHB address * set the AHB address
...@@ -431,7 +431,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -431,7 +431,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
u32 block_size = g_sdio.block_size; u32 block_size = g_sdio.block_size;
sdio_cmd53_t cmd; struct sdio_cmd53 cmd;
int nblk, nleft, ret; int nblk, nleft, ret;
cmd.read_write = 1; cmd.read_write = 1;
...@@ -536,7 +536,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) ...@@ -536,7 +536,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
} }
*data = cmd.data; *data = cmd.data;
} else { } else {
sdio_cmd53_t cmd; struct sdio_cmd53 cmd;
if (!sdio_set_func0_csa_address(wilc, addr)) if (!sdio_set_func0_csa_address(wilc, addr))
goto _fail_; goto _fail_;
...@@ -571,7 +571,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -571,7 +571,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
u32 block_size = g_sdio.block_size; u32 block_size = g_sdio.block_size;
sdio_cmd53_t cmd; struct sdio_cmd53 cmd;
int nblk, nleft, ret; int nblk, nleft, ret;
cmd.read_write = 0; cmd.read_write = 0;
......
...@@ -58,7 +58,7 @@ struct sdio_cmd52 { ...@@ -58,7 +58,7 @@ struct sdio_cmd52 {
u32 data: 8; u32 data: 8;
}; };
typedef struct { struct sdio_cmd53 {
u32 read_write: 1; u32 read_write: 1;
u32 function: 3; u32 function: 3;
u32 block_mode: 1; u32 block_mode: 1;
...@@ -67,7 +67,7 @@ typedef struct { ...@@ -67,7 +67,7 @@ typedef struct {
u32 count: 9; u32 count: 9;
u8 *buffer; u8 *buffer;
u32 block_size; u32 block_size;
} sdio_cmd53_t; };
#define WILC_MAC_INDICATE_STATUS 0x1 #define WILC_MAC_INDICATE_STATUS 0x1
#define WILC_MAC_STATUS_INIT -1 #define WILC_MAC_STATUS_INIT -1
......
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