[PATCH v3 0/3] drivers: staging: wilc1000: Fix a few style errors

[PATCH v3 0/3] drivers: staging: wilc1000: Fix a few style errors

[Chandra S Gorentla]

v3 - Resending as v2 patch was series missing signedoff line.  Corrected now.

v2 - Resending as v1 patch series did not apply cleanly.

These patches fixes a few style errors reported by checkpatch.pl.
PATCH 3/3 should be applied after PATCH 2/3.

[PATCH v3 1/3] drivers: staging: wilc1000: use 'void' for no arguments functions

[Chandra S Gorentla]

Added 'void' keyword in the paranthesis of function definitions, when
there are no arguments to the functions.  This fixes the checkpatch.pl
error - "Bad function definition 'function()' should probably be
function(void)".

Signed-off-by: Chandra S Gorentla <csgorentla@gmail.com>
---
 drivers/staging/wilc1000/linux_mon.c  | 2 +-
 drivers/staging/wilc1000/linux_wlan.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c
index aa20421..123468a 100644
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -558,7 +558,7 @@ struct net_device *WILC_WFI_init_mon_interface(const char *name, struct net_devi
  *  @date	12 JUL 2012
  *  @version	1.0
  */
-int WILC_WFI_deinit_mon_interface()
+int WILC_WFI_deinit_mon_interface(void)
 {
 	bool rollback_lock = false;
 
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 3e55a8a..0a8052e 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -202,7 +202,7 @@ void printk_later(const char *format, ...)
 
 }
 
-void dump_logs()
+void dump_logs(void)
 {
 	if (DebugBuffer[0]) {
 		DebugBuffer[DEGUG_BUFFER_LENGTH] = 0;
@@ -216,7 +216,7 @@ void dump_logs()
 	}
 }
 
-void Reset_WatchDogdebugger()
+void Reset_WatchDogdebugger(void)
 {
 	WatchDogdebuggerCounter = 0;
 }
-- 
2.5.0

[PATCH v3 2/3] drivers: staging: wilc1000: move { to previous line

[Chandra S Gorentla]

Moved the opening brace of code blocks to the previous lines.  This
fixes the checkpatch.pl error - "that open brace { should be on the
previous line".

Signed-off-by: Chandra S Gorentla <csgorentla@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c2ef46f..779ec5a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1205,8 +1205,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
 
 
 
-			if (!pairwise)
-			{
+			if (!pairwise) {
 				if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
 					u8gmode = ENCRYPT_ENABLED | WPA | TKIP;
 				else
@@ -1304,8 +1303,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
 
 		{
 			u8mode = 0;
-			if (!pairwise)
-			{
+			if (!pairwise) {
 				if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
 					/* swap the tx mic by rx mic */
 					pu8RxMic = params->key + 24;
@@ -1531,8 +1529,7 @@ static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
 	priv = wiphy_priv(wiphy);
 
 
-	if (!pairwise)
-	{
+	if (!pairwise) {
 		PRINT_D(CFG80211_DBG, "Getting group key idx: %x\n", key_index);
 
 		key_params.key = priv->wilc_gtk[key_index]->key;
-- 
2.5.0

[PATCH v3 3/3] drivers: staging: wilc1000: remove space after '('

[Chandra S Gorentla]

The character ' ' is removed after the character '('.  This fixes the
checkpatch.pl error - "space prohibited after that open
parenthesis '('".

Signed-off-by: Chandra S Gorentla <csgorentla@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 779ec5a..c886891 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1675,7 +1675,7 @@ static int WILC_WFI_get_station(struct wiphy *wiphy, struct net_device *dev,
 		 * kernel version 3.0.0
 		 */
 		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL) |
-						BIT( NL80211_STA_INFO_RX_PACKETS) |
+						BIT(NL80211_STA_INFO_RX_PACKETS) |
 						BIT(NL80211_STA_INFO_TX_PACKETS) |
 						BIT(NL80211_STA_INFO_TX_FAILED) |
 						BIT(NL80211_STA_INFO_TX_BITRATE);
-- 
2.5.0

Re: [PATCH v3 2/3] drivers: staging: wilc1000: move { to previous line

[Chandra Gorentla]

On Wed, Aug 05, 2015 at 10:11:56PM +0530, Chandra S Gorentla wrote:
> Moved the opening brace of code blocks to the previous lines.  This
> fixes the checkpatch.pl error - "that open brace { should be on the
> previous line".
> 
> Signed-off-by: Chandra S Gorentla <csgorentla@gmail.com>
> ---
>  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> index c2ef46f..779ec5a 100644
> --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> @@ -1205,8 +1205,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
>  
>  
>  
> -			if (!pairwise)
> -			{
> +			if (!pairwise) {
>  				if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
>  					u8gmode = ENCRYPT_ENABLED | WPA | TKIP;
>  				else
> @@ -1304,8 +1303,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
>  
>  		{
>  			u8mode = 0;
> -			if (!pairwise)
> -			{
> +			if (!pairwise) {
>  				if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
>  					/* swap the tx mic by rx mic */
>  					pu8RxMic = params->key + 24;
> @@ -1531,8 +1529,7 @@ static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
>  	priv = wiphy_priv(wiphy);
>  
>  
> -	if (!pairwise)
> -	{
> +	if (!pairwise) {
>  		PRINT_D(CFG80211_DBG, "Getting group key idx: %x\n", key_index);
>  
>  		key_params.key = priv->wilc_gtk[key_index]->key;
> -- 
> 2.5.0
> 

Hello Greg, 
 
I sent 3 patches in this series.  The subject lines of other 2 are -
 
[PATCH v3 3/3] drivers: staging: wilc1000: remove space after '('
[PATCH v3 1/3] drivers: staging: wilc1000: use 'void' for no arguments
functions

These two patches (1/3 and 3/3) were accepted but not the patch (2/3) in this 
mail.  Any reason for not accepting?  Is any thing wrong with this patch - 2/3?
If so, I can correct and send again.

Thanks,
chandra

Re: [PATCH v3 2/3] drivers: staging: wilc1000: move { to previous line

[Greg KH]

On Thu, Aug 06, 2015 at 09:29:44PM +0530, Chandra Gorentla wrote:
> On Wed, Aug 05, 2015 at 10:11:56PM +0530, Chandra S Gorentla wrote:
> > Moved the opening brace of code blocks to the previous lines.  This
> > fixes the checkpatch.pl error - "that open brace { should be on the
> > previous line".
> > 
> > Signed-off-by: Chandra S Gorentla <csgorentla@gmail.com>
> > ---
> >  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 9 +++------
> >  1 file changed, 3 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > index c2ef46f..779ec5a 100644
> > --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > @@ -1205,8 +1205,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
> >  
> >  
> >  
> > -			if (!pairwise)
> > -			{
> > +			if (!pairwise) {
> >  				if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
> >  					u8gmode = ENCRYPT_ENABLED | WPA | TKIP;
> >  				else
> > @@ -1304,8 +1303,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
> >  
> >  		{
> >  			u8mode = 0;
> > -			if (!pairwise)
> > -			{
> > +			if (!pairwise) {
> >  				if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
> >  					/* swap the tx mic by rx mic */
> >  					pu8RxMic = params->key + 24;
> > @@ -1531,8 +1529,7 @@ static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
> >  	priv = wiphy_priv(wiphy);
> >  
> >  
> > -	if (!pairwise)
> > -	{
> > +	if (!pairwise) {
> >  		PRINT_D(CFG80211_DBG, "Getting group key idx: %x\n", key_index);
> >  
> >  		key_params.key = priv->wilc_gtk[key_index]->key;
> > -- 
> > 2.5.0
> > 
> 
> Hello Greg, 
>  
> I sent 3 patches in this series.  The subject lines of other 2 are -
>  
> [PATCH v3 3/3] drivers: staging: wilc1000: remove space after '('
> [PATCH v3 1/3] drivers: staging: wilc1000: use 'void' for no arguments
> functions
> 
> These two patches (1/3 and 3/3) were accepted but not the patch (2/3) in this 
> mail.  Any reason for not accepting?  Is any thing wrong with this patch - 2/3?
> If so, I can correct and send again.

Rebase your series on the tree and see what happens to your 2/3 patch :)

(hint, someone else sent the same patch before you did, so it is not
needed anymore...)

thanks,

greg k-h