[PATCH] Staging: comedi: comedidev: Fixed a macro definition code style issue

[PATCH] Staging: comedi: comedidev: Fixed a macro definition code style issue

[Michael Jensen]

Fixed a code style issue.

Signed-off-by: Michael Jensen <emjay1988@gmail.com>
---
 drivers/staging/comedi/comedidev.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 4eb2b77..a46e859 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -61,10 +61,11 @@
 	module_init(x ## _init_module);					\
 	module_exit(x ## _cleanup_module);
 
-#define COMEDI_MODULE_MACROS						\
-	MODULE_AUTHOR("Comedi http://www.comedi.org");		\
+#define COMEDI_MODULE_MACROS		do {				\
+	MODULE_AUTHOR("Comedi http://www.comedi.org");			\
 	MODULE_DESCRIPTION("Comedi low-level driver");			\
-	MODULE_LICENSE("GPL");
+	MODULE_LICENSE("GPL");						\
+} while (0)
 
 #define COMEDI_INITCLEANUP(x)						\
 	COMEDI_MODULE_MACROS		\
-- 
1.7.0.4

Re: [PATCH] Staging: comedi: comedidev: Fixed a macro definition code style issue

[Jiri Slaby]

On 07/23/2010 08:11 AM, Michael Jensen wrote:
> Fixed a code style issue.
> 
> Signed-off-by: Michael Jensen <emjay1988@gmail.com>
> ---
>  drivers/staging/comedi/comedidev.h |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
> index 4eb2b77..a46e859 100644
> --- a/drivers/staging/comedi/comedidev.h
> +++ b/drivers/staging/comedi/comedidev.h
> @@ -61,10 +61,11 @@
>  	module_init(x ## _init_module);					\
>  	module_exit(x ## _cleanup_module);
>  
> -#define COMEDI_MODULE_MACROS						\
> -	MODULE_AUTHOR("Comedi http://www.comedi.org");		\
> +#define COMEDI_MODULE_MACROS		do {				\
> +	MODULE_AUTHOR("Comedi http://www.comedi.org");			\
>  	MODULE_DESCRIPTION("Comedi low-level driver");			\
> -	MODULE_LICENSE("GPL");
> +	MODULE_LICENSE("GPL");						\
> +} while (0)

Hmm, does this compile?

-- 
js

Re: [PATCH] Staging: comedi: comedidev: Fixed a macro definition code style issue

[Michael Jensen]

On Fri, Jul 23, 2010 at 6:53 PM, Jiri Slaby <jirislaby@gmail.com> wrote:
>
<snip>
> Hmm, does this compile?
>
> --
> js

I did build the comedi directory (as per Greg's "Write and submit your
first kernel patch" video), and didn't get any errors (once I'd done
the configuration)...

Did I miss something?

[apologies, resending because gmail sent HTML versions to the mailing
lists (ack!)]

--
Regards,

Michael Jensen

Re: [PATCH] Staging: comedi: comedidev: Fixed a macro definition code style issue

[Jiri Slaby]

On 07/23/2010 11:17 AM, Michael Jensen wrote:
> On Fri, Jul 23, 2010 at 6:53 PM, Jiri Slaby <jirislaby@gmail.com> wrote:
>>
> <snip>
>> Hmm, does this compile?
>>
> I did build the comedi directory (as per Greg's "Write and submit your
> first kernel patch" video), and didn't get any errors (once I'd done
> the configuration)...
> 
> Did I miss something?

Then the macro is probably unused (or unused in your configuration).
Either way, the macro seems to be intended for use in the top-level
scope, so do { } while (0) cannot be used there.

-- 
js

Re: [PATCH] Staging: comedi: comedidev: Fixed a macro definition code style issue

[Greg KH]

On Fri, Jul 23, 2010 at 12:36:44PM +0200, Jiri Slaby wrote:
> On 07/23/2010 11:17 AM, Michael Jensen wrote:
> > On Fri, Jul 23, 2010 at 6:53 PM, Jiri Slaby <jirislaby@gmail.com> wrote:
> >>
> > <snip>
> >> Hmm, does this compile?
> >>
> > I did build the comedi directory (as per Greg's "Write and submit your
> > first kernel patch" video), and didn't get any errors (once I'd done
> > the configuration)...
> > 
> > Did I miss something?
> 
> Then the macro is probably unused (or unused in your configuration).
> Either way, the macro seems to be intended for use in the top-level
> scope, so do { } while (0) cannot be used there.

I think we might have now removed all users of that macro, so it should
just be deleted.

Michael, can you do that instead of the do/while stuff here, as that is
not a valid change.

thanks,

greg k-h