[patch] staging: vt6655: add missing curly braces

[patch] staging: vt6655: add missing curly braces

[Dan Carpenter]

It's clear from the indent levels and the context that there are supposed to
be curly braces here.

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index db78614..bf4fd49 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -2788,16 +2788,18 @@ void CARDvUpdateBasicTopRate (PVOID pDeviceHandler)
 
      //Determines the highest basic rate.
      for (ii = RATE_54M; ii >= RATE_6M; ii --) {
-         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) )
+         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) {
              byTopOFDM = ii;
              break;
+         }
      }
      pDevice->byTopOFDMBasicRate = byTopOFDM;
 
      for (ii = RATE_11M;; ii --) {
-         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) )
+         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) {
              byTopCCK = ii;
              break;
+         }
          if (ii = RATE_1M)
             break;
      }

Re: [patch] staging: vt6655: add missing curly braces

[walter harms]

Dan Carpenter schrieb:
> It's clear from the indent levels and the context that there are supposed to
> be curly braces here.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> 
> diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
> index db78614..bf4fd49 100644
> --- a/drivers/staging/vt6655/card.c
> +++ b/drivers/staging/vt6655/card.c
> @@ -2788,16 +2788,18 @@ void CARDvUpdateBasicTopRate (PVOID pDeviceHandler)
>  
>       //Determines the highest basic rate.
>       for (ii = RATE_54M; ii >= RATE_6M; ii --) {
> -         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) )
> +         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) {
>               byTopOFDM = ii;
>               break;
> +         }
>       }
>       pDevice->byTopOFDMBasicRate = byTopOFDM;
>  
>       for (ii = RATE_11M;; ii --) {
> -         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) )
> +         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) {
>               byTopCCK = ii;
>               break;
> +         }
>           if (ii = RATE_1M)
>              break;
>       }


this is a realy nice catch :)
NTL i guess the code is looking for the highest bit that could be replace
with kernel code. (ffs() ?)

just my 2 cents,
 wh

Re: [patch] staging: vt6655: add missing curly braces

[Dan Carpenter]

On Fri, Feb 12, 2010 at 02:28:16PM +0100, walter harms wrote:
> 
> 
> Dan Carpenter schrieb:
> > It's clear from the indent levels and the context that there are supposed to
> > be curly braces here.
> > 
> > Signed-off-by: Dan Carpenter <error27@gmail.com>
> > 
> > diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
> > index db78614..bf4fd49 100644
> > --- a/drivers/staging/vt6655/card.c
> > +++ b/drivers/staging/vt6655/card.c
> > @@ -2788,16 +2788,18 @@ void CARDvUpdateBasicTopRate (PVOID pDeviceHandler)
> >  
> >       //Determines the highest basic rate.
> >       for (ii = RATE_54M; ii >= RATE_6M; ii --) {
> > -         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) )
> > +         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) {
> >               byTopOFDM = ii;
> >               break;
> > +         }
> >       }
> >       pDevice->byTopOFDMBasicRate = byTopOFDM;
> >  
> >       for (ii = RATE_11M;; ii --) {
> > -         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) )
> > +         if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) {
> >               byTopCCK = ii;
> >               break;
> > +         }
> >           if (ii = RATE_1M)
> >              break;
> >       }
> 
> 
> this is a realy nice catch :)

It was just a smatch thing.

> NTL i guess the code is looking for the highest bit that could be replace
> with kernel code. (ffs() ?)
> 

Well, it's not exactly ffs() because ffs(1) would return 1 but the in
this code when pDevice->wBasicRate is 1 byTopCCK would be 0.

if ( (pDevice->wBasicRate) & ((WORD)(1 << ii)) ) {
if (         1             &        (1 << 1)) { is false.
if (         1             &        (1 << 0)) { is true.

But sure, I can send a patch in the next email.

regards,
dan carpenter

> just my 2 cents,
>  wh