Re: [PATCH v2 3/8] staging: wilc1000: move macro and function prototype from wilc_wlan_if.h file

[<Ajay.Kathat@microchip.com>]

On 2/7/2019 6:21 PM, Claudiu Beznea - M18063 wrote:
> 
> 
> On 07.02.2019 13:29, Ajay.Kathat@microchip.com wrote:
>> From: Ajay Singh <ajay.kathat@microchip.com>
>>
>> Move data structure and function prototype from 'wilc_wlan_if.h file.
>> Now, this file contains constant specific to the firmware.
>>
>> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
>> ---
>>  drivers/staging/wilc1000/host_interface.c |  1 +
>>  drivers/staging/wilc1000/host_interface.h | 11 ++++++++++
>>  drivers/staging/wilc1000/linux_wlan.c     |  2 ++
>>  drivers/staging/wilc1000/wilc_wlan.h      |  9 ++++++++
>>  drivers/staging/wilc1000/wilc_wlan_if.h   | 36 -------------------------------
>>  5 files changed, 23 insertions(+), 36 deletions(-)
>>
>> diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
>> index 9abe341..50dc2dd 100644
>> --- a/drivers/staging/wilc1000/host_interface.c
>> +++ b/drivers/staging/wilc1000/host_interface.c
>> @@ -10,6 +10,7 @@
>>  #define WILC_HIF_CONNECT_TIMEOUT_MS             9500
>>  
>>  #define WILC_FALSE_FRMWR_CHANNEL		100
>> +#define WILC_MAX_RATES_SUPPORTED		12
>>  
>>  struct wilc_rcvd_mac_info {
>>  	u8 status;
>> diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
>> index a007625..678e623 100644
>> --- a/drivers/staging/wilc1000/host_interface.h
>> +++ b/drivers/staging/wilc1000/host_interface.h
>> @@ -97,6 +97,17 @@ enum conn_event {
>>  	CONN_DISCONN_EVENT_FORCE_32BIT		= 0xFFFFFFFF
>>  };
>>  
>> +enum {
>> +	WILC_HIF_SDIO = 0,
>> +	WILC_HIF_SPI = BIT(0)
> 
> BIT(0)=1, so you can remove it and use simply:
> 
> enum {
> 	WILC_HIF_SDIO,
> 	WILC_HIF_SPI,
> };
> 

Thanks Claudiu,
Sure, I will be taking care of it in future patches.

> 
>> +};
>> +
>> +enum {
>> +	WILC_MAC_STATUS_INIT = -1,
>> +	WILC_MAC_STATUS_DISCONNECTED = 0,
>> +	WILC_MAC_STATUS_CONNECTED = 1
>> +};
>> +
>>  struct wilc_rcvd_net_info {
>>  	s8 rssi;
>>  	u8 ch;
>> diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
>> index f3e52af..1ebf2b8 100644
>> --- a/drivers/staging/wilc1000/linux_wlan.c
>> +++ b/drivers/staging/wilc1000/linux_wlan.c
>> @@ -12,6 +12,8 @@
>>  
>>  #include "wilc_wfi_cfgoperations.h"
>>  
>> +#define WILC_MULTICAST_TABLE_SIZE	8
>> +
>>  static irqreturn_t isr_uh_routine(int irq, void *user_data)
>>  {
>>  	struct net_device *dev = user_data;
>> diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
>> index d8fabe8..1a27f62 100644
>> --- a/drivers/staging/wilc1000/wilc_wlan.h
>> +++ b/drivers/staging/wilc1000/wilc_wlan.h
>> @@ -250,6 +250,13 @@ struct wilc_hif_func {
>>  
>>  #define WILC_MAX_CFG_FRAME_SIZE		1468
>>  
>> +struct tx_complete_data {
>> +	int size;
>> +	void *buff;
>> +	u8 *bssid;
>> +	struct sk_buff *skb;
>> +};
>> +
>>  struct wilc_cfg_cmd_hdr {
>>  	u8 cmd_type;
>>  	u8 seq_no;
>> @@ -301,4 +308,6 @@ void chip_allow_sleep(struct wilc *wilc);
>>  void chip_wakeup(struct wilc *wilc);
>>  int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
>>  			 u32 count, u32 drv);
>> +int wilc_wlan_init(struct net_device *dev);
>> +u32 wilc_get_chipid(struct wilc *wilc, bool update);
>>  #endif
>> diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
>> index 9b8cce8..b15de36 100644
>> --- a/drivers/staging/wilc1000/wilc_wlan_if.h
>> +++ b/drivers/staging/wilc1000/wilc_wlan_if.h
>> @@ -11,41 +11,9 @@
>>  
>>  /********************************************
>>   *
>> - *      Host Interface Defines
>> - *
>> - ********************************************/
>> -
>> -enum {
>> -	WILC_HIF_SDIO = 0,
>> -	WILC_HIF_SPI = BIT(0)
>> -};
>> -
>> -/********************************************
>> - *
>> - *      Wlan Interface Defines
>> - *
>> - ********************************************/
>> -
>> -enum {
>> -	WILC_MAC_STATUS_INIT = -1,
>> -	WILC_MAC_STATUS_DISCONNECTED = 0,
>> -	WILC_MAC_STATUS_CONNECTED = 1
>> -};
>> -
>> -struct tx_complete_data {
>> -	int size;
>> -	void *buff;
>> -	u8 *bssid;
>> -	struct sk_buff *skb;
>> -};
>> -
>> -/********************************************
>> - *
>>   *      Wlan Configuration ID
>>   *
>>   ********************************************/
>> -#define WILC_MULTICAST_TABLE_SIZE	8
>> -#define WILC_MAX_RATES_SUPPORTED     12
>>  
>>  enum bss_types {
>>  	WILC_FW_BSS_TYPE_INFRA = 0,
>> @@ -832,8 +800,4 @@ enum {
>>  	WID_MAX				= 0xFFFF
>>  };
>>  
>> -struct wilc;
>> -int wilc_wlan_init(struct net_device *dev);
>> -u32 wilc_get_chipid(struct wilc *wilc, bool update);
>> -
>>  #endif
>>