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

staging: wilc1000: remove typedef from struct sdio_cmd52_t

This patch removes typedef from struct sdio_cmd52_t and renames it to
sdio_cmd52.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea363b41
...@@ -51,7 +51,7 @@ static void wilc_sdio_interrupt(struct sdio_func *func) ...@@ -51,7 +51,7 @@ static void wilc_sdio_interrupt(struct sdio_func *func)
sdio_claim_host(func); sdio_claim_host(func);
} }
static int wilc_sdio_cmd52(struct wilc *wilc, sdio_cmd52_t *cmd) static int wilc_sdio_cmd52(struct wilc *wilc, struct sdio_cmd52 *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 ret; int ret;
...@@ -145,7 +145,7 @@ static void linux_sdio_remove(struct sdio_func *func) ...@@ -145,7 +145,7 @@ static void linux_sdio_remove(struct sdio_func *func)
static int sdio_reset(struct wilc *wilc) static int sdio_reset(struct wilc *wilc)
{ {
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
int ret; int ret;
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
...@@ -266,7 +266,7 @@ static void wilc_sdio_disable_interrupt(struct wilc *dev) ...@@ -266,7 +266,7 @@ static void wilc_sdio_disable_interrupt(struct wilc *dev)
static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
int ret; int ret;
/** /**
...@@ -307,7 +307,7 @@ static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) ...@@ -307,7 +307,7 @@ static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr)
static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
int ret; int ret;
cmd.read_write = 1; cmd.read_write = 1;
...@@ -343,7 +343,7 @@ static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) ...@@ -343,7 +343,7 @@ static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size)
static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
int ret; int ret;
cmd.read_write = 1; cmd.read_write = 1;
...@@ -382,7 +382,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) ...@@ -382,7 +382,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
data = cpu_to_le32(data); data = cpu_to_le32(data);
if ((addr >= 0xf0) && (addr <= 0xff)) { if ((addr >= 0xf0) && (addr <= 0xff)) {
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
cmd.read_write = 1; cmd.read_write = 1;
cmd.function = 0; cmd.function = 0;
...@@ -522,7 +522,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) ...@@ -522,7 +522,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
int ret; int ret;
if ((addr >= 0xf0) && (addr <= 0xff)) { if ((addr >= 0xf0) && (addr <= 0xff)) {
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
cmd.read_write = 0; cmd.read_write = 0;
cmd.function = 0; cmd.function = 0;
...@@ -670,7 +670,7 @@ static int sdio_deinit(struct wilc *wilc) ...@@ -670,7 +670,7 @@ static int sdio_deinit(struct wilc *wilc)
static int sdio_init(struct wilc *wilc, bool resume) static int sdio_init(struct wilc *wilc, bool resume)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
int loop, ret; int loop, ret;
u32 chipid; u32 chipid;
...@@ -791,7 +791,7 @@ static int sdio_init(struct wilc *wilc, bool resume) ...@@ -791,7 +791,7 @@ static int sdio_init(struct wilc *wilc, bool resume)
static int sdio_read_size(struct wilc *wilc, u32 *size) static int sdio_read_size(struct wilc *wilc, u32 *size)
{ {
u32 tmp; u32 tmp;
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
/** /**
* Read DMA count in words * Read DMA count in words
...@@ -820,7 +820,7 @@ static int sdio_read_int(struct wilc *wilc, u32 *int_status) ...@@ -820,7 +820,7 @@ static int sdio_read_int(struct wilc *wilc, u32 *int_status)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
u32 tmp; u32 tmp;
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
sdio_read_size(wilc, &tmp); sdio_read_size(wilc, &tmp);
...@@ -899,7 +899,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val) ...@@ -899,7 +899,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
if ((val & EN_VMM) == EN_VMM) if ((val & EN_VMM) == EN_VMM)
reg |= BIT(7); reg |= BIT(7);
if (reg) { if (reg) {
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
cmd.read_write = 1; cmd.read_write = 1;
cmd.function = 0; cmd.function = 0;
...@@ -929,7 +929,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val) ...@@ -929,7 +929,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
ret = 1; ret = 1;
for (i = 0; i < g_sdio.nint; i++) { for (i = 0; i < g_sdio.nint; i++) {
if (flags & 1) { if (flags & 1) {
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
cmd.read_write = 1; cmd.read_write = 1;
cmd.function = 0; cmd.function = 0;
...@@ -977,7 +977,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val) ...@@ -977,7 +977,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
vmm_ctl |= BIT(2); vmm_ctl |= BIT(2);
if (vmm_ctl) { if (vmm_ctl) {
sdio_cmd52_t cmd; struct sdio_cmd52 cmd;
cmd.read_write = 1; cmd.read_write = 1;
cmd.function = 0; cmd.function = 0;
......
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
* *
********************************************/ ********************************************/
typedef struct { struct sdio_cmd52 {
u32 read_write: 1; u32 read_write: 1;
u32 function: 3; u32 function: 3;
u32 raw: 1; u32 raw: 1;
u32 address: 17; u32 address: 17;
u32 data: 8; u32 data: 8;
} sdio_cmd52_t; };
typedef struct { typedef struct {
/* struct { */ /* struct { */
......
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