Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda2b2fb authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: wilc_wlan_cfg_init: changes unused argument 



This patch changes the argument of the wilc_wlan_cfg_init function,
wilc_debug to void type because wilc_debug function is not used any more.
In addition, finally removes wilc_debug and related variables.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21ac321f

drivers/staging/wilc1000/wilc_wlan.c

+1 −16
Original line number Diff line number Diff line
@@ -3,21 +3,6 @@ 
#include "wilc_wfi_netdevice.h"

#include "wilc_wlan_cfg.h"



static u32 dbgflag = N_INIT | N_ERR | N_INTR | N_TXQ | N_RXQ;



/* FIXME: replace with dev_debug() */

static void wilc_debug(u32 flag, char *fmt, ...)

{

	char buf[256];

	va_list args;



	if (flag & dbgflag) {

		va_start(args, fmt);

		vsprintf(buf, fmt, args);

		va_end(args);

	}

}



static CHIP_PS_STATE_T chip_ps_state = CHIP_WAKEDUP;



static inline void acquire_bus(struct wilc *wilc, BUS_ACQUIRE_T acquire)
@@ -1448,7 +1433,7 @@ int wilc_wlan_init(struct net_device *dev) 
		goto _fail_;

	}



	if (!wilc_wlan_cfg_init(wilc_debug)) {

	if (!wilc_wlan_cfg_init()) {

		ret = -ENOBUFS;

		goto _fail_;

	}

drivers/staging/wilc1000/wilc_wlan_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ int wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size, 
	return ret;

}



int wilc_wlan_cfg_init(wilc_debug_func func)

int wilc_wlan_cfg_init(void)

{

	memset((void *)&g_mac, 0, sizeof(struct wilc_mac_cfg));

	return 1;

drivers/staging/wilc1000/wilc_wlan_cfg.h

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,6 @@ int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id); 
int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size);

int wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size,

			      struct wilc_cfg_rsp *rsp);

int wilc_wlan_cfg_init(wilc_debug_func func);

int wilc_wlan_cfg_init(void);



#endif