[PATCH 4/5] staging: wlags49_h2: Correct macro style in wl_netdev.c

Greg KH gregkh at linuxfoundation.org
Wed Mar 19 16:53:40 UTC 2014


On Wed, Mar 19, 2014 at 05:42:43PM +0100, Mathieu Maret wrote:
> 
> Le 19 mars 2014 16:34, "Greg KH" <gregkh at linuxfoundation.org> a écrit :
> >
> > On Wed, Mar 19, 2014 at 09:20:34AM +0100, Mathieu Maret wrote:
> > > Multi statement macro should use do{}while(0)
> > >
> > > Signed-off-by: Mathieu Maret <mathieu.maret at gmail.com>
> > > ---
> > >  drivers/staging/wlags49_h2/wl_netdev.c | 8 +++++---
> > >  1 file changed, 5 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/
> wlags49_h2/wl_netdev.c
> > > index 255d291..6455956 100644
> > > --- a/drivers/staging/wlags49_h2/wl_netdev.c
> > > +++ b/drivers/staging/wlags49_h2/wl_netdev.c
> > > @@ -107,9 +107,11 @@
> > >   * macros
> > >  
> ******************************************************************************/
> > >  #define BLOCK_INPUT(buf, len) \
> > > -    desc->buf_addr = buf; \
> > > -    desc->BUF_SIZE = len; \
> > > -    status = hcf_rcv_msg(&(lp->hcfCtx), desc, 0)
> > > +     do { \
> > > +             desc->buf_addr = buf; \
> > > +             desc->BUF_SIZE = len; \
> > > +             status = hcf_rcv_msg(&(lp->hcfCtx), desc, 0) \
> A ";" is missing here
> > > +     } while (0)
> > >
> > >  #define BLOCK_INPUT_DMA(buf, len) memcpy( buf, desc_next->buf_addr, pktlen
> )
> > >
> >
> > You didn't test-build the code after making this change, as this patch
> > breaks the build into lots of tiny pieces :(
> >
> > Please ALWAYS test your patches.
> >
> > I've applied the first 3 patches, please fix this one up (if it's even
> > possible, hint, I don't think it is...) and resend the remaining
> > patches.
> >
> > thanks,
> >
> > greg k-h
> Hi,
> 
> Very sorry for that. I've mess something in my config file and this file is not
> compiled ...  So newbie ...
> 
> Anyway, it's still very strange, because this macro is not used.
> The error may come from the fact that the last line miss a ";"

If the macro isn't used, just delete it then :)

> When fixed I should repost with "patch V2" in the subject?

Please do so.

thanks,

greg k-h


More information about the devel mailing list