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

staging: wilc1000: use u32 instead of uint32_t 



This patch replaces uint32_t with u32 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 ec53adfe

drivers/staging/wilc1000/host_interface.c

+2 −2
Original line number Diff line number Diff line
@@ -3380,7 +3380,7 @@ static void Handle_GetLinkspeed(tstrWILC_WFIDrv *drvHandler) 
s32 Handle_GetStatistics(tstrWILC_WFIDrv *drvHandler, tstrStatistics *pstrStatistics)

{

	tstrWID strWIDList[5];

	uint32_t u32WidsCount = 0, s32Error = 0;

	u32 u32WidsCount = 0, s32Error = 0;



	strWIDList[u32WidsCount].u16WIDid = WID_LINKSPEED;

	strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
@@ -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(u8);

u32 wilc_get_chipid(u8);



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

{

drivers/staging/wilc1000/linux_mon.c

+2 −2
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ 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(u8 *buff, uint32_t size)

void WILC_WFI_monitor_rx(u8 *buff, u32 size)

{

	uint32_t header, pkt_offset;

	u32 header, pkt_offset;

	struct sk_buff *skb = NULL;

	struct wilc_wfi_radiotap_hdr *hdr;

	struct wilc_wfi_radiotap_cb_hdr *cb_hdr;

drivers/staging/wilc1000/linux_wlan.c

+5 −5
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(u8 *buff, uint32_t size);

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

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

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



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

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

void frmw_to_linux(u8 *buff, u32 size, u32 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);
@@ -1969,7 +1969,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) 
	return s32Error;

}



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

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

{



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

}



void WILC_WFI_mgmt_rx(u8 *buff, uint32_t size)

void WILC_WFI_mgmt_rx(u8 *buff, u32 size)

{

	int i = 0;

	perInterface_wlan_t *nic;

drivers/staging/wilc1000/linux_wlan_spi.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 #define MAX_SPEED 6000000

#endif /* WILC_ASIC_A0 */



static uint32_t SPEED = MIN_SPEED;

static u32 SPEED = MIN_SPEED;



struct spi_device *wilc_spi_dev;

void linux_spi_deinit(void *vp);
@@ -115,7 +115,7 @@ int linux_spi_init(void *vp) 


#if defined(TXRX_PHASE_SIZE)



int linux_spi_write(u8 *b, uint32_t len)

int linux_spi_write(u8 *b, u32 len)

{

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



#else

int linux_spi_write(u8 *b, uint32_t len)

int linux_spi_write(u8 *b, u32 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(u8 *b, uint32_t len);

int linux_spi_read(u8 *rb, uint32_t rlen);

int linux_spi_write(u8 *b, u32 len);

int linux_spi_read(u8 *rb, u32 rlen);

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

int linux_spi_set_max_speed(void);

#endif