2010-04-13 06:13:11

by Gustavo A. R. Silva

Subject: [PATCH] Staging: comedi: fix macros do - while loop and spaces before tabs issues in comedidev.h

This is a patch to the comedidev.h file that fixes up two macros do - while
loop and a space before tabs warnings found by the checkpatch.pl tool.

Signed-off-by: Gustavo Silva <[email protected]>
---
drivers/staging/comedi/comedidev.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index ebdccfd..1b0d84b 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -57,14 +57,15 @@
static int __init x ## _init_module(void) \
{return comedi_driver_register(&(x)); } \
static void __exit x ## _cleanup_module(void) \
- {comedi_driver_unregister(&(x)); } \
+ {comedi_driver_unregister(&(x)); } \
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 \
@@ -402,7 +403,7 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
#define RANGE(a, b) {(a)*1e6, (b)*1e6, 0}
#define RANGE_ext(a, b) {(a)*1e6, (b)*1e6, RF_EXTERNAL}
#define RANGE_mA(a, b) {(a)*1e6, (b)*1e6, UNIT_mA}
-#define RANGE_unitless(a, b) {(a)*1e6, (b)*1e6, 0} /* XXX */
+#define RANGE_unitless(a, b) do {(a)*1e6, (b)*1e6, 0} while (0) /* XXX */
#define BIP_RANGE(a) {-(a)*1e6, (a)*1e6, 0}
#define UNI_RANGE(a) {0, (a)*1e6, 0}

--
1.5.4.3

2010-04-27 22:30:42

by Greg KH

Subject: Re: Staging: comedi: fix macros do - while loop and spaces before tabs issues in comedidev.h

On Tue, Apr 13, 2010 at 01:13:01AM -0500, Gustavo Silva wrote:
> This is a patch to the comedidev.h file that fixes up two macros do - while
> loop and a space before tabs warnings found by the checkpatch.pl tool.
>
> Signed-off-by: Gustavo Silva <[email protected]>
>
> --- a/drivers/staging/comedi/comedidev.h
> +++ b/drivers/staging/comedi/comedidev.h
> @@ -57,14 +57,15 @@
> static int __init x ## _init_module(void) \
> {return comedi_driver_register(&(x)); } \
> static void __exit x ## _cleanup_module(void) \
> - {comedi_driver_unregister(&(x)); } \
> + {comedi_driver_unregister(&(x)); } \
> 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 \
> @@ -402,7 +403,7 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
> #define RANGE(a, b) {(a)*1e6, (b)*1e6, 0}
> #define RANGE_ext(a, b) {(a)*1e6, (b)*1e6, RF_EXTERNAL}
> #define RANGE_mA(a, b) {(a)*1e6, (b)*1e6, UNIT_mA}
> -#define RANGE_unitless(a, b) {(a)*1e6, (b)*1e6, 0} /* XXX */
> +#define RANGE_unitless(a, b) do {(a)*1e6, (b)*1e6, 0} while (0) /* XXX */

This is not correct, you need to at least build your changes after
making them :(

Care to resend this, without this one change?

thanks,

greg k-h