leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: wilc1000: use u16 instead of uint16_t

Browse Source 
This patch replaces uint16_t with u16 that is preferred kernel type.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2015-09-15 14:06:15 +09:00 committed by Greg Kroah-Hartman
parent 51e825f70b
commit ec53adfe1c
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/wilc_spi.c
View File

@ -453,7 +453,7 @@ static int spi_cmd_complete(u8 cmd, uint32_t adr, u8 *b, uint32_t sz, u8 clockle
if ((cmd == CMD_INTERNAL_READ) || (cmd == CMD_SINGLE_READ)
|| (cmd == CMD_DMA_READ) || (cmd == CMD_DMA_EXT_READ)) {
int retry;
/* uint16_t crc1, crc2; */
/* u16 crc1, crc2; */
u8 crc[2];
/**
* Data Respnose header

12
drivers/staging/wilc1000/wilc_wlan.c
View File

@ -285,9 +285,9 @@ struct Ack_session_info;
struct Ack_session_info {
uint32_t Ack_seq_num;
uint32_t Bigger_Ack_num;
uint16_t src_port;
uint16_t dst_port;
uint16_t status;
u16 src_port;
u16 dst_port;
u16 status;
};
typedef struct {
@ -1848,7 +1848,7 @@ static int wilc_wlan_cfg_set(int start, uint32_t wid, u8 *buffer, uint32_t buffe
p->cfg_frame_offset = 0;
offset = p->cfg_frame_offset;
ret_size = p->cif_func.cfg_wid_set(p->cfg_frame.frame, offset, (uint16_t)wid, buffer, buffer_size);
ret_size = p->cif_func.cfg_wid_set(p->cfg_frame.frame, offset, (u16)wid, buffer, buffer_size);
offset += ret_size;
p->cfg_frame_offset = offset;
@ -1887,7 +1887,7 @@ static int wilc_wlan_cfg_get(int start, uint32_t wid, int commit, uint32_t drvHa
p->cfg_frame_offset = 0;
offset = p->cfg_frame_offset;
ret_size = p->cif_func.cfg_wid_get(p->cfg_frame.frame, offset, (uint16_t)wid);
ret_size = p->cif_func.cfg_wid_get(p->cfg_frame.frame, offset, (u16)wid);
offset += ret_size;
p->cfg_frame_offset = offset;
@ -1917,7 +1917,7 @@ static int wilc_wlan_cfg_get_val(uint32_t wid, u8 *buffer, uint32_t buffer_size)
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
int ret;
ret = p->cif_func.cfg_wid_get_val((uint16_t)wid, buffer, buffer_size);
ret = p->cif_func.cfg_wid_get_val((u16)wid, buffer, buffer_size);
return ret;
}

6
drivers/staging/wilc1000/wilc_wlan.h
View File

@ -304,9 +304,9 @@ typedef struct {
} wilc_cfg_rsp_t;
typedef struct {
int (*cfg_wid_set)(u8 *, uint32_t, uint16_t, u8 *, int);
int (*cfg_wid_get)(u8 *, uint32_t, uint16_t);
int (*cfg_wid_get_val)(uint16_t, u8 *, uint32_t);
int (*cfg_wid_set)(u8 *, uint32_t, u16, u8 *, int);
int (*cfg_wid_get)(u8 *, uint32_t, u16);
int (*cfg_wid_get_val)(u16, u8 *, uint32_t);
int (*rx_indicate)(u8 *, int, wilc_cfg_rsp_t *);
int (*cfg_init)(wilc_debug_func);
} wilc_cfg_func_t;

18
drivers/staging/wilc1000/wilc_wlan_cfg.c
View File

@ -160,7 +160,7 @@ static wilc_cfg_str_t g_cfg_str[] = {
*
********************************************/
static int wilc_wlan_cfg_set_byte(u8 *frame, uint32_t offset, uint16_t id, u8 val8)
static int wilc_wlan_cfg_set_byte(u8 *frame, uint32_t offset, u16 id, u8 val8)
{
u8 *buf;
@ -176,7 +176,7 @@ static int wilc_wlan_cfg_set_byte(u8 *frame, uint32_t offset, uint16_t id, u8 va
return 4;
}
static int wilc_wlan_cfg_set_hword(u8 *frame, uint32_t offset, uint16_t id, uint16_t val16)
static int wilc_wlan_cfg_set_hword(u8 *frame, uint32_t offset, u16 id, u16 val16)
{
u8 *buf;
@ -194,7 +194,7 @@ static int wilc_wlan_cfg_set_hword(u8 *frame, uint32_t offset, uint16_t id, uint
return 5;
}
static int wilc_wlan_cfg_set_word(u8 *frame, uint32_t offset, uint16_t id, uint32_t val32)
static int wilc_wlan_cfg_set_word(u8 *frame, uint32_t offset, u16 id, uint32_t val32)
{
u8 *buf;
@ -214,7 +214,7 @@ static int wilc_wlan_cfg_set_word(u8 *frame, uint32_t offset, uint16_t id, uint3
return 7;
}
static int wilc_wlan_cfg_set_str(u8 *frame, uint32_t offset, uint16_t id, u8 *str, uint32_t size)
static int wilc_wlan_cfg_set_str(u8 *frame, uint32_t offset, u16 id, u8 *str, uint32_t size)
{
u8 *buf;
@ -233,7 +233,7 @@ static int wilc_wlan_cfg_set_str(u8 *frame, uint32_t offset, uint16_t id, u8 *st
return (size + 3);
}
static int wilc_wlan_cfg_set_bin(u8 *frame, uint32_t offset, uint16_t id, u8 *b, uint32_t size)
static int wilc_wlan_cfg_set_bin(u8 *frame, uint32_t offset, u16 id, u8 *b, uint32_t size)
{
u8 *buf;
uint32_t i;
@ -385,7 +385,7 @@ static int wilc_wlan_parse_info_frame(u8 *info, int size)
*
********************************************/
static int wilc_wlan_cfg_set_wid(u8 *frame, uint32_t offset, uint16_t id, u8 *buf, int size)
static int wilc_wlan_cfg_set_wid(u8 *frame, uint32_t offset, u16 id, u8 *buf, int size)
{
u8 type = (id >> 12) & 0xf;
int ret = 0;
@ -395,7 +395,7 @@ static int wilc_wlan_cfg_set_wid(u8 *frame, uint32_t offset, uint16_t id, u8 *bu
ret = wilc_wlan_cfg_set_byte(frame, offset, id, *buf);
} else if (type == 1) { /* half word command */
if (size >= 2)
ret = wilc_wlan_cfg_set_hword(frame, offset, id, *((uint16_t *)buf));
ret = wilc_wlan_cfg_set_hword(frame, offset, id, *((u16 *)buf));
} else if (type == 2) { /* word command */
if (size >= 4)
ret = wilc_wlan_cfg_set_word(frame, offset, id, *((uint32_t *)buf));
@ -410,7 +410,7 @@ static int wilc_wlan_cfg_set_wid(u8 *frame, uint32_t offset, uint16_t id, u8 *bu
return ret;
}
static int wilc_wlan_cfg_get_wid(u8 *frame, uint32_t offset, uint16_t id)
static int wilc_wlan_cfg_get_wid(u8 *frame, uint32_t offset, u16 id)
{
u8 *buf;
@ -425,7 +425,7 @@ static int wilc_wlan_cfg_get_wid(u8 *frame, uint32_t offset, uint16_t id)
return 2;
}
static int wilc_wlan_cfg_get_wid_value(uint16_t wid, u8 *buffer, uint32_t buffer_size)
static int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, uint32_t buffer_size)
{
uint32_t type = (wid >> 12) & 0xf;
int i, ret = 0;

8
drivers/staging/wilc1000/wilc_wlan_cfg.h
View File

@ -11,13 +11,13 @@
#define WILC_WLAN_CFG_H
typedef struct {
uint16_t id;
uint16_t val;
u16 id;
u16 val;
} wilc_cfg_byte_t;
typedef struct {
uint16_t id;
uint16_t val;
u16 id;
u16 val;
} wilc_cfg_hword_t;
typedef struct {