Skip to contentSkip to conversation

staging :keucr:scsiglue.c : fixed a macros should not be colon terminated issue

PATCH In review Keerthimai Janarthanan 3 participants 3 messages Mar 2, 2014 – Mar 5, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 staging :keucr:scsiglue.c : fixed a macros should not be colon terminated issue

fixed a coding style issue.

---
 drivers/staging/keucr/scsiglue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/keucr/scsiglue.c +1 -1
index ac3d34d..fce19a4 100644
@@ -277,7 +277,7 @@ static int show_info(struct seq_file *m, struct Scsi_Host *host)
 	do { \
 		if (us->fflags & value) \
 			SPRINTF(" " #name); \
-	} while (0);
+	} while (0)
 US_DO_ALL_FLAGS
 #undef US_FLAG
 	seq_putc(m, '\n');
Signature · 1 line
1.8.3.2
maintainer
#1 lore raw
Quoted 12 lines · Keerthimai Janarthanan

fixed a coding style issue.

---
 drivers/staging/keucr/scsiglue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/keucr/scsiglue.c +0 -0
index ac3d34d..fce19a4 100644

drivers/staging/keucr/scsiglue.c static int show_info(struct seq_file *m, struct Scsi_Host *host) · line 280

Quoted 5 lines
drivers/staging/keucr/scsiglue.c +1 -1
@@ -277,7 +277,7 @@ static int show_info(struct seq_file *m, struct Scsi_Host *host)
 	do { \
 		if (us->fflags & value) \
 			SPRINTF(" " #name); \
-	} while (0);
+	} while (0)

You just broke the build.

Please ALWAYS test your patches, don't break someone else's build with broken patches...

Please be more careful.

#2 lore raw
Quoted 2 lines · Greg KH
Quoted 1 line · Keerthimai Janarthanan

fixed a coding style issue.

[]

Quoted 1 line

drivers/staging/keucr/scsiglue.c

Quoted 1 line
drivers/staging/keucr/scsiglue.c +0 -0

[]

Quoted 9 lines

drivers/staging/keucr/scsiglue.c static int show_info(struct seq_file *m, struct Scsi_Host *host) · line 280

Quoted 6 lines
drivers/staging/keucr/scsiglue.c +1 -1
@@ -277,7 +277,7 @@ static int show_info(struct seq_file *m, struct Scsi_Host *host)
 	do { \
 		if (us->fflags & value) \
 			SPRINTF(" " #name); \
-	} while (0);
+	} while (0)

You just broke the build.

Quoted 4 lines

Please ALWAYS test your patches, don't break someone else's build with broken patches...

Please be more careful.

Thanks Greg.

Keerthimai, a possibly "better" fix would be to add a do { ... } while (0) guard and semicolons to the relatively ugly US_DO_ALL_FLAGS macro and US_FLAG uses in include/linux/usb_usual.h

include/linux/usb_usual.h:#define US_DO_ALL_FLAGS \

include/linux/usb_usual.h-      US_FLAG(SINGLE_LUN,     0x00000001)                     \
include/linux/usb_usual.h-              /* allow access to only LUN 0 */                \
include/linux/usb_usual.h-      US_FLAG(NEED_OVERRIDE,  0x00000002)                     \
include/linux/usb_usual.h-              /* unusual_devs entry is necessary */           \

...

and then add a semicolon to the uses of US_DO_ALL_FLAGS and then remove a semicolon as above.