Skip to contentSkip to conversation

parisc: io: Improve the outb(), outw() and outl() macros

PATCH RESEND Applied Bart Van Assche 2 participants 2 messages Jan 6, 2022 PA-RISC architecture

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 parisc: io: Improve the outb(), outw() and outl() macros

This patch fixes the following build error for source file drivers/scsi/pcmcia/sym53c500_cs.c:

In file included from ./include/linux/bug.h:5,

                 from ./include/linux/cpumask.h:14,
                 from ./include/linux/mm_types_task.h:14,
                 from ./include/linux/mm_types.h:5,
                 from ./include/linux/buildid.h:5,
                 from ./include/linux/module.h:14,
                 from drivers/scsi/pcmcia/sym53c500_cs.c:42:
drivers/scsi/pcmcia/sym53c500_cs.c: In function ‘SYM53C500_intr’:
./arch/parisc/include/asm/bug.h:28:2: error: expected expression before ‘do’
   28 |  do {        \
      |  ^~

./arch/parisc/include/asm/io.h:276:20: note: in expansion of macro ‘BUG’
276 | #define outb(x, y) BUG()
| ^~~
drivers/scsi/pcmcia/sym53c500_cs.c:124:19: note: in expansion of macro ‘outb’
124 | #define REG0(x) (outb(C4_IMG, (x) + CONFIG4))
| ^~~~
drivers/scsi/pcmcia/sym53c500_cs.c:362:2: note: in expansion of macro ‘REG0’

  362 |  REG0(port_base);
      |  ^~~~
Cc James E.J. Bottomley <[email protected]>
Cc Helge Deller <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
---
 arch/parisc/include/asm/io.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/parisc/include/asm/io.h +3 -3
index 0b5259102319..837ddddbac6a 100644
@@ -273,9 +273,9 @@ static inline int inl(unsigned long addr)
 	return -1;
 }
 
-#define outb(x, y)	BUG()
-#define outw(x, y)	BUG()
-#define outl(x, y)	BUG()
+#define outb(x, y)	({(void)(x); (void)(y); BUG(); 0;})
+#define outw(x, y)	({(void)(x); (void)(y); BUG(); 0;})
+#define outl(x, y)	({(void)(x); (void)(y); BUG(); 0;})
 #endif
 
 /*
maintainer Applied
#1 lore raw
Quoted 21 lines · Bart Van Assche

This patch fixes the following build error for source file drivers/scsi/pcmcia/sym53c500_cs.c:

In file included from ./include/linux/bug.h:5,

                 from ./include/linux/cpumask.h:14,
                 from ./include/linux/mm_types_task.h:14,
                 from ./include/linux/mm_types.h:5,
                 from ./include/linux/buildid.h:5,
                 from ./include/linux/module.h:14,
                 from drivers/scsi/pcmcia/sym53c500_cs.c:42:
drivers/scsi/pcmcia/sym53c500_cs.c: In function ‘SYM53C500_intr’:
./arch/parisc/include/asm/bug.h:28:2: error: expected expression before ‘do’
   28 |  do {        \
      |  ^~

./arch/parisc/include/asm/io.h:276:20: note: in expansion of macro ‘BUG’
276 | #define outb(x, y) BUG()
| ^~~
drivers/scsi/pcmcia/sym53c500_cs.c:124:19: note: in expansion of macro ‘outb’
124 | #define REG0(x) (outb(C4_IMG, (x) + CONFIG4))
| ^~~~
drivers/scsi/pcmcia/sym53c500_cs.c:362:2: note: in expansion of macro ‘REG0’

Quoted 8 lines
  362 |  REG0(port_base);
      |  ^~~~
Cc James E.J. Bottomley <[email protected]>
Cc Helge Deller <[email protected]>
Cc Geert Uytterhoeven <[email protected]>

applied to parisc-next tree.
Thanks!
Helge

Quoted 22 lines
---
 arch/parisc/include/asm/io.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/parisc/include/asm/io.h +3 -3
index 0b5259102319..837ddddbac6a 100644
@@ -273,9 +273,9 @@ static inline int inl(unsigned long addr)
 	return -1;
 }
 
-#define outb(x, y)	BUG()
-#define outw(x, y)	BUG()
-#define outl(x, y)	BUG()
+#define outb(x, y)	({(void)(x); (void)(y); BUG(); 0;})
+#define outw(x, y)	({(void)(x); (void)(y); BUG(); 0;})
+#define outl(x, y)	({(void)(x); (void)(y); BUG(); 0;})
 #endif
 
 /*