parport: Standardize use of printmode

Standardize the define and the uses of printmode.

Miscellanea:

o Add missing statement termination ; where necessary

Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lore.kernel.org/r/20200403134325.11523-8-sudipm.mukherjee@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index cb6a08bee3c7df9d59933050153b54903675c2a4..9228e8f903092b1f02605fb2d6737621b17f89ae 100644 (file)
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -299,12 +299,16 @@ struct parport *parport_gsc_probe_port(unsigned long base,
                p->dma = PARPORT_DMA_NONE;
 
        pr_cont(" [");
-#define printmode(x) {if(p->modes&PARPORT_MODE_##x){pr_cont("%s%s",f?",":"",#x);f++;}}
+#define printmode(x)                                                   \
+do {                                                                   \
+       if (p->modes & PARPORT_MODE_##x)                                \
+               pr_cont("%s%s", f++ ? "," : "", #x);                    \
+} while (0)
        {
                int f = 0;
                printmode(PCSPP);
                printmode(TRISTATE);
-               printmode(COMPAT)
+               printmode(COMPAT);
                printmode(EPP);
 //             printmode(ECP);
 //             printmode(DMA);

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index aae03b59564f18ce9ab6ded2b882154c11e85c1a..77e37e3cb3a091c65d31023ac3d850dd5559ecf2 100644 (file)
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2134,19 +2134,17 @@ struct parport *parport_pc_probe_port(unsigned long int base,
 
        pr_cont(" [");
 
-#define printmode(x) \
-       {\
-               if (p->modes & PARPORT_MODE_##x) {\
-                       pr_cont("%s%s", f ? "," : "", #x);      \
-                       f++;\
-               } \
-       }
+#define printmode(x)                                                   \
+do {                                                                   \
+       if (p->modes & PARPORT_MODE_##x)                                \
+               pr_cont("%s%s", f++ ? "," : "", #x);                    \
+} while (0)
 
        {
                int f = 0;
                printmode(PCSPP);
                printmode(TRISTATE);
-               printmode(COMPAT)
+               printmode(COMPAT);
                printmode(EPP);
                printmode(ECP);
                printmode(DMA);

diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index 48804049d6972631f3179659b31bf3db3966c149..e957beb94f1429e7509816f8b86dffbc73de8dec 100644 (file)
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -213,7 +213,11 @@ static int do_hardware_modes(struct ctl_table *table, int write,
                return -EACCES;
 
        {
-#define printmode(x) {if(port->modes&PARPORT_MODE_##x){len+=sprintf(buffer+len,"%s%s",f?",":"",#x);f++;}}
+#define printmode(x)                                                   \
+do {                                                                   \
+       if (port->modes & PARPORT_MODE_##x)                             \
+               len += sprintf(buffer + len, "%s%s", f++ ? "," : "", #x); \
+} while (0)
                int f = 0;
                printmode(PCSPP);
                printmode(TRISTATE);