Commit 5832cbe2 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: use short name for hif local variable in chip_wakeup()

Make use of a shorter name for 'hif' variable to avoid possible 80
character checkpatch warning while the replacing hardcoded value with
macros in chip_wakeup().
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Link: https://lore.kernel.org/r/20200214172250.13026-8-ajay.kathat@microchip.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 167bd21c
...@@ -403,37 +403,34 @@ EXPORT_SYMBOL_GPL(chip_allow_sleep); ...@@ -403,37 +403,34 @@ EXPORT_SYMBOL_GPL(chip_allow_sleep);
void chip_wakeup(struct wilc *wilc) void chip_wakeup(struct wilc *wilc)
{ {
u32 reg, clk_status_reg; u32 reg, clk_status_reg;
const struct wilc_hif_func *h = wilc->hif_func;
if ((wilc->io_type & 0x1) == WILC_HIF_SPI) { if (wilc->io_type == WILC_HIF_SPI) {
do { do {
wilc->hif_func->hif_read_reg(wilc, 1, &reg); h->hif_read_reg(wilc, 1, &reg);
wilc->hif_func->hif_write_reg(wilc, 1, reg | BIT(1)); h->hif_write_reg(wilc, 1, reg | BIT(1));
wilc->hif_func->hif_write_reg(wilc, 1, reg & ~BIT(1)); h->hif_write_reg(wilc, 1, reg & ~BIT(1));
do { do {
usleep_range(2000, 2500); usleep_range(2000, 2500);
wilc_get_chipid(wilc, true); wilc_get_chipid(wilc, true);
} while (wilc_get_chipid(wilc, true) == 0); } while (wilc_get_chipid(wilc, true) == 0);
} while (wilc_get_chipid(wilc, true) == 0); } while (wilc_get_chipid(wilc, true) == 0);
} else if ((wilc->io_type & 0x1) == WILC_HIF_SDIO) { } else if (wilc->io_type == WILC_HIF_SDIO) {
wilc->hif_func->hif_write_reg(wilc, 0xfa, 1); h->hif_write_reg(wilc, 0xfa, 1);
usleep_range(200, 400); usleep_range(200, 400);
wilc->hif_func->hif_read_reg(wilc, 0xf0, &reg); h->hif_read_reg(wilc, 0xf0, &reg);
do { do {
wilc->hif_func->hif_write_reg(wilc, 0xf0, h->hif_write_reg(wilc, 0xf0, reg | BIT(0));
reg | BIT(0)); h->hif_read_reg(wilc, 0xf1, &clk_status_reg);
wilc->hif_func->hif_read_reg(wilc, 0xf1,
&clk_status_reg);
while ((clk_status_reg & 0x1) == 0) { while ((clk_status_reg & 0x1) == 0) {
usleep_range(2000, 2500); usleep_range(2000, 2500);
wilc->hif_func->hif_read_reg(wilc, 0xf1, h->hif_read_reg(wilc, 0xf1, &clk_status_reg);
&clk_status_reg);
} }
if ((clk_status_reg & 0x1) == 0) { if ((clk_status_reg & 0x1) == 0) {
wilc->hif_func->hif_write_reg(wilc, 0xf0, h->hif_write_reg(wilc, 0xf0, reg & (~BIT(0)));
reg & (~BIT(0)));
} }
} while ((clk_status_reg & 0x1) == 0); } while ((clk_status_reg & 0x1) == 0);
} }
...@@ -442,13 +439,13 @@ void chip_wakeup(struct wilc *wilc) ...@@ -442,13 +439,13 @@ void chip_wakeup(struct wilc *wilc)
if (wilc_get_chipid(wilc, false) < 0x1002b0) { if (wilc_get_chipid(wilc, false) < 0x1002b0) {
u32 val32; u32 val32;
wilc->hif_func->hif_read_reg(wilc, 0x1e1c, &val32); h->hif_read_reg(wilc, 0x1e1c, &val32);
val32 |= BIT(6); val32 |= BIT(6);
wilc->hif_func->hif_write_reg(wilc, 0x1e1c, val32); h->hif_write_reg(wilc, 0x1e1c, val32);
wilc->hif_func->hif_read_reg(wilc, 0x1e9c, &val32); h->hif_read_reg(wilc, 0x1e9c, &val32);
val32 |= BIT(6); val32 |= BIT(6);
wilc->hif_func->hif_write_reg(wilc, 0x1e9c, val32); h->hif_write_reg(wilc, 0x1e9c, val32);
} }
} }
wilc->chip_ps_state = WILC_CHIP_WAKEDUP; wilc->chip_ps_state = WILC_CHIP_WAKEDUP;
......
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