Skip to content

Commit

Permalink
staging: wilc1000: use short name for hif local variable in chip_wake…
Browse files Browse the repository at this point in the history
…up()

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: Ajay Singh <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
ajaykathat authored and gregkh committed Feb 14, 2020
1 parent 167bd21 commit 5832cbe
Showing 1 changed file with 16 additions and 19 deletions.
35 changes: 16 additions & 19 deletions drivers/staging/wilc1000/wlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,37 +403,34 @@ EXPORT_SYMBOL_GPL(chip_allow_sleep);
void chip_wakeup(struct wilc *wilc)
{
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 {
wilc->hif_func->hif_read_reg(wilc, 1, &reg);
wilc->hif_func->hif_write_reg(wilc, 1, reg | BIT(1));
wilc->hif_func->hif_write_reg(wilc, 1, reg & ~BIT(1));
h->hif_read_reg(wilc, 1, &reg);
h->hif_write_reg(wilc, 1, reg | BIT(1));
h->hif_write_reg(wilc, 1, reg & ~BIT(1));

do {
usleep_range(2000, 2500);
wilc_get_chipid(wilc, true);
} while (wilc_get_chipid(wilc, true) == 0);
} while (wilc_get_chipid(wilc, true) == 0);
} else if ((wilc->io_type & 0x1) == WILC_HIF_SDIO) {
wilc->hif_func->hif_write_reg(wilc, 0xfa, 1);
} else if (wilc->io_type == WILC_HIF_SDIO) {
h->hif_write_reg(wilc, 0xfa, 1);
usleep_range(200, 400);
wilc->hif_func->hif_read_reg(wilc, 0xf0, &reg);
h->hif_read_reg(wilc, 0xf0, &reg);
do {
wilc->hif_func->hif_write_reg(wilc, 0xf0,
reg | BIT(0));
wilc->hif_func->hif_read_reg(wilc, 0xf1,
&clk_status_reg);
h->hif_write_reg(wilc, 0xf0, reg | BIT(0));
h->hif_read_reg(wilc, 0xf1, &clk_status_reg);

while ((clk_status_reg & 0x1) == 0) {
usleep_range(2000, 2500);

wilc->hif_func->hif_read_reg(wilc, 0xf1,
&clk_status_reg);
h->hif_read_reg(wilc, 0xf1, &clk_status_reg);
}
if ((clk_status_reg & 0x1) == 0) {
wilc->hif_func->hif_write_reg(wilc, 0xf0,
reg & (~BIT(0)));
h->hif_write_reg(wilc, 0xf0, reg & (~BIT(0)));
}
} while ((clk_status_reg & 0x1) == 0);
}
Expand All @@ -442,13 +439,13 @@ void chip_wakeup(struct wilc *wilc)
if (wilc_get_chipid(wilc, false) < 0x1002b0) {
u32 val32;

wilc->hif_func->hif_read_reg(wilc, 0x1e1c, &val32);
h->hif_read_reg(wilc, 0x1e1c, &val32);
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);
wilc->hif_func->hif_write_reg(wilc, 0x1e9c, val32);
h->hif_write_reg(wilc, 0x1e9c, val32);
}
}
wilc->chip_ps_state = WILC_CHIP_WAKEDUP;
Expand Down

0 comments on commit 5832cbe

Please sign in to comment.