[PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines.

[PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines.

[Sunghoon Cho]

This patch removes the warnings reported by checkpatch.pl regarding on
the multiple blank line uses.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 2331a00..a8b1501 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -35,16 +35,12 @@
 #include <linux/ip.h>          /* struct iphdr */
 #include <linux/tcp.h>         /* struct tcphdr */
 #include <linux/skbuff.h>
-
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
-
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 #include <net/ieee80211_radiotap.h>
 #include <linux/if_arp.h>
-
-
 #include <linux/in6.h>
 #include <asm/checksum.h>
 #include "host_interface.h"
@@ -55,8 +51,6 @@
 #define FLOW_CONTROL_UPPER_THRESHOLD	256
 
 /*iftype*/
-
-
 enum stats_flags {
 	WILC_WFI_RX_PKT = 1 << 0,
 	WILC_WFI_TX_PKT = 1 << 1,
@@ -131,14 +125,11 @@ struct WILC_WFI_priv {
 	#ifdef WILC_P2P
 	struct wilc_wfi_p2pListenParams strRemainOnChanParams;
 	u64 u64tx_cookie;
-
 	#endif
 
 	bool bCfgScanning;
 	u32 u32RcvdChCount;
 
-
-
 	u8 au8AssociatedBss[ETH_ALEN];
 	struct sta_info assoc_stainfo;
 	struct net_device_stats stats;
@@ -180,7 +171,6 @@ typedef struct {
 
 } struct_frame_reg;
 
-
 #define NUM_CONCURRENT_IFC 2
 typedef struct {
 	uint8_t aSrcAddress[ETH_ALEN];
@@ -191,8 +181,6 @@ typedef struct {
 typedef struct {
 	int mac_status;
 	int wilc1000_initialized;
-
-
 	#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
 	unsigned short dev_irq_num;
 	#endif
@@ -224,9 +212,6 @@ typedef struct {
 	struct task_struct *rx_bh_thread;
 	struct semaphore rx_sem;
 #endif
-
-
-
 	struct semaphore rxq_thread_started;
 	struct semaphore txq_thread_started;
 
-- 
1.9.1

[PATCH 2/5] staging: wilc1000: remove unnecessary blank line.

[Sunghoon Cho]

This patch removes blank line which is not necesssary after an open
brace.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index a8b1501..7f58551 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -57,7 +57,6 @@ enum stats_flags {
 };
 
 struct WILC_WFI_stats {
-
 	unsigned long rx_packets;
 	unsigned long tx_packets;
 	unsigned long rx_bytes;
-- 
1.9.1

[PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters.

[Sunghoon Cho]

This removes the warnings reported by checkpatch.pl for line over 80
characters.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 7f58551..96e4d5c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -77,8 +77,8 @@ struct WILC_WFI_stats {
 #define num_reg_frame 2
 /*
  * If you use RX_BH_WORK_QUEUE on LPC3131: You may lose the first interrupt on
- * LPC3131 which is important to get the MAC start status when you are blocked inside
- * linux_wlan_firmware_download() which blocks mac_open().
+ * LPC3131 which is important to get the MAC start status when you are blocked
+ * inside linux_wlan_firmware_download() which blocks mac_open().
  */
 #if defined (NM73131_0_BOARD)
  #define RX_BH_TYPE  RX_BH_KTHREAD
@@ -150,7 +150,8 @@ struct WILC_WFI_priv {
 	u8 WILC_WFI_wep_default;
 	u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
 	u8 WILC_WFI_wep_key_len[4];
-	struct net_device *real_ndev;   /* The real interface that the monitor is on */
+	/* The real interface that the monitor is on  */
+	struct net_device *real_ndev;
 	struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA];
 	struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA];
 	u8 wilc_groupkey;
-- 
1.9.1

[PATCH 4/5] staging: wilc1000: remove prohibited spaces.

[Sunghoon Cho]

This patch removes the warnings on the prohibited spaces between
function name and open parenthesis.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 96e4d5c..3307439 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -80,9 +80,9 @@ struct WILC_WFI_stats {
  * LPC3131 which is important to get the MAC start status when you are blocked
  * inside linux_wlan_firmware_download() which blocks mac_open().
  */
-#if defined (NM73131_0_BOARD)
+#if defined(NM73131_0_BOARD)
  #define RX_BH_TYPE  RX_BH_KTHREAD
-#elif defined (PANDA_BOARD)
+#elif defined(PANDA_BOARD)
  #define RX_BH_TYPE  RX_BH_THREADED_IRQ
 #else
  #define RX_BH_TYPE  RX_BH_KTHREAD
-- 
1.9.1

[PATCH 5/5] staging: wilc1000: add a blank line

[Sunghoon Cho]

This adds a blank line after struct declaration, WILC_WFI_mon_priv.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 3307439..42a017a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -249,6 +249,7 @@ typedef struct {
 struct WILC_WFI_mon_priv {
 	struct net_device *real_ndev;
 };
+
 extern struct net_device *WILC_WFI_devs[];
 
 #endif
-- 
1.9.1

[PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters

[Sunghoon Cho]

This patch removes the warnings reported by checkpatch.pl regarding
line over 80 chracters.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
 drivers/staging/wilc1000/wilc_wlan_if.h | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 33d70c6..438e2db2 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -185,7 +185,8 @@ typedef struct {
 	int (*wlan_firmware_download)(const uint8_t *, uint32_t);
 	int (*wlan_start)(void);
 	int (*wlan_stop)(void);
-	int (*wlan_add_to_tx_que)(void *, uint8_t *, uint32_t, wilc_tx_complete_func_t);
+	int (*wlan_add_to_tx_que)(void *, uint8_t *,
+				  uint32_t, wilc_tx_complete_func_t);
 	int (*wlan_handle_tx_que)(uint32_t *);
 	void (*wlan_handle_rx_que)(void);
 	void (*wlan_handle_rx_isr)(void);
@@ -195,10 +196,12 @@ typedef struct {
 	int (*wlan_cfg_get_value)(uint32_t, uint8_t *, uint32_t);
 	/* Bug3959: transmitting mgmt frames received from host */
 	#if defined(WILC_AP_EXTERNAL_MLME) || defined(WILC_P2P)
-	int (*wlan_add_mgmt_to_tx_que)(void *, uint8_t *, uint32_t, wilc_tx_complete_func_t);
+	int (*wlan_add_mgmt_to_tx_que)(void *, uint8_t *,
+				       uint32_t, wilc_tx_complete_func_t);
 
 	#ifdef WILC_FULLY_HOSTING_AP
-	int (*wlan_add_data_to_tx_que)(void *, uint8_t *, uint32_t, wilc_tx_complete_func_t);
+	int (*wlan_add_data_to_tx_que)(void *, uint8_t *,
+				       uint32_t, wilc_tx_complete_func_t);
 	#endif
 
 	#endif
@@ -247,10 +250,14 @@ typedef enum {
 } TX_RATE_T;
 
 typedef enum {
-	B_ONLY_MODE = 0,                                /* basic rate: 1, 2 Mbps, otherwise: 5, 11 Mbps */
-	G_ONLY_MODE,                                    /* basic rate: 6, 12, 24 Mbps, otherwise: 9, 18, 36, 48, 54 Mbps */
-	G_MIXED_11B_1_MODE,             /* basic rate: 1, 2, 5.5, 11 Mbps, otherwise: all on */
-	G_MIXED_11B_2_MODE,             /* basic rate: 1, 2, 5, 11, 6, 12, 24 Mbps, otherwise: all on */
+	/* basic rate: 1, 2 Mbps, otherwise: 5, 11 Mbps */
+	B_ONLY_MODE = 0,
+	/* basic rate: 6, 12, 24 Mbps, otherwise: 9, 18, 36, 48, 54 Mbps */
+	G_ONLY_MODE,
+	/* basic rate: 1, 2, 5.5, 11 Mbps, otherwise: all on */
+	G_MIXED_11B_1_MODE,
+	/* basic rate: 1, 2, 5, 11, 6, 12, 24 Mbps, otherwise: all on */
+	G_MIXED_11B_2_MODE,
 } G_OPERATING_MODE_T;
 
 typedef enum {
@@ -660,7 +667,7 @@ typedef enum {
 	 */
 	WID_JOIN_REQ                       = 0x0020,
 
-	WID_LINKSPEED								= 0x0026,
+	WID_LINKSPEED				= 0x0026,
 
 	/*
 	 * Enable User Control of TX Power
@@ -707,7 +714,8 @@ typedef enum {
 	/*
 	 * Link Loss Threshold (measure in the beacon period)
 	 * --------------------------------------------------------------------
-	 * Configuration : Any value between 10 and 254 (Set to 255 to disable it)
+	 * Configuration : Any value between 10 and 254
+	 * (Set to 255 to disable it)
 	 * Values to set : Same value. Default is 10
 	 * --------------------------------------------------------------------
 	 */
@@ -982,9 +990,9 @@ typedef enum {
 	WID_ASSOC_REQ_INFO                 = 0x301F,
 	WID_ASSOC_RES_INFO                 = 0x3020,
 	WID_MANUFACTURER                   = 0x3026, /* Added for CAPI tool */
-	WID_MODEL_NAME                                     = 0x3027, /* Added for CAPI tool */
+	WID_MODEL_NAME                     = 0x3027, /* Added for CAPI tool */
 	WID_MODEL_NUM                      = 0x3028, /* Added for CAPI tool */
-	WID_DEVICE_NAME                                     = 0x3029, /* Added for CAPI tool */
+	WID_DEVICE_NAME                    = 0x3029, /* Added for CAPI tool */
 
 	/* NMAC String WID list */
 	WID_11N_P_ACTION_REQ               = 0x3080,
-- 
1.9.1

Re: [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters.

[Greg KH]

On Wed, Jun 17, 2015 at 02:42:34PM +0900, Sunghoon Cho wrote:
> This removes the warnings reported by checkpatch.pl for line over 80
> characters.
> 
> Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
> ---
>  drivers/staging/wilc1000/wilc_wfi_netdevice.h | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> index 7f58551..96e4d5c 100644
> --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> @@ -77,8 +77,8 @@ struct WILC_WFI_stats {
>  #define num_reg_frame 2
>  /*
>   * If you use RX_BH_WORK_QUEUE on LPC3131: You may lose the first interrupt on
> - * LPC3131 which is important to get the MAC start status when you are blocked inside
> - * linux_wlan_firmware_download() which blocks mac_open().
> + * LPC3131 which is important to get the MAC start status when you are blocked
> + * inside linux_wlan_firmware_download() which blocks mac_open().
>   */
>  #if defined (NM73131_0_BOARD)
>   #define RX_BH_TYPE  RX_BH_KTHREAD
> @@ -150,7 +150,8 @@ struct WILC_WFI_priv {
>  	u8 WILC_WFI_wep_default;
>  	u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
>  	u8 WILC_WFI_wep_key_len[4];
> -	struct net_device *real_ndev;   /* The real interface that the monitor is on */
> +	/* The real interface that the monitor is on  */
> +	struct net_device *real_ndev;

This change doesn't work well, I'd leave it as-is.

thanks,

greg k-h

Re: [PATCH 4/5] staging: wilc1000: remove prohibited spaces.

[Greg KH]

On Wed, Jun 17, 2015 at 02:42:35PM +0900, Sunghoon Cho wrote:
> This patch removes the warnings on the prohibited spaces between
> function name and open parenthesis.
> 
> Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
> ---
>  drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> index 96e4d5c..3307439 100644
> --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> @@ -80,9 +80,9 @@ struct WILC_WFI_stats {
>   * LPC3131 which is important to get the MAC start status when you are blocked
>   * inside linux_wlan_firmware_download() which blocks mac_open().
>   */
> -#if defined (NM73131_0_BOARD)
> +#if defined(NM73131_0_BOARD)
>   #define RX_BH_TYPE  RX_BH_KTHREAD
> -#elif defined (PANDA_BOARD)
> +#elif defined(PANDA_BOARD)
>   #define RX_BH_TYPE  RX_BH_THREADED_IRQ
>  #else
>   #define RX_BH_TYPE  RX_BH_KTHREAD
> -- 
> 1.9.1

Doesn't apply properly, please rebase and resend.

thanks,

greg k-h

Re: [PATCH 4/5] staging: wilc1000: remove prohibited spaces.

[Greg KH]

On Thu, Jun 18, 2015 at 01:51:15PM +0900, 조성훈 wrote:
> Hi Greg,
> I want to make sure one thing before going further. I cloned the
> staging-testing and then made the first patch. There was no problem when I sent
> the first path to you.
> Afterwards, I also pulled the repository to update my local tree before making
> the second patch. So, I thought I made this second patch based on top of the
> latest commits.
> 
> I am confused why you said I need rebase. Do you mean I have to make my branch
> (for example, staging-wilc1000) from staging-testing and then rebase my commits
> to staging-testing branch before making patch files with git format-patch?

You made the patches correctly, I just accepted patches that were sent
before yours to the tree, which then conflicted with your patches.
That's what happens with a fast-moving tree and a driver that lots of
people are all trying to clean up at the same time.

So rebase on staging-testing again and resend and you should be fine.

thanks,

greg k-h