[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 at 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