Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 169
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 feedcf1a 编写于 作者: W Wolfram Sang 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: ks7010: remove unecessary typedef 

Let's simply specify the struct to keep in sync with kernel coding
style.
Signed-off-by: NWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 acd15986
展开全部 隐藏空白更改
内联 并排
Showing with 175 addition and 175 deletion
drivers/staging/ks7010/ks7010_config.c
浏览文件 @ feedcf1a
...@@ -87,7 +87,7 @@ void analyze_hex_wep_key(struct ks_wlan_parameter *param, int wep_key_index, cha ...@@ -87,7 +87,7 @@ void analyze_hex_wep_key(struct ks_wlan_parameter *param, int wep_key_index, cha
} }
static static
int rate_set_configuration(ks_wlan_private *priv, char *value) int rate_set_configuration(struct ks_wlan_private *priv, char *value)
{ {
int rc=0; int rc=0;
...@@ -169,7 +169,7 @@ int rate_set_configuration(ks_wlan_private *priv, char *value) ...@@ -169,7 +169,7 @@ int rate_set_configuration(ks_wlan_private *priv, char *value)
} }
#include <linux/firmware.h> #include <linux/firmware.h>
int ks_wlan_read_config_file(ks_wlan_private *priv) int ks_wlan_read_config_file(struct ks_wlan_private *priv)
{ {
struct { struct {
const int key_len; const int key_len;
......
drivers/staging/ks7010/ks7010_sdio.c
浏览文件 @ feedcf1a
...@@ -51,9 +51,9 @@ static struct ks_sdio_model ks_sdio_models[] = { ...@@ -51,9 +51,9 @@ static struct ks_sdio_model ks_sdio_models[] = {
static int ks7910_sdio_probe(struct sdio_func *function, const struct sdio_device_id *device); static int ks7910_sdio_probe(struct sdio_func *function, const struct sdio_device_id *device);
static void ks7910_sdio_remove(struct sdio_func *function); static void ks7910_sdio_remove(struct sdio_func *function);
static void ks7010_rw_function(struct work_struct *work); static void ks7010_rw_function(struct work_struct *work);
static int ks7010_sdio_read( ks_wlan_private *priv, unsigned int address, static int ks7010_sdio_read( struct ks_wlan_private *priv, unsigned int address,
unsigned char *buffer, int length ); unsigned char *buffer, int length );
static int ks7010_sdio_write( ks_wlan_private *priv, unsigned int address, static int ks7010_sdio_write( struct ks_wlan_private *priv, unsigned int address,
unsigned char *buffer, int length ); unsigned char *buffer, int length );
/* macro */ /* macro */
...@@ -71,7 +71,7 @@ static int ks7010_sdio_write( ks_wlan_private *priv, unsigned int address, ...@@ -71,7 +71,7 @@ static int ks7010_sdio_write( ks_wlan_private *priv, unsigned int address,
#define cnt_rxqbody(priv) \ #define cnt_rxqbody(priv) \
(((priv->rx_dev.qtail + RX_DEVICE_BUFF_SIZE) - (priv->rx_dev.qhead)) % RX_DEVICE_BUFF_SIZE ) (((priv->rx_dev.qtail + RX_DEVICE_BUFF_SIZE) - (priv->rx_dev.qhead)) % RX_DEVICE_BUFF_SIZE )
void ks_wlan_hw_sleep_doze_request(ks_wlan_private *priv) void ks_wlan_hw_sleep_doze_request(struct ks_wlan_private *priv)
{ {
unsigned char rw_data; unsigned char rw_data;
int retval; int retval;
...@@ -102,7 +102,7 @@ void ks_wlan_hw_sleep_doze_request(ks_wlan_private *priv) ...@@ -102,7 +102,7 @@ void ks_wlan_hw_sleep_doze_request(ks_wlan_private *priv)
return; return;
} }
void ks_wlan_hw_sleep_wakeup_request(ks_wlan_private *priv) void ks_wlan_hw_sleep_wakeup_request(struct ks_wlan_private *priv)
{ {
unsigned char rw_data; unsigned char rw_data;
int retval; int retval;
...@@ -134,7 +134,7 @@ void ks_wlan_hw_sleep_wakeup_request(ks_wlan_private *priv) ...@@ -134,7 +134,7 @@ void ks_wlan_hw_sleep_wakeup_request(ks_wlan_private *priv)
} }
void ks_wlan_hw_wakeup_request(ks_wlan_private *priv) void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv)
{ {
unsigned char rw_data; unsigned char rw_data;
int retval; int retval;
...@@ -155,7 +155,7 @@ void ks_wlan_hw_wakeup_request(ks_wlan_private *priv) ...@@ -155,7 +155,7 @@ void ks_wlan_hw_wakeup_request(ks_wlan_private *priv)
} }
} }
int _ks_wlan_hw_power_save(ks_wlan_private *priv) int _ks_wlan_hw_power_save(struct ks_wlan_private *priv)
{ {
int rc=0; int rc=0;
unsigned char rw_data; unsigned char rw_data;
...@@ -220,13 +220,13 @@ int _ks_wlan_hw_power_save(ks_wlan_private *priv) ...@@ -220,13 +220,13 @@ int _ks_wlan_hw_power_save(ks_wlan_private *priv)
return rc; return rc;
} }
int ks_wlan_hw_power_save(ks_wlan_private *priv) int ks_wlan_hw_power_save(struct ks_wlan_private *priv)
{ {
queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,&priv->ks_wlan_hw.rw_wq, 1); queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,&priv->ks_wlan_hw.rw_wq, 1);
return 0; return 0;
} }
static int ks7010_sdio_read(ks_wlan_private *priv, unsigned int address, static int ks7010_sdio_read(struct ks_wlan_private *priv, unsigned int address,
unsigned char *buffer, int length) unsigned char *buffer, int length)
{ {
int rc = -1; int rc = -1;
...@@ -249,7 +249,7 @@ static int ks7010_sdio_read(ks_wlan_private *priv, unsigned int address, ...@@ -249,7 +249,7 @@ static int ks7010_sdio_read(ks_wlan_private *priv, unsigned int address,
return rc; return rc;
} }
static int ks7010_sdio_write(ks_wlan_private *priv, unsigned int address, static int ks7010_sdio_write(struct ks_wlan_private *priv, unsigned int address,
unsigned char *buffer, int length) unsigned char *buffer, int length)
{ {
int rc = -1; int rc = -1;
...@@ -272,7 +272,7 @@ static int ks7010_sdio_write(ks_wlan_private *priv, unsigned int address, ...@@ -272,7 +272,7 @@ static int ks7010_sdio_write(ks_wlan_private *priv, unsigned int address,
return rc; return rc;
} }
static int enqueue_txdev(ks_wlan_private *priv, unsigned char *p, unsigned long size, static int enqueue_txdev(struct ks_wlan_private *priv, unsigned char *p, unsigned long size,
void (*complete_handler)(void *arg1, void *arg2), void (*complete_handler)(void *arg1, void *arg2),
void *arg1, void *arg2 ) void *arg1, void *arg2 )
{ {
...@@ -306,7 +306,7 @@ static int enqueue_txdev(ks_wlan_private *priv, unsigned char *p, unsigned long ...@@ -306,7 +306,7 @@ static int enqueue_txdev(ks_wlan_private *priv, unsigned char *p, unsigned long
} }
/* write data */ /* write data */
static int write_to_device(ks_wlan_private *priv, unsigned char *buffer, unsigned long size ) static int write_to_device(struct ks_wlan_private *priv, unsigned char *buffer, unsigned long size )
{ {
int rc,retval; int rc,retval;
unsigned char rw_data; unsigned char rw_data;
...@@ -338,7 +338,7 @@ static int write_to_device(ks_wlan_private *priv, unsigned char *buffer, unsigne ...@@ -338,7 +338,7 @@ static int write_to_device(ks_wlan_private *priv, unsigned char *buffer, unsigne
static void tx_device_task(void *dev) static void tx_device_task(void *dev)
{ {
ks_wlan_private *priv = (ks_wlan_private *)dev; struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
struct tx_device_buffer *sp; struct tx_device_buffer *sp;
int rc = 0; int rc = 0;
...@@ -366,7 +366,7 @@ static void tx_device_task(void *dev) ...@@ -366,7 +366,7 @@ static void tx_device_task(void *dev)
return; return;
} }
int ks_wlan_hw_tx( ks_wlan_private *priv, void *p, unsigned long size, int ks_wlan_hw_tx( struct ks_wlan_private *priv, void *p, unsigned long size,
void (*complete_handler)(void *arg1, void *arg2), void (*complete_handler)(void *arg1, void *arg2),
void *arg1, void *arg2 ) void *arg1, void *arg2 )
{ {
...@@ -396,7 +396,7 @@ int ks_wlan_hw_tx( ks_wlan_private *priv, void *p, unsigned long size, ...@@ -396,7 +396,7 @@ int ks_wlan_hw_tx( ks_wlan_private *priv, void *p, unsigned long size,
static void rx_event_task(unsigned long dev) static void rx_event_task(unsigned long dev)
{ {
ks_wlan_private *priv = (ks_wlan_private *)dev; struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
struct rx_device_buffer *rp; struct rx_device_buffer *rp;
DPRINTK(4,"\n"); DPRINTK(4,"\n");
...@@ -416,7 +416,7 @@ static void rx_event_task(unsigned long dev) ...@@ -416,7 +416,7 @@ static void rx_event_task(unsigned long dev)
static void ks_wlan_hw_rx(void *dev, uint16_t size) static void ks_wlan_hw_rx(void *dev, uint16_t size)
{ {
ks_wlan_private *priv = (ks_wlan_private *)dev; struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
int retval; int retval;
struct rx_device_buffer *rx_buffer; struct rx_device_buffer *rx_buffer;
struct hostif_hdr *hdr; struct hostif_hdr *hdr;
...@@ -560,7 +560,7 @@ static void ks_sdio_interrupt(struct sdio_func *func) ...@@ -560,7 +560,7 @@ static void ks_sdio_interrupt(struct sdio_func *func)
{ {
int retval; int retval;
struct ks_sdio_card *card; struct ks_sdio_card *card;
ks_wlan_private *priv; struct ks_wlan_private *priv;
unsigned char status, rsize, rw_data; unsigned char status, rsize, rw_data;
card = sdio_get_drvdata(func); card = sdio_get_drvdata(func);
...@@ -643,7 +643,7 @@ static void ks_sdio_interrupt(struct sdio_func *func) ...@@ -643,7 +643,7 @@ static void ks_sdio_interrupt(struct sdio_func *func)
return; return;
} }
static int trx_device_init( ks_wlan_private *priv ) static int trx_device_init( struct ks_wlan_private *priv )
{ {
/* initialize values (tx) */ /* initialize values (tx) */
priv->tx_dev.qtail = priv->tx_dev.qhead = 0; priv->tx_dev.qtail = priv->tx_dev.qhead = 0;
...@@ -660,7 +660,7 @@ static int trx_device_init( ks_wlan_private *priv ) ...@@ -660,7 +660,7 @@ static int trx_device_init( ks_wlan_private *priv )
return 0; return 0;
} }
static void trx_device_exit( ks_wlan_private *priv ) static void trx_device_exit( struct ks_wlan_private *priv )
{ {
struct tx_device_buffer *sp; struct tx_device_buffer *sp;
...@@ -677,7 +677,7 @@ static void trx_device_exit( ks_wlan_private *priv ) ...@@ -677,7 +677,7 @@ static void trx_device_exit( ks_wlan_private *priv )
return; return;
} }
static int ks7010_sdio_update_index(ks_wlan_private *priv, u32 index) static int ks7010_sdio_update_index(struct ks_wlan_private *priv, u32 index)
{ {
int rc=0; int rc=0;
int retval; int retval;
...@@ -699,7 +699,7 @@ static int ks7010_sdio_update_index(ks_wlan_private *priv, u32 index) ...@@ -699,7 +699,7 @@ static int ks7010_sdio_update_index(ks_wlan_private *priv, u32 index)
} }
#define ROM_BUFF_SIZE (64*1024) #define ROM_BUFF_SIZE (64*1024)
static int ks7010_sdio_data_compare(ks_wlan_private *priv, u32 address, static int ks7010_sdio_data_compare(struct ks_wlan_private *priv, u32 address,
unsigned char *data, unsigned int size) unsigned char *data, unsigned int size)
{ {
int rc=0; int rc=0;
...@@ -720,7 +720,7 @@ static int ks7010_sdio_data_compare(ks_wlan_private *priv, u32 address, ...@@ -720,7 +720,7 @@ static int ks7010_sdio_data_compare(ks_wlan_private *priv, u32 address,
return rc; return rc;
} }
#include <linux/firmware.h> #include <linux/firmware.h>
static int ks79xx_upload_firmware(ks_wlan_private *priv, struct ks_sdio_card *card) static int ks79xx_upload_firmware(struct ks_wlan_private *priv, struct ks_sdio_card *card)
{ {
unsigned int size, offset, n = 0; unsigned int size, offset, n = 0;
unsigned char *rom_buf; unsigned char *rom_buf;
...@@ -886,7 +886,7 @@ extern int ks_wlan_net_stop(struct net_device *dev); ...@@ -886,7 +886,7 @@ extern int ks_wlan_net_stop(struct net_device *dev);
static int ks7910_sdio_probe(struct sdio_func *func, const struct sdio_device_id *device) static int ks7910_sdio_probe(struct sdio_func *func, const struct sdio_device_id *device)
{ {
ks_wlan_private *priv; struct ks_wlan_private *priv;
struct ks_sdio_card *card; struct ks_sdio_card *card;
struct net_device *netdev; struct net_device *netdev;
unsigned char rw_data; unsigned char rw_data;
......
drivers/staging/ks7010/ks7010_sdio.h
浏览文件 @ feedcf1a
...@@ -110,7 +110,7 @@ struct ks_sdio_packet { ...@@ -110,7 +110,7 @@ struct ks_sdio_packet {
struct ks_sdio_card { struct ks_sdio_card {
struct sdio_func *func; struct sdio_func *func;
struct ks_wlan_private *priv; struct ks_wlan_private *priv;
int model; int model;
const char *firmware; const char *firmware;
spinlock_t lock; spinlock_t lock;
......
drivers/staging/ks7010/ks_hostif.c
浏览文件 @ feedcf1a
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
/* Include Wireless Extension definition and check version */ /* Include Wireless Extension definition and check version */
#include <net/iw_handler.h> /* New driver API */ #include <net/iw_handler.h> /* New driver API */
extern int ks_wlan_hw_tx(ks_wlan_private *priv, void *p, unsigned long size, extern int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,
void (*complete_handler)(void *arg1, void *arg2), void (*complete_handler)(void *arg1, void *arg2),
void *arg1, void *arg2 ); void *arg1, void *arg2 );
extern void send_packet_complete(void *, void *); extern void send_packet_complete(void *, void *);
extern void ks_wlan_hw_wakeup_request(ks_wlan_private *priv); extern void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv);
extern int ks_wlan_hw_power_save(ks_wlan_private *priv); extern int ks_wlan_hw_power_save(struct ks_wlan_private *priv);
/* macro */ /* macro */
#define inc_smeqhead(priv) \ #define inc_smeqhead(priv) \
...@@ -42,7 +42,7 @@ extern int ks_wlan_hw_power_save(ks_wlan_private *priv); ...@@ -42,7 +42,7 @@ extern int ks_wlan_hw_power_save(ks_wlan_private *priv);
#define KS_WLAN_MEM_FLAG (GFP_ATOMIC) #define KS_WLAN_MEM_FLAG (GFP_ATOMIC)
static static
inline u8 get_BYTE(ks_wlan_private *priv) inline u8 get_BYTE(struct ks_wlan_private *priv)
{ {
u8 data; u8 data;
data = *(priv->rxp)++; data = *(priv->rxp)++;
...@@ -52,7 +52,7 @@ inline u8 get_BYTE(ks_wlan_private *priv) ...@@ -52,7 +52,7 @@ inline u8 get_BYTE(ks_wlan_private *priv)
} }
static static
inline u16 get_WORD(ks_wlan_private *priv) inline u16 get_WORD(struct ks_wlan_private *priv)
{ {
u16 data; u16 data;
data = (get_BYTE(priv) & 0xff); data = (get_BYTE(priv) & 0xff);
...@@ -61,7 +61,7 @@ inline u16 get_WORD(ks_wlan_private *priv) ...@@ -61,7 +61,7 @@ inline u16 get_WORD(ks_wlan_private *priv)
} }
static static
inline u32 get_DWORD(ks_wlan_private *priv) inline u32 get_DWORD(struct ks_wlan_private *priv)
{ {
u32 data; u32 data;
data = (get_BYTE(priv) & 0xff); data = (get_BYTE(priv) & 0xff);
...@@ -73,7 +73,7 @@ inline u32 get_DWORD(ks_wlan_private *priv) ...@@ -73,7 +73,7 @@ inline u32 get_DWORD(ks_wlan_private *priv)
void ks_wlan_hw_wakeup_task(struct work_struct *work) void ks_wlan_hw_wakeup_task(struct work_struct *work)
{ {
ks_wlan_private *priv = container_of(work, struct ks_wlan_private, ks_wlan_wakeup_task); struct ks_wlan_private *priv = container_of(work, struct ks_wlan_private, ks_wlan_wakeup_task);
int ps_status = atomic_read(&priv->psstatus.status); int ps_status = atomic_read(&priv->psstatus.status);
if(ps_status==PS_SNOOZE){ if(ps_status==PS_SNOOZE){
...@@ -96,7 +96,7 @@ void ks_wlan_hw_wakeup_task(struct work_struct *work) ...@@ -96,7 +96,7 @@ void ks_wlan_hw_wakeup_task(struct work_struct *work)
} }
static static
int ks_wlan_do_power_save(ks_wlan_private *priv) int ks_wlan_do_power_save(struct ks_wlan_private *priv)
{ {
int rc=0; int rc=0;
...@@ -112,7 +112,7 @@ int ks_wlan_do_power_save(ks_wlan_private *priv) ...@@ -112,7 +112,7 @@ int ks_wlan_do_power_save(ks_wlan_private *priv)
} }
static static
int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info) int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
{ {
struct local_ap_t *ap; struct local_ap_t *ap;
union iwreq_data wrqu; union iwreq_data wrqu;
...@@ -213,7 +213,7 @@ int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info) ...@@ -213,7 +213,7 @@ int get_current_ap(ks_wlan_private *priv, struct link_ap_info_t *ap_info)
} }
static static
int get_ap_information(ks_wlan_private *priv, struct ap_info_t *ap_info, struct local_ap_t *ap) int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info, struct local_ap_t *ap)
{ {
unsigned char *bp; unsigned char *bp;
int bsize,offset; int bsize,offset;
...@@ -312,7 +312,7 @@ int get_ap_information(ks_wlan_private *priv, struct ap_info_t *ap_info, struct ...@@ -312,7 +312,7 @@ int get_ap_information(ks_wlan_private *priv, struct ap_info_t *ap_info, struct
} }
static static
void hostif_data_indication(ks_wlan_private *priv) void hostif_data_indication(struct ks_wlan_private *priv)
{ {
unsigned int rx_ind_size; /* indicate data size */ unsigned int rx_ind_size; /* indicate data size */
struct sk_buff *skb; struct sk_buff *skb;
...@@ -491,7 +491,7 @@ void hostif_data_indication(ks_wlan_private *priv) ...@@ -491,7 +491,7 @@ void hostif_data_indication(ks_wlan_private *priv)
} }
static static
void hostif_mib_get_confirm(ks_wlan_private *priv) void hostif_mib_get_confirm(struct ks_wlan_private *priv)
{ {
struct net_device *dev=priv->net_dev; struct net_device *dev=priv->net_dev;
uint32_t mib_status; uint32_t mib_status;
...@@ -570,7 +570,7 @@ void hostif_mib_get_confirm(ks_wlan_private *priv) ...@@ -570,7 +570,7 @@ void hostif_mib_get_confirm(ks_wlan_private *priv)
} }
static static
void hostif_mib_set_confirm(ks_wlan_private *priv) void hostif_mib_set_confirm(struct ks_wlan_private *priv)
{ {
uint32_t mib_status; /* +04 MIB Status */ uint32_t mib_status; /* +04 MIB Status */
uint32_t mib_attribute; /* +08 MIB attribute */ uint32_t mib_attribute; /* +08 MIB attribute */
...@@ -691,7 +691,7 @@ void hostif_mib_set_confirm(ks_wlan_private *priv) ...@@ -691,7 +691,7 @@ void hostif_mib_set_confirm(ks_wlan_private *priv)
} }
static static
void hostif_power_mngmt_confirm(ks_wlan_private *priv) void hostif_power_mngmt_confirm(struct ks_wlan_private *priv)
{ {
DPRINTK(3,"\n"); DPRINTK(3,"\n");
...@@ -707,7 +707,7 @@ void hostif_power_mngmt_confirm(ks_wlan_private *priv) ...@@ -707,7 +707,7 @@ void hostif_power_mngmt_confirm(ks_wlan_private *priv)
} }
static static
void hostif_sleep_confirm(ks_wlan_private *priv) void hostif_sleep_confirm(struct ks_wlan_private *priv)
{ {
DPRINTK(3,"\n"); DPRINTK(3,"\n");
...@@ -716,7 +716,7 @@ void hostif_sleep_confirm(ks_wlan_private *priv) ...@@ -716,7 +716,7 @@ void hostif_sleep_confirm(ks_wlan_private *priv)
} }
static static
void hostif_start_confirm(ks_wlan_private *priv) void hostif_start_confirm(struct ks_wlan_private *priv)
{ {
#ifdef WPS #ifdef WPS
union iwreq_data wrqu; union iwreq_data wrqu;
...@@ -734,7 +734,7 @@ void hostif_start_confirm(ks_wlan_private *priv) ...@@ -734,7 +734,7 @@ void hostif_start_confirm(ks_wlan_private *priv)
} }
static static
void hostif_connect_indication(ks_wlan_private *priv) void hostif_connect_indication(struct ks_wlan_private *priv)
{ {
unsigned short connect_code; unsigned short connect_code;
unsigned int tmp=0; unsigned int tmp=0;
...@@ -789,7 +789,7 @@ void hostif_connect_indication(ks_wlan_private *priv) ...@@ -789,7 +789,7 @@ void hostif_connect_indication(ks_wlan_private *priv)
} }
static static
void hostif_scan_indication(ks_wlan_private *priv) void hostif_scan_indication(struct ks_wlan_private *priv)
{ {
int i; int i;
struct ap_info_t *ap_info; struct ap_info_t *ap_info;
...@@ -820,7 +820,7 @@ void hostif_scan_indication(ks_wlan_private *priv) ...@@ -820,7 +820,7 @@ void hostif_scan_indication(ks_wlan_private *priv)
} }
static static
void hostif_stop_confirm(ks_wlan_private *priv) void hostif_stop_confirm(struct ks_wlan_private *priv)
{ {
unsigned int tmp=0; unsigned int tmp=0;
unsigned int old_status=priv->connect_status; unsigned int old_status=priv->connect_status;
...@@ -856,7 +856,7 @@ void hostif_stop_confirm(ks_wlan_private *priv) ...@@ -856,7 +856,7 @@ void hostif_stop_confirm(ks_wlan_private *priv)
} }
static static
void hostif_ps_adhoc_set_confirm(ks_wlan_private *priv) void hostif_ps_adhoc_set_confirm(struct ks_wlan_private *priv)
{ {
DPRINTK(3,"\n"); DPRINTK(3,"\n");
priv->infra_status = 0; /* infrastructure mode cancel */ priv->infra_status = 0; /* infrastructure mode cancel */
...@@ -865,7 +865,7 @@ void hostif_ps_adhoc_set_confirm(ks_wlan_private *priv) ...@@ -865,7 +865,7 @@ void hostif_ps_adhoc_set_confirm(ks_wlan_private *priv)
} }
static static
void hostif_infrastructure_set_confirm(ks_wlan_private *priv) void hostif_infrastructure_set_confirm(struct ks_wlan_private *priv)
{ {
uint16_t result_code; uint16_t result_code;
DPRINTK(3,"\n"); DPRINTK(3,"\n");
...@@ -876,7 +876,7 @@ void hostif_infrastructure_set_confirm(ks_wlan_private *priv) ...@@ -876,7 +876,7 @@ void hostif_infrastructure_set_confirm(ks_wlan_private *priv)
} }
static static
void hostif_adhoc_set_confirm(ks_wlan_private *priv) void hostif_adhoc_set_confirm(struct ks_wlan_private *priv)
{ {
DPRINTK(3,"\n"); DPRINTK(3,"\n");
priv->infra_status = 1; /* infrastructure mode set */ priv->infra_status = 1; /* infrastructure mode set */
...@@ -884,7 +884,7 @@ void hostif_adhoc_set_confirm(ks_wlan_private *priv) ...@@ -884,7 +884,7 @@ void hostif_adhoc_set_confirm(ks_wlan_private *priv)
} }
static static
void hostif_associate_indication(ks_wlan_private *priv) void hostif_associate_indication(struct ks_wlan_private *priv)
{ {
struct association_request_t *assoc_req; struct association_request_t *assoc_req;
struct association_response_t *assoc_resp; struct association_response_t *assoc_resp;
...@@ -928,7 +928,7 @@ void hostif_associate_indication(ks_wlan_private *priv) ...@@ -928,7 +928,7 @@ void hostif_associate_indication(ks_wlan_private *priv)
} }
static static
void hostif_bss_scan_confirm(ks_wlan_private *priv) void hostif_bss_scan_confirm(struct ks_wlan_private *priv)
{ {
unsigned int result_code; unsigned int result_code;
struct net_device *dev = priv->net_dev; struct net_device *dev = priv->net_dev;
...@@ -947,7 +947,7 @@ void hostif_bss_scan_confirm(ks_wlan_private *priv) ...@@ -947,7 +947,7 @@ void hostif_bss_scan_confirm(ks_wlan_private *priv)
} }
static static
void hostif_phy_information_confirm(ks_wlan_private *priv) void hostif_phy_information_confirm(struct ks_wlan_private *priv)
{ {
struct iw_statistics *wstats = &priv->wstats; struct iw_statistics *wstats = &priv->wstats;
unsigned char rssi,signal,noise; unsigned char rssi,signal,noise;
...@@ -983,7 +983,7 @@ void hostif_phy_information_confirm(ks_wlan_private *priv) ...@@ -983,7 +983,7 @@ void hostif_phy_information_confirm(ks_wlan_private *priv)
} }
static static
void hostif_mic_failure_confirm(ks_wlan_private *priv) void hostif_mic_failure_confirm(struct ks_wlan_private *priv)
{ {
DPRINTK(3,"mic_failure=%u\n",priv->wpa.mic_failure.failure); DPRINTK(3,"mic_failure=%u\n",priv->wpa.mic_failure.failure);
hostif_sme_enqueue(priv, SME_MIC_FAILURE_CONFIRM); hostif_sme_enqueue(priv, SME_MIC_FAILURE_CONFIRM);
...@@ -991,7 +991,7 @@ void hostif_mic_failure_confirm(ks_wlan_private *priv) ...@@ -991,7 +991,7 @@ void hostif_mic_failure_confirm(ks_wlan_private *priv)
static static
void hostif_event_check(ks_wlan_private *priv) void hostif_event_check(struct ks_wlan_private *priv)
{ {
unsigned short event; unsigned short event;
...@@ -1065,7 +1065,7 @@ void hostif_event_check(ks_wlan_private *priv) ...@@ -1065,7 +1065,7 @@ void hostif_event_check(ks_wlan_private *priv)
#define CHECK_ALINE(size) (size%4 ? (size+(4-(size%4))):size) #define CHECK_ALINE(size) (size%4 ? (size+(4-(size%4))):size)
int hostif_data_request(ks_wlan_private *priv, struct sk_buff *packet) int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *packet)
{ {
unsigned int packet_len=0; unsigned int packet_len=0;
...@@ -1231,7 +1231,7 @@ int hostif_data_request(ks_wlan_private *priv, struct sk_buff *packet) ...@@ -1231,7 +1231,7 @@ int hostif_data_request(ks_wlan_private *priv, struct sk_buff *packet)
} }while(0) } }while(0)
static static
void hostif_mib_get_request( ks_wlan_private *priv, unsigned long mib_attribute) void hostif_mib_get_request( struct ks_wlan_private *priv, unsigned long mib_attribute)
{ {
struct hostif_mib_get_request_t *pp; struct hostif_mib_get_request_t *pp;
...@@ -1253,7 +1253,7 @@ void hostif_mib_get_request( ks_wlan_private *priv, unsigned long mib_attribute) ...@@ -1253,7 +1253,7 @@ void hostif_mib_get_request( ks_wlan_private *priv, unsigned long mib_attribute)
} }
static static
void hostif_mib_set_request( ks_wlan_private *priv, unsigned long mib_attribute, void hostif_mib_set_request( struct ks_wlan_private *priv, unsigned long mib_attribute,
unsigned short size, unsigned short type, unsigned short size, unsigned short type,
void *vp ) void *vp )
{ {
...@@ -1286,7 +1286,7 @@ void hostif_mib_set_request( ks_wlan_private *priv, unsigned long mib_attribute, ...@@ -1286,7 +1286,7 @@ void hostif_mib_set_request( ks_wlan_private *priv, unsigned long mib_attribute,
} }
static static
void hostif_start_request( ks_wlan_private *priv, unsigned char mode ) void hostif_start_request( struct ks_wlan_private *priv, unsigned char mode )
{ {
struct hostif_start_request_t *pp; struct hostif_start_request_t *pp;
...@@ -1311,7 +1311,7 @@ void hostif_start_request( ks_wlan_private *priv, unsigned char mode ) ...@@ -1311,7 +1311,7 @@ void hostif_start_request( ks_wlan_private *priv, unsigned char mode )
} }
static static
void hostif_ps_adhoc_set_request(ks_wlan_private *priv) void hostif_ps_adhoc_set_request(struct ks_wlan_private *priv)
{ {
struct hostif_ps_adhoc_set_request_t *pp; struct hostif_ps_adhoc_set_request_t *pp;
uint16_t capability; uint16_t capability;
...@@ -1352,7 +1352,7 @@ void hostif_ps_adhoc_set_request(ks_wlan_private *priv) ...@@ -1352,7 +1352,7 @@ void hostif_ps_adhoc_set_request(ks_wlan_private *priv)
} }
static static
void hostif_infrastructure_set_request(ks_wlan_private *priv) void hostif_infrastructure_set_request(struct ks_wlan_private *priv)
{ {
struct hostif_infrastructure_set_request_t *pp; struct hostif_infrastructure_set_request_t *pp;
uint16_t capability; uint16_t capability;
...@@ -1415,7 +1415,7 @@ void hostif_infrastructure_set_request(ks_wlan_private *priv) ...@@ -1415,7 +1415,7 @@ void hostif_infrastructure_set_request(ks_wlan_private *priv)
ks_wlan_hw_tx( priv, pp, hif_align_size(sizeof(*pp)),NULL, NULL, NULL); ks_wlan_hw_tx( priv, pp, hif_align_size(sizeof(*pp)),NULL, NULL, NULL);
} }
void hostif_infrastructure_set2_request(ks_wlan_private *priv) void hostif_infrastructure_set2_request(struct ks_wlan_private *priv)
{ {
struct hostif_infrastructure_set2_request_t *pp; struct hostif_infrastructure_set2_request_t *pp;
uint16_t capability; uint16_t capability;
...@@ -1481,7 +1481,7 @@ void hostif_infrastructure_set2_request(ks_wlan_private *priv) ...@@ -1481,7 +1481,7 @@ void hostif_infrastructure_set2_request(ks_wlan_private *priv)
} }
static static
void hostif_adhoc_set_request(ks_wlan_private *priv) void hostif_adhoc_set_request(struct ks_wlan_private *priv)
{ {
struct hostif_adhoc_set_request_t *pp; struct hostif_adhoc_set_request_t *pp;
uint16_t capability; uint16_t capability;
...@@ -1524,7 +1524,7 @@ void hostif_adhoc_set_request(ks_wlan_private *priv) ...@@ -1524,7 +1524,7 @@ void hostif_adhoc_set_request(ks_wlan_private *priv)
} }
static static
void hostif_adhoc_set2_request(ks_wlan_private *priv) void hostif_adhoc_set2_request(struct ks_wlan_private *priv)
{ {
struct hostif_adhoc_set2_request_t *pp; struct hostif_adhoc_set2_request_t *pp;
uint16_t capability; uint16_t capability;
...@@ -1570,7 +1570,7 @@ void hostif_adhoc_set2_request(ks_wlan_private *priv) ...@@ -1570,7 +1570,7 @@ void hostif_adhoc_set2_request(ks_wlan_private *priv)
} }
static static
void hostif_stop_request( ks_wlan_private *priv ) void hostif_stop_request( struct ks_wlan_private *priv )
{ {
struct hostif_stop_request_t *pp; struct hostif_stop_request_t *pp;
...@@ -1591,7 +1591,7 @@ void hostif_stop_request( ks_wlan_private *priv ) ...@@ -1591,7 +1591,7 @@ void hostif_stop_request( ks_wlan_private *priv )
} }
static static
void hostif_phy_information_request( ks_wlan_private *priv ) void hostif_phy_information_request( struct ks_wlan_private *priv )
{ {
struct hostif_phy_information_request_t *pp; struct hostif_phy_information_request_t *pp;
...@@ -1619,7 +1619,7 @@ void hostif_phy_information_request( ks_wlan_private *priv ) ...@@ -1619,7 +1619,7 @@ void hostif_phy_information_request( ks_wlan_private *priv )
} }
static static
void hostif_power_mngmt_request( ks_wlan_private *priv, unsigned long mode, void hostif_power_mngmt_request( struct ks_wlan_private *priv, unsigned long mode,
unsigned long wake_up, unsigned long receiveDTIMs ) unsigned long wake_up, unsigned long receiveDTIMs )
{ {
struct hostif_power_mngmt_request_t *pp; struct hostif_power_mngmt_request_t *pp;
...@@ -1643,7 +1643,7 @@ void hostif_power_mngmt_request( ks_wlan_private *priv, unsigned long mode, ...@@ -1643,7 +1643,7 @@ void hostif_power_mngmt_request( ks_wlan_private *priv, unsigned long mode,
} }
static static
void hostif_sleep_request( ks_wlan_private *priv, unsigned long mode) void hostif_sleep_request( struct ks_wlan_private *priv, unsigned long mode)
{ {
struct hostif_sleep_request_t *pp; struct hostif_sleep_request_t *pp;
...@@ -1673,7 +1673,7 @@ void hostif_sleep_request( ks_wlan_private *priv, unsigned long mode) ...@@ -1673,7 +1673,7 @@ void hostif_sleep_request( ks_wlan_private *priv, unsigned long mode)
static static
void hostif_bss_scan_request( ks_wlan_private *priv, unsigned long scan_type , uint8_t *scan_ssid, uint8_t scan_ssid_len) void hostif_bss_scan_request( struct ks_wlan_private *priv, unsigned long scan_type , uint8_t *scan_ssid, uint8_t scan_ssid_len)
{ {
struct hostif_bss_scan_request_t *pp; struct hostif_bss_scan_request_t *pp;
...@@ -1727,7 +1727,7 @@ void hostif_bss_scan_request( ks_wlan_private *priv, unsigned long scan_type , u ...@@ -1727,7 +1727,7 @@ void hostif_bss_scan_request( ks_wlan_private *priv, unsigned long scan_type , u
} }
static static
void hostif_mic_failure_request( ks_wlan_private *priv, unsigned short failure_count, void hostif_mic_failure_request( struct ks_wlan_private *priv, unsigned short failure_count,
unsigned short timer ) unsigned short timer )
{ {
struct hostif_mic_failure_request_t *pp; struct hostif_mic_failure_request_t *pp;
...@@ -1750,7 +1750,7 @@ void hostif_mic_failure_request( ks_wlan_private *priv, unsigned short failure_c ...@@ -1750,7 +1750,7 @@ void hostif_mic_failure_request( ks_wlan_private *priv, unsigned short failure_c
} }
/* Device I/O Recieve indicate */ /* Device I/O Recieve indicate */
static void devio_rec_ind(ks_wlan_private *priv, unsigned char *p, unsigned int size) static void devio_rec_ind(struct ks_wlan_private *priv, unsigned char *p, unsigned int size)
{ {
if (priv->device_open_status) { if (priv->device_open_status) {
spin_lock(&priv->dev_read_lock); /* request spin lock */ spin_lock(&priv->dev_read_lock); /* request spin lock */
...@@ -1772,7 +1772,7 @@ static void devio_rec_ind(ks_wlan_private *priv, unsigned char *p, unsigned int ...@@ -1772,7 +1772,7 @@ static void devio_rec_ind(ks_wlan_private *priv, unsigned char *p, unsigned int
} }
} }
void hostif_receive( ks_wlan_private *priv, unsigned char *p, unsigned int size ) void hostif_receive( struct ks_wlan_private *priv, unsigned char *p, unsigned int size )
{ {
DPRINTK(4,"\n"); DPRINTK(4,"\n");
...@@ -1788,7 +1788,7 @@ void hostif_receive( ks_wlan_private *priv, unsigned char *p, unsigned int size ...@@ -1788,7 +1788,7 @@ void hostif_receive( ks_wlan_private *priv, unsigned char *p, unsigned int size
static static
void hostif_sme_set_wep(ks_wlan_private *priv, int type) void hostif_sme_set_wep(struct ks_wlan_private *priv, int type)
{ {
uint32_t val; uint32_t val;
switch(type){ switch(type){
...@@ -1844,7 +1844,7 @@ struct rsn_mode_t { ...@@ -1844,7 +1844,7 @@ struct rsn_mode_t {
} __attribute__((packed)); } __attribute__((packed));
static static
void hostif_sme_set_rsn(ks_wlan_private *priv, int type) void hostif_sme_set_rsn(struct ks_wlan_private *priv, int type)
{ {
struct wpa_suite_t wpa_suite; struct wpa_suite_t wpa_suite;
struct rsn_mode_t rsn_mode; struct rsn_mode_t rsn_mode;
...@@ -1991,7 +1991,7 @@ void hostif_sme_set_rsn(ks_wlan_private *priv, int type) ...@@ -1991,7 +1991,7 @@ void hostif_sme_set_rsn(ks_wlan_private *priv, int type)
} }
static static
void hostif_sme_mode_setup(ks_wlan_private *priv) void hostif_sme_mode_setup(struct ks_wlan_private *priv)
{ {
unsigned char rate_size; unsigned char rate_size;
unsigned char rate_octet[RATE_SET_MAX_SIZE]; unsigned char rate_octet[RATE_SET_MAX_SIZE];
...@@ -2097,7 +2097,7 @@ void hostif_sme_mode_setup(ks_wlan_private *priv) ...@@ -2097,7 +2097,7 @@ void hostif_sme_mode_setup(ks_wlan_private *priv)
} }
static static
void hostif_sme_multicast_set(ks_wlan_private *priv) void hostif_sme_multicast_set(struct ks_wlan_private *priv)
{ {
struct net_device *dev = priv->net_dev; struct net_device *dev = priv->net_dev;
...@@ -2146,7 +2146,7 @@ void hostif_sme_multicast_set(ks_wlan_private *priv) ...@@ -2146,7 +2146,7 @@ void hostif_sme_multicast_set(ks_wlan_private *priv)
} }
static static
void hostif_sme_powermgt_set(ks_wlan_private *priv) void hostif_sme_powermgt_set(struct ks_wlan_private *priv)
{ {
unsigned long mode,wake_up,receiveDTIMs ; unsigned long mode,wake_up,receiveDTIMs ;
...@@ -2191,7 +2191,7 @@ void hostif_sme_powermgt_set(ks_wlan_private *priv) ...@@ -2191,7 +2191,7 @@ void hostif_sme_powermgt_set(ks_wlan_private *priv)
} }
static static
void hostif_sme_sleep_set(ks_wlan_private *priv) void hostif_sme_sleep_set(struct ks_wlan_private *priv)
{ {
DPRINTK(3,"\n"); DPRINTK(3,"\n");
switch(priv->sleep_mode){ switch(priv->sleep_mode){
...@@ -2209,7 +2209,7 @@ void hostif_sme_sleep_set(ks_wlan_private *priv) ...@@ -2209,7 +2209,7 @@ void hostif_sme_sleep_set(ks_wlan_private *priv)
} }
static static
void hostif_sme_set_key(ks_wlan_private *priv, int type) void hostif_sme_set_key(struct ks_wlan_private *priv, int type)
{ {
uint32_t val; uint32_t val;
switch(type){ switch(type){
...@@ -2265,7 +2265,7 @@ void hostif_sme_set_key(ks_wlan_private *priv, int type) ...@@ -2265,7 +2265,7 @@ void hostif_sme_set_key(ks_wlan_private *priv, int type)
} }
static static
void hostif_sme_set_pmksa(ks_wlan_private *priv) void hostif_sme_set_pmksa(struct ks_wlan_private *priv)
{ {
struct pmk_cache_t { struct pmk_cache_t {
uint16_t size; uint16_t size;
...@@ -2296,7 +2296,7 @@ void hostif_sme_set_pmksa(ks_wlan_private *priv) ...@@ -2296,7 +2296,7 @@ void hostif_sme_set_pmksa(ks_wlan_private *priv)
/* execute sme */ /* execute sme */
static static
void hostif_sme_execute(ks_wlan_private *priv, int event) void hostif_sme_execute(struct ks_wlan_private *priv, int event)
{ {
uint32_t val; uint32_t val;
...@@ -2459,7 +2459,7 @@ void hostif_sme_execute(ks_wlan_private *priv, int event) ...@@ -2459,7 +2459,7 @@ void hostif_sme_execute(ks_wlan_private *priv, int event)
static static
void hostif_sme_task( unsigned long dev ) void hostif_sme_task( unsigned long dev )
{ {
ks_wlan_private *priv = (ks_wlan_private *)dev; struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
DPRINTK(3,"\n"); DPRINTK(3,"\n");
...@@ -2475,7 +2475,7 @@ void hostif_sme_task( unsigned long dev ) ...@@ -2475,7 +2475,7 @@ void hostif_sme_task( unsigned long dev )
} }
/* send to Station Management Entity module */ /* send to Station Management Entity module */
void hostif_sme_enqueue(ks_wlan_private *priv, unsigned short event) void hostif_sme_enqueue(struct ks_wlan_private *priv, unsigned short event)
{ {
DPRINTK(3,"\n"); DPRINTK(3,"\n");
...@@ -2500,7 +2500,7 @@ void hostif_sme_enqueue(ks_wlan_private *priv, unsigned short event) ...@@ -2500,7 +2500,7 @@ void hostif_sme_enqueue(ks_wlan_private *priv, unsigned short event)
} }
int hostif_init( ks_wlan_private *priv ) int hostif_init( struct ks_wlan_private *priv )
{ {
int rc=0; int rc=0;
int i; int i;
...@@ -2555,7 +2555,7 @@ int hostif_init( ks_wlan_private *priv ) ...@@ -2555,7 +2555,7 @@ int hostif_init( ks_wlan_private *priv )
return rc; return rc;
} }
void hostif_exit( ks_wlan_private *priv ) void hostif_exit( struct ks_wlan_private *priv )
{ {
tasklet_kill(&priv->sme_task); tasklet_kill(&priv->sme_task);
return; return;
......
drivers/staging/ks7010/ks_hostif.h
浏览文件 @ feedcf1a
...@@ -623,11 +623,11 @@ enum { ...@@ -623,11 +623,11 @@ enum {
#include "ks_wlan.h" #include "ks_wlan.h"
/* function prototype */ /* function prototype */
extern int hostif_data_request( ks_wlan_private *priv, struct sk_buff *packet ); extern int hostif_data_request( struct ks_wlan_private *priv, struct sk_buff *packet );
extern void hostif_receive( ks_wlan_private *priv, unsigned char *p, unsigned int size ); extern void hostif_receive( struct ks_wlan_private *priv, unsigned char *p, unsigned int size );
extern void hostif_sme_enqueue(ks_wlan_private *priv, uint16_t event); extern void hostif_sme_enqueue(struct ks_wlan_private *priv, uint16_t event);
extern int hostif_init( ks_wlan_private *priv ); extern int hostif_init( struct ks_wlan_private *priv );
extern void hostif_exit( ks_wlan_private *priv ); extern void hostif_exit( struct ks_wlan_private *priv );
static static
inline int hif_align_size(int size) inline int hif_align_size(int size)
......
drivers/staging/ks7010/ks_wlan.h
浏览文件 @ feedcf1a
...@@ -414,7 +414,7 @@ struct wps_status_t { ...@@ -414,7 +414,7 @@ struct wps_status_t {
}; };
#endif /* WPS */ #endif /* WPS */
typedef struct ks_wlan_private{ struct ks_wlan_private {
struct hw_info_t ks_wlan_hw; /* hardware information */ struct hw_info_t ks_wlan_hw; /* hardware information */
...@@ -505,7 +505,7 @@ typedef struct ks_wlan_private{ ...@@ -505,7 +505,7 @@ typedef struct ks_wlan_private{
uint sdio_error_count; /* SDIO error */ uint sdio_error_count; /* SDIO error */
uint wakeup_count; /* for detect wakeup loop */ uint wakeup_count; /* for detect wakeup loop */
} ks_wlan_private; };
......
drivers/staging/ks7010/ks_wlan_ioctl.h
浏览文件 @ feedcf1a
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
#include "ks_wlan.h" #include "ks_wlan.h"
#include <linux/netdevice.h> #include <linux/netdevice.h>
extern int ks_wlan_read_config_file(ks_wlan_private *priv); extern int ks_wlan_read_config_file(struct ks_wlan_private *priv);
extern int ks_wlan_setup_parameter(ks_wlan_private *priv, unsigned int commit_flag); extern int ks_wlan_setup_parameter(struct ks_wlan_private *priv, unsigned int commit_flag);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或