From c2e4c0f19a6bbcb4f5f7c8991614c1b1dfaf9683 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Sep 2015 19:09:50 -0700 Subject: [PATCH] staging: wilc1000: remove mdelay wrapper Just call the function, no need for a pointer to a function that calls the function. turtles, all the way down... Cc: Johnny Kim Cc: Rachel Kim Cc: Dean Lee Cc: Chris Park Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/linux_wlan.c | 5 ----- drivers/staging/wilc1000/wilc_wlan.c | 4 ++-- drivers/staging/wilc1000/wilc_wlan_if.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index c1289e0ac10d..734cabe698cb 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -540,10 +540,6 @@ static void linux_wlan_msleep(uint32_t msc) } } -static void linux_wlan_atomic_msleep(uint32_t msc) -{ - mdelay(msc); -} static void linux_wlan_dbg(uint8_t *buff) { PRINT_D(INIT_DBG, "%d\n", *buff); @@ -1460,7 +1456,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic) nwi->os_context.cfg_wait_event = (void *)&g_linux_wlan->cfg_event; nwi->os_func.os_sleep = linux_wlan_msleep; - nwi->os_func.os_atomic_sleep = linux_wlan_atomic_msleep; nwi->os_func.os_debug = linux_wlan_dbg; nwi->os_func.os_lock = linux_wlan_lock; nwi->os_func.os_unlock = linux_wlan_unlock; diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 95897bf16626..6bf1f4544adc 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1352,12 +1352,12 @@ static void wilc_pllupdate_isr_ext(uint32_t int_stats) g_wlan.hif_func.hif_clear_int_ext(PLL_INT_CLR); /* Waiting for PLL */ - g_wlan.os_func.os_atomic_sleep(WILC_PLL_TO); + mdelay(WILC_PLL_TO); /* poll till read a valid data */ while (!(ISWILC1000(wilc_get_chipid(true)) && --trials)) { PRINT_D(TX_DBG, "PLL update retrying\n"); - g_wlan.os_func.os_atomic_sleep(1); + mdelay(1); } } diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 5a01d34f6419..7787e8f803ee 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -85,7 +85,6 @@ typedef struct { typedef struct { void (*os_sleep)(uint32_t); - void (*os_atomic_sleep)(uint32_t); void (*os_debug)(uint8_t *); void (*os_lock)(void *); void (*os_unlock)(void *); -- 2.20.1