redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: wilc1000: remove wrapper around usleep_range()

Browse source 
Just call the function directly, no need for the indirection.

Cc: Johnny Kim <johnny.kim@atmel.com>
Cc: Rachel Kim <rachel.kim@atmel.com>
Cc: Dean Lee <dean.lee@atmel.com>
Cc: Chris Park <chris.park@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2015-09-04 09:30:51 -07:00
parent 360e27a91d
commit 2b922cbef1
3 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/wilc1000/linux_wlan.c
View file

@ -527,17 +527,6 @@ static void deinit_irq(linux_wlan_t *nic)
/*
* OS functions
*/
static void linux_wlan_msleep(uint32_t msc)
{
if (msc <= 4000000) {
u32 u32Temp = msc * 1000;
usleep_range(u32Temp, u32Temp);
} else {
msleep(msc);
}
}
static void linux_wlan_dbg(uint8_t *buff)
{
PRINT_D(INIT_DBG, "%d\n", *buff);
@ -1310,7 +1299,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic)
nwi->os_context.rxq_wait_event = (void *)&g_linux_wlan->rxq_event;
nwi->os_context.cfg_wait_event = (void *)&g_linux_wlan->cfg_event;
nwi->os_func.os_sleep = linux_wlan_msleep;
nwi->os_func.os_debug = linux_wlan_dbg;
nwi->os_func.os_wait = linux_wlan_lock_timeout;

4
drivers/staging/wilc1000/wilc_wlan.c
View file

@ -999,7 +999,7 @@ static int wilc_wlan_handle_txq(uint32_t *pu32TxqCount)
**/
PRINT_WRN(GENERIC_DBG, "[wilc txq]: warn, vmm table not clear yet, wait...\n");
release_bus(RELEASE_ALLOW_SLEEP);
p->os_func.os_sleep(3); /* wait 3 ms */
usleep_range(3000, 3000);
acquire_bus(ACQUIRE_AND_WAKEUP);
}
} while (!p->quit);
@ -1049,7 +1049,7 @@ static int wilc_wlan_handle_txq(uint32_t *pu32TxqCount)
break;
} else {
release_bus(RELEASE_ALLOW_SLEEP);
p->os_func.os_sleep(3); /* wait 3 ms */
usleep_range(3000, 3000);
acquire_bus(ACQUIRE_AND_WAKEUP);
PRINT_WRN(GENERIC_DBG, "Can't get VMM entery - reg = %2x\n", reg);
}

1
drivers/staging/wilc1000/wilc_wlan_if.h
View file

@ -84,7 +84,6 @@ typedef struct {
} sdio_cmd53_t;
typedef struct {
void (*os_sleep)(uint32_t);
void (*os_debug)(uint8_t *);
int (*os_wait)(void *, u32);
} wilc_wlan_os_func_t;