Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 5e63a598 编写于 作者: A Ajay Singh 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file 

Cleanup patch to have proper follow clear namespace in wilc_sdio.c file.
Signed-off-by: NAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 d4d30e46
隐藏空白更改
内联 并排
Showing with 46 addition and 46 deletion
drivers/staging/wilc1000/wilc_sdio.c
浏览文件 @ 5e63a598
...@@ -166,7 +166,7 @@ static void linux_sdio_remove(struct sdio_func *func) ...@@ -166,7 +166,7 @@ static void linux_sdio_remove(struct sdio_func *func)
wilc_netdev_cleanup(wilc); wilc_netdev_cleanup(wilc);
} }
static int sdio_reset(struct wilc *wilc) static int wilc_sdio_reset(struct wilc *wilc)
{ {
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
int ret; int ret;
...@@ -201,7 +201,7 @@ static int wilc_sdio_suspend(struct device *dev) ...@@ -201,7 +201,7 @@ static int wilc_sdio_suspend(struct device *dev)
chip_allow_sleep(wilc); chip_allow_sleep(wilc);
} }
ret = sdio_reset(wilc); ret = wilc_sdio_reset(wilc);
if (ret) { if (ret) {
dev_err(&func->dev, "Fail reset sdio\n"); dev_err(&func->dev, "Fail reset sdio\n");
return ret; return ret;
...@@ -245,7 +245,7 @@ static void wilc_sdio_disable_interrupt(struct wilc *dev) ...@@ -245,7 +245,7 @@ static void wilc_sdio_disable_interrupt(struct wilc *dev)
* *
********************************************/ ********************************************/
static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) static int wilc_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);
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
...@@ -286,7 +286,7 @@ static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) ...@@ -286,7 +286,7 @@ static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr)
return 0; return 0;
} }
static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) static int wilc_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);
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
...@@ -322,7 +322,7 @@ static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) ...@@ -322,7 +322,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 wilc_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);
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
...@@ -356,7 +356,7 @@ static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) ...@@ -356,7 +356,7 @@ static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size)
* Sdio interfaces * Sdio interfaces
* *
********************************************/ ********************************************/
static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) static int wilc_sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
...@@ -384,7 +384,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) ...@@ -384,7 +384,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
/** /**
* set the AHB address * set the AHB address
**/ **/
if (!sdio_set_func0_csa_address(wilc, addr)) if (!wilc_sdio_set_func0_csa_address(wilc, addr))
goto fail; goto fail;
cmd.read_write = 1; cmd.read_write = 1;
...@@ -410,7 +410,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) ...@@ -410,7 +410,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
return 0; return 0;
} }
static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) static int wilc_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);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
...@@ -459,7 +459,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -459,7 +459,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.buffer = buf; cmd.buffer = buf;
cmd.block_size = block_size; cmd.block_size = block_size;
if (addr > 0) { if (addr > 0) {
if (!sdio_set_func0_csa_address(wilc, addr)) if (!wilc_sdio_set_func0_csa_address(wilc, addr))
goto fail; goto fail;
} }
ret = wilc_sdio_cmd53(wilc, &cmd); ret = wilc_sdio_cmd53(wilc, &cmd);
...@@ -482,7 +482,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -482,7 +482,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.block_size = block_size; cmd.block_size = block_size;
if (addr > 0) { if (addr > 0) {
if (!sdio_set_func0_csa_address(wilc, addr)) if (!wilc_sdio_set_func0_csa_address(wilc, addr))
goto fail; goto fail;
} }
ret = wilc_sdio_cmd53(wilc, &cmd); ret = wilc_sdio_cmd53(wilc, &cmd);
...@@ -500,7 +500,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -500,7 +500,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
return 0; return 0;
} }
static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) static int wilc_sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
...@@ -523,7 +523,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) ...@@ -523,7 +523,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
} else { } else {
struct sdio_cmd53 cmd; struct sdio_cmd53 cmd;
if (!sdio_set_func0_csa_address(wilc, addr)) if (!wilc_sdio_set_func0_csa_address(wilc, addr))
goto fail; goto fail;
cmd.read_write = 0; cmd.read_write = 0;
...@@ -552,7 +552,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) ...@@ -552,7 +552,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
return 0; return 0;
} }
static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) static int wilc_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);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
...@@ -601,7 +601,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -601,7 +601,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.buffer = buf; cmd.buffer = buf;
cmd.block_size = block_size; cmd.block_size = block_size;
if (addr > 0) { if (addr > 0) {
if (!sdio_set_func0_csa_address(wilc, addr)) if (!wilc_sdio_set_func0_csa_address(wilc, addr))
goto fail; goto fail;
} }
ret = wilc_sdio_cmd53(wilc, &cmd); ret = wilc_sdio_cmd53(wilc, &cmd);
...@@ -624,7 +624,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -624,7 +624,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.block_size = block_size; cmd.block_size = block_size;
if (addr > 0) { if (addr > 0) {
if (!sdio_set_func0_csa_address(wilc, addr)) if (!wilc_sdio_set_func0_csa_address(wilc, addr))
goto fail; goto fail;
} }
ret = wilc_sdio_cmd53(wilc, &cmd); ret = wilc_sdio_cmd53(wilc, &cmd);
...@@ -648,12 +648,12 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) ...@@ -648,12 +648,12 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
* *
********************************************/ ********************************************/
static int sdio_deinit(struct wilc *wilc) static int wilc_sdio_deinit(struct wilc *wilc)
{ {
return 1; return 1;
} }
static int sdio_init(struct wilc *wilc, bool resume) static int wilc_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);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
...@@ -681,7 +681,7 @@ static int sdio_init(struct wilc *wilc, bool resume) ...@@ -681,7 +681,7 @@ static int sdio_init(struct wilc *wilc, bool resume)
/** /**
* function 0 block size * function 0 block size
**/ **/
if (!sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { if (!wilc_sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) {
dev_err(&func->dev, "Fail cmd 52, set func 0 block size...\n"); dev_err(&func->dev, "Fail cmd 52, set func 0 block size...\n");
goto fail; goto fail;
} }
...@@ -730,7 +730,7 @@ static int sdio_init(struct wilc *wilc, bool resume) ...@@ -730,7 +730,7 @@ static int sdio_init(struct wilc *wilc, bool resume)
/** /**
* func 1 is ready, set func 1 block size * func 1 is ready, set func 1 block size
**/ **/
if (!sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { if (!wilc_sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) {
dev_err(&func->dev, "Fail set func 1 block size...\n"); dev_err(&func->dev, "Fail set func 1 block size...\n");
goto fail; goto fail;
} }
...@@ -753,7 +753,7 @@ static int sdio_init(struct wilc *wilc, bool resume) ...@@ -753,7 +753,7 @@ static int sdio_init(struct wilc *wilc, bool resume)
* make sure can read back chip id correctly * make sure can read back chip id correctly
**/ **/
if (!resume) { if (!resume) {
if (!sdio_read_reg(wilc, 0x1000, &chipid)) { if (!wilc_sdio_read_reg(wilc, 0x1000, &chipid)) {
dev_err(&func->dev, "Fail cmd read chip id...\n"); dev_err(&func->dev, "Fail cmd read chip id...\n");
goto fail; goto fail;
} }
...@@ -773,7 +773,7 @@ static int sdio_init(struct wilc *wilc, bool resume) ...@@ -773,7 +773,7 @@ static int sdio_init(struct wilc *wilc, bool resume)
return 0; return 0;
} }
static int sdio_read_size(struct wilc *wilc, u32 *size) static int wilc_sdio_read_size(struct wilc *wilc, u32 *size)
{ {
u32 tmp; u32 tmp;
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
...@@ -798,14 +798,14 @@ static int sdio_read_size(struct wilc *wilc, u32 *size) ...@@ -798,14 +798,14 @@ static int sdio_read_size(struct wilc *wilc, u32 *size)
return 1; return 1;
} }
static int sdio_read_int(struct wilc *wilc, u32 *int_status) static int wilc_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);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
u32 tmp; u32 tmp;
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
sdio_read_size(wilc, &tmp); wilc_sdio_read_size(wilc, &tmp);
/** /**
* Read IRQ flags * Read IRQ flags
...@@ -857,7 +857,7 @@ static int sdio_read_int(struct wilc *wilc, u32 *int_status) ...@@ -857,7 +857,7 @@ static int sdio_read_int(struct wilc *wilc, u32 *int_status)
return 1; return 1;
} }
static int sdio_clear_int_ext(struct wilc *wilc, u32 val) static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
...@@ -982,7 +982,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val) ...@@ -982,7 +982,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
return 0; return 0;
} }
static int sdio_sync_ext(struct wilc *wilc, int nint) static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
{ {
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
struct wilc_sdio *sdio_priv = wilc->bus_data; struct wilc_sdio *sdio_priv = wilc->bus_data;
...@@ -1003,13 +1003,13 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) ...@@ -1003,13 +1003,13 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)
/** /**
* Disable power sequencer * Disable power sequencer
**/ **/
if (!sdio_read_reg(wilc, WILC_MISC, &reg)) { if (!wilc_sdio_read_reg(wilc, WILC_MISC, &reg)) {
dev_err(&func->dev, "Failed read misc reg...\n"); dev_err(&func->dev, "Failed read misc reg...\n");
return 0; return 0;
} }
reg &= ~BIT(8); reg &= ~BIT(8);
if (!sdio_write_reg(wilc, WILC_MISC, reg)) { if (!wilc_sdio_write_reg(wilc, WILC_MISC, reg)) {
dev_err(&func->dev, "Failed write misc reg...\n"); dev_err(&func->dev, "Failed write misc reg...\n");
return 0; return 0;
} }
...@@ -1021,14 +1021,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) ...@@ -1021,14 +1021,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)
/** /**
* interrupt pin mux select * interrupt pin mux select
**/ **/
ret = sdio_read_reg(wilc, WILC_PIN_MUX_0, &reg); ret = wilc_sdio_read_reg(wilc, WILC_PIN_MUX_0, &reg);
if (!ret) { if (!ret) {
dev_err(&func->dev, "Failed read reg (%08x)...\n", dev_err(&func->dev, "Failed read reg (%08x)...\n",
WILC_PIN_MUX_0); WILC_PIN_MUX_0);
return 0; return 0;
} }
reg |= BIT(8); reg |= BIT(8);
ret = sdio_write_reg(wilc, WILC_PIN_MUX_0, reg); ret = wilc_sdio_write_reg(wilc, WILC_PIN_MUX_0, reg);
if (!ret) { if (!ret) {
dev_err(&func->dev, "Failed write reg (%08x)...\n", dev_err(&func->dev, "Failed write reg (%08x)...\n",
WILC_PIN_MUX_0); WILC_PIN_MUX_0);
...@@ -1038,7 +1038,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) ...@@ -1038,7 +1038,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)
/** /**
* interrupt enable * interrupt enable
**/ **/
ret = sdio_read_reg(wilc, WILC_INTR_ENABLE, &reg); ret = wilc_sdio_read_reg(wilc, WILC_INTR_ENABLE, &reg);
if (!ret) { if (!ret) {
dev_err(&func->dev, "Failed read reg (%08x)...\n", dev_err(&func->dev, "Failed read reg (%08x)...\n",
WILC_INTR_ENABLE); WILC_INTR_ENABLE);
...@@ -1047,14 +1047,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) ...@@ -1047,14 +1047,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)
for (i = 0; (i < 5) && (nint > 0); i++, nint--) for (i = 0; (i < 5) && (nint > 0); i++, nint--)
reg |= BIT((27 + i)); reg |= BIT((27 + i));
ret = sdio_write_reg(wilc, WILC_INTR_ENABLE, reg); ret = wilc_sdio_write_reg(wilc, WILC_INTR_ENABLE, reg);
if (!ret) { if (!ret) {
dev_err(&func->dev, "Failed write reg (%08x)...\n", dev_err(&func->dev, "Failed write reg (%08x)...\n",
WILC_INTR_ENABLE); WILC_INTR_ENABLE);
return 0; return 0;
} }
if (nint) { if (nint) {
ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg); ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
if (!ret) { if (!ret) {
dev_err(&func->dev, dev_err(&func->dev,
"Failed read reg (%08x)...\n", "Failed read reg (%08x)...\n",
...@@ -1065,7 +1065,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) ...@@ -1065,7 +1065,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)
for (i = 0; (i < 3) && (nint > 0); i++, nint--) for (i = 0; (i < 3) && (nint > 0); i++, nint--)
reg |= BIT(i); reg |= BIT(i);
ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg); ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
if (!ret) { if (!ret) {
dev_err(&func->dev, dev_err(&func->dev,
"Failed write reg (%08x)...\n", "Failed write reg (%08x)...\n",
...@@ -1079,18 +1079,18 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) ...@@ -1079,18 +1079,18 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)
/* Global sdio HIF function table */ /* Global sdio HIF function table */
static const struct wilc_hif_func wilc_hif_sdio = { static const struct wilc_hif_func wilc_hif_sdio = {
.hif_init = sdio_init, .hif_init = wilc_sdio_init,
.hif_deinit = sdio_deinit, .hif_deinit = wilc_sdio_deinit,
.hif_read_reg = sdio_read_reg, .hif_read_reg = wilc_sdio_read_reg,
.hif_write_reg = sdio_write_reg, .hif_write_reg = wilc_sdio_write_reg,
.hif_block_rx = sdio_read, .hif_block_rx = wilc_sdio_read,
.hif_block_tx = sdio_write, .hif_block_tx = wilc_sdio_write,
.hif_read_int = sdio_read_int, .hif_read_int = wilc_sdio_read_int,
.hif_clear_int_ext = sdio_clear_int_ext, .hif_clear_int_ext = wilc_sdio_clear_int_ext,
.hif_read_size = sdio_read_size, .hif_read_size = wilc_sdio_read_size,
.hif_block_tx_ext = sdio_write, .hif_block_tx_ext = wilc_sdio_write,
.hif_block_rx_ext = sdio_read, .hif_block_rx_ext = wilc_sdio_read,
.hif_sync_ext = sdio_sync_ext, .hif_sync_ext = wilc_sdio_sync_ext,
.enable_interrupt = wilc_sdio_enable_interrupt, .enable_interrupt = wilc_sdio_enable_interrupt,
.disable_interrupt = wilc_sdio_disable_interrupt, .disable_interrupt = wilc_sdio_disable_interrupt,
}; };
...@@ -1103,7 +1103,7 @@ static int wilc_sdio_resume(struct device *dev) ...@@ -1103,7 +1103,7 @@ static int wilc_sdio_resume(struct device *dev)
dev_info(dev, "sdio resume\n"); dev_info(dev, "sdio resume\n");
sdio_release_host(func); sdio_release_host(func);
chip_wakeup(wilc); chip_wakeup(wilc);
sdio_init(wilc, true); wilc_sdio_init(wilc, true);
if (wilc->suspend_event) if (wilc->suspend_event)
host_wakeup_notify(wilc); host_wakeup_notify(wilc);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或