Commit c2e4c0f1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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 <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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a18dd630

drivers/staging/wilc1000/linux_wlan.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

drivers/staging/wilc1000/wilc_wlan.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/staging/wilc1000/wilc_wlan_if.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *);