evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: wilc1000: remove function pointer os_debug

Browse source 
This patch removes os_debug and call linux_wlan_dbg function instead of
os_debug. Delete static from the linux_wlan_dbg.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2015-09-24 18:14:55 +09:00 • committed by Greg Kroah-Hartman
parent c0cadaa4ab
commit ef2b784c30
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -376,7 +376,7 @@ static void deinit_irq(linux_wlan_t *nic)
/* /*
* OS functions * OS functions
*/ */
static void linux_wlan_dbg(u8 *buff) void linux_wlan_dbg(u8 *buff)
{ {
PRINT_D(INIT_DBG, "%d\n", *buff); PRINT_D(INIT_DBG, "%d\n", *buff);
} }
@ -1072,7 +1072,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic)
nwi->os_context.rxq_critical_section = (void *)&g_linux_wlan->rxq_cs; nwi->os_context.rxq_critical_section = (void *)&g_linux_wlan->rxq_cs;
nwi->os_context.cfg_wait_event = (void *)&g_linux_wlan->cfg_event; nwi->os_context.cfg_wait_event = (void *)&g_linux_wlan->cfg_event;
nwi->os_func.os_debug = linux_wlan_dbg;
nwi->os_func.os_wait = linux_wlan_lock_timeout; nwi->os_func.os_wait = linux_wlan_lock_timeout;
#ifdef WILC_SDIO #ifdef WILC_SDIO

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

@ -219,5 +219,6 @@ extern struct net_device *WILC_WFI_devs[];
void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset); void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset);
void linux_wlan_mac_indicate(int flag); void linux_wlan_mac_indicate(int flag);
void linux_wlan_rx_complete(void); void linux_wlan_rx_complete(void);
void linux_wlan_dbg(u8 *buff);
#endif #endif

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

@ -113,8 +113,7 @@ static void wilc_debug(u32 flag, char *fmt, ...)
vsprintf(buf, fmt, args); vsprintf(buf, fmt, args);
va_end(args); va_end(args);
if (g_wlan.os_func.os_debug) linux_wlan_dbg(buf);
g_wlan.os_func.os_debug(buf);
} }
} }

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

@ -75,7 +75,6 @@ typedef struct {
} sdio_cmd53_t; } sdio_cmd53_t;
typedef struct { typedef struct {
void (*os_debug)(u8 *);
int (*os_wait)(void *, u32); int (*os_wait)(void *, u32);
} wilc_wlan_os_func_t; } wilc_wlan_os_func_t;