Commit 51e825f7 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: use u8 instead of uint8_t 



This patch replaces uint8_t with u8 that is a preferred kernel type.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2726887c

drivers/staging/wilc1000/host_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -7460,7 +7460,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt 
	return s32Error;

}

#endif /*WILC_AP_EXTERNAL_MLME*/

uint32_t wilc_get_chipid(uint8_t);

uint32_t wilc_get_chipid(u8);



s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Timeout)

{

drivers/staging/wilc1000/linux_mon.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 
#define IS_MGMT_STATUS_SUCCES			0x040

#define GET_PKT_OFFSET(a) (((a) >> 22) & 0x1ff)



void WILC_WFI_monitor_rx(uint8_t *buff, uint32_t size)

void WILC_WFI_monitor_rx(u8 *buff, uint32_t size)

{

	uint32_t header, pkt_offset;

	struct sk_buff *skb = NULL;

drivers/staging/wilc1000/linux_wlan.c

+15 −15
Original line number Diff line number Diff line
@@ -110,11 +110,11 @@ static struct semaphore close_exit_sync; 


static int wlan_deinit_locks(linux_wlan_t *nic);

static void wlan_deinitialize_threads(linux_wlan_t *nic);

extern void WILC_WFI_monitor_rx(uint8_t *buff, uint32_t size);

extern void WILC_WFI_p2p_rx(struct net_device *dev, uint8_t *buff, uint32_t size);

extern void WILC_WFI_monitor_rx(u8 *buff, uint32_t size);

extern void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, uint32_t size);



static void linux_wlan_tx_complete(void *priv, int status);

void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset);

void frmw_to_linux(u8 *buff, uint32_t size, uint32_t pkt_offset);

static int  mac_init_fn(struct net_device *ndev);

int  mac_xmit(struct sk_buff *skb, struct net_device *dev);

int  mac_open(struct net_device *ndev);
@@ -485,7 +485,7 @@ static void deinit_irq(linux_wlan_t *nic) 
/*

 *      OS functions

 */

static void linux_wlan_dbg(uint8_t *buff)

static void linux_wlan_dbg(u8 *buff)

{

	PRINT_D(INIT_DBG, "%d\n", *buff);

}
@@ -529,9 +529,9 @@ static void linux_wlan_mac_indicate(int flag) 


}



struct net_device *GetIfHandler(uint8_t *pMacHeader)

struct net_device *GetIfHandler(u8 *pMacHeader)

{

	uint8_t *Bssid, *Bssid1;

	u8 *Bssid, *Bssid1;

	int i = 0;



	Bssid  = pMacHeader + 10;
@@ -559,7 +559,7 @@ struct net_device *GetIfHandler(uint8_t *pMacHeader) 
	return NULL;

}



int linux_wlan_set_bssid(struct net_device *wilc_netdev, uint8_t *pBSSID)

int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID)

{

	int i = 0;

	int ret = -1;
@@ -580,9 +580,9 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, uint8_t *pBSSID) 
/*Function to get number of connected interfaces*/

int linux_wlan_get_num_conn_ifcs(void)

{

	uint8_t i = 0;

	uint8_t null_bssid[6] = {0};

	uint8_t ret_val = 0;

	u8 i = 0;

	u8 null_bssid[6] = {0};

	u8 ret_val = 0;



	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

		if (memcmp(g_linux_wlan->strInterfaceInfo[i].aBSSID, null_bssid, 6))
@@ -1380,13 +1380,13 @@ static void wlan_deinitialize_threads(linux_wlan_t *nic) 
#ifdef COMPLEMENT_BOOT



extern volatile int probe;

extern uint8_t core_11b_ready(void);

extern u8 core_11b_ready(void);



#define READY_CHECK_THRESHOLD		30

extern void wilc_wlan_global_reset(void);

uint8_t wilc1000_prepare_11b_core(wilc_wlan_inp_t *nwi,	wilc_wlan_oup_t *nwo, linux_wlan_t *nic)

u8 wilc1000_prepare_11b_core(wilc_wlan_inp_t *nwi,	wilc_wlan_oup_t *nwo, linux_wlan_t *nic)

{

	uint8_t trials = 0;

	u8 trials = 0;



	while ((core_11b_ready() && (READY_CHECK_THRESHOLD > (trials++)))) {

		PRINT_D(INIT_DBG, "11b core not ready yet: %u\n", trials);
@@ -1969,7 +1969,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) 
	return s32Error;

}



void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset)

void frmw_to_linux(u8 *buff, uint32_t size, uint32_t pkt_offset)

{



	unsigned int frame_len = 0;
@@ -2048,7 +2048,7 @@ void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset) 
		#endif

}



void WILC_WFI_mgmt_rx(uint8_t *buff, uint32_t size)

void WILC_WFI_mgmt_rx(u8 *buff, uint32_t size)

{

	int i = 0;

	perInterface_wlan_t *nic;

drivers/staging/wilc1000/linux_wlan_spi.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int linux_spi_init(void *vp) 


#if defined(TXRX_PHASE_SIZE)



int linux_spi_write(uint8_t *b, uint32_t len)

int linux_spi_write(u8 *b, uint32_t len)

{

	int ret;
@@ -194,7 +194,7 @@ int linux_spi_write(uint8_t *b, uint32_t len) 
}



#else

int linux_spi_write(uint8_t *b, uint32_t len)

int linux_spi_write(u8 *b, uint32_t len)

{



	int ret;

drivers/staging/wilc1000/linux_wlan_spi.h

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ extern struct spi_driver wilc_bus; 


int linux_spi_init(void *vp);

void linux_spi_deinit(void *vp);

int linux_spi_write(uint8_t *b, uint32_t len);

int linux_spi_read(uint8_t *rb, uint32_t rlen);

int linux_spi_write(u8 *b, uint32_t len);

int linux_spi_read(u8 *rb, uint32_t rlen);

int linux_spi_write_read(unsigned char *wb, unsigned char *rb, unsigned int rlen);

int linux_spi_set_max_speed(void);

#endif