* [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines.
@ 2015-06-17 5:42 Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/5] staging: wilc1000: remove unnecessary blank line.
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters.
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
2015-06-18 4:16 ` Greg KH
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
2015-06-17 5:42 ` [PATCH 5/5] staging: wilc1000: add a blank line Sunghoon Cho
3 siblings, 1 reply; 8+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/5] staging: wilc1000: remove prohibited spaces.
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
2015-06-18 4:18 ` Greg KH
2015-06-17 5:42 ` [PATCH 5/5] staging: wilc1000: add a blank line Sunghoon Cho
3 siblings, 1 reply; 8+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/5] staging: wilc1000: add a blank line
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
` (2 preceding siblings ...)
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
3 siblings, 0 replies; 8+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters.
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
@ 2015-06-18 4:16 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2015-06-18 4:16 UTC (permalink / raw)
To: Sunghoon Cho
Cc: devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/5] staging: wilc1000: remove prohibited spaces.
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
@ 2015-06-18 4:18 ` Greg KH
[not found] ` <CAAYiv+Yx-KzqE9UKeEO2NHJbzy8XL2z3YH5BbkXiBgXLHRhK7Q@mail.gmail.com>
0 siblings, 1 reply; 8+ messages in thread
From: Greg KH @ 2015-06-18 4:18 UTC (permalink / raw)
To: Sunghoon Cho
Cc: devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/5] staging: wilc1000: remove prohibited spaces.
[not found] ` <CAAYiv+Yx-KzqE9UKeEO2NHJbzy8XL2z3YH5BbkXiBgXLHRhK7Q@mail.gmail.com>
@ 2015-06-18 14:42 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2015-06-18 14:42 UTC (permalink / raw)
To: 조성훈
Cc: devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-18 14:42 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
2015-06-18 4:16 ` Greg KH
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
2015-06-18 4:18 ` Greg KH
[not found] ` <CAAYiv+Yx-KzqE9UKeEO2NHJbzy8XL2z3YH5BbkXiBgXLHRhK7Q@mail.gmail.com>
2015-06-18 14:42 ` Greg KH
2015-06-17 5:42 ` [PATCH 5/5] staging: wilc1000: add a blank line Sunghoon Cho
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.