Merge series "ASoC: topology: fix error handling flow" from Pierre-Louis Bossart...

[linux-2.6-microblaze.git] / drivers / parport / procfs.c

diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index ee7b5da..d740eba 100644 (file)
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -210,7 +210,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);