Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[S390] empty function defines.

Use do { } while (0) constructs instead of empty defines to avoid
subtle compile bugs.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Heiko Carstens and committed by
Martin Schwidefsky
39b083fe ff6b8ea6

+15 -15
+8 -8
drivers/s390/cio/qdio.h
··· 191 191 #if QDIO_VERBOSE_LEVEL>8 192 192 #define QDIO_PRINT_STUPID(x...) printk( KERN_DEBUG QDIO_PRINTK_HEADER x) 193 193 #else 194 - #define QDIO_PRINT_STUPID(x...) 194 + #define QDIO_PRINT_STUPID(x...) do { } while (0) 195 195 #endif 196 196 197 197 #if QDIO_VERBOSE_LEVEL>7 198 198 #define QDIO_PRINT_ALL(x...) printk( QDIO_PRINTK_HEADER x) 199 199 #else 200 - #define QDIO_PRINT_ALL(x...) 200 + #define QDIO_PRINT_ALL(x...) do { } while (0) 201 201 #endif 202 202 203 203 #if QDIO_VERBOSE_LEVEL>6 204 204 #define QDIO_PRINT_INFO(x...) printk( QDIO_PRINTK_HEADER x) 205 205 #else 206 - #define QDIO_PRINT_INFO(x...) 206 + #define QDIO_PRINT_INFO(x...) do { } while (0) 207 207 #endif 208 208 209 209 #if QDIO_VERBOSE_LEVEL>5 210 210 #define QDIO_PRINT_WARN(x...) printk( QDIO_PRINTK_HEADER x) 211 211 #else 212 - #define QDIO_PRINT_WARN(x...) 212 + #define QDIO_PRINT_WARN(x...) do { } while (0) 213 213 #endif 214 214 215 215 #if QDIO_VERBOSE_LEVEL>4 216 216 #define QDIO_PRINT_ERR(x...) printk( QDIO_PRINTK_HEADER x) 217 217 #else 218 - #define QDIO_PRINT_ERR(x...) 218 + #define QDIO_PRINT_ERR(x...) do { } while (0) 219 219 #endif 220 220 221 221 #if QDIO_VERBOSE_LEVEL>3 222 222 #define QDIO_PRINT_CRIT(x...) printk( QDIO_PRINTK_HEADER x) 223 223 #else 224 - #define QDIO_PRINT_CRIT(x...) 224 + #define QDIO_PRINT_CRIT(x...) do { } while (0) 225 225 #endif 226 226 227 227 #if QDIO_VERBOSE_LEVEL>2 228 228 #define QDIO_PRINT_ALERT(x...) printk( QDIO_PRINTK_HEADER x) 229 229 #else 230 - #define QDIO_PRINT_ALERT(x...) 230 + #define QDIO_PRINT_ALERT(x...) do { } while (0) 231 231 #endif 232 232 233 233 #if QDIO_VERBOSE_LEVEL>1 234 234 #define QDIO_PRINT_EMERG(x...) printk( QDIO_PRINTK_HEADER x) 235 235 #else 236 - #define QDIO_PRINT_EMERG(x...) 236 + #define QDIO_PRINT_EMERG(x...) do { } while (0) 237 237 #endif 238 238 239 239 #define HEXDUMP16(importance,header,ptr) \
+4 -4
drivers/s390/scsi/zfcp_def.h
··· 543 543 } while (0) 544 544 545 545 #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_NORMAL 546 - # define ZFCP_LOG_NORMAL(fmt, args...) 546 + # define ZFCP_LOG_NORMAL(fmt, args...) do { } while (0) 547 547 #else 548 548 # define ZFCP_LOG_NORMAL(fmt, args...) \ 549 549 do { \ ··· 553 553 #endif 554 554 555 555 #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_INFO 556 - # define ZFCP_LOG_INFO(fmt, args...) 556 + # define ZFCP_LOG_INFO(fmt, args...) do { } while (0) 557 557 #else 558 558 # define ZFCP_LOG_INFO(fmt, args...) \ 559 559 do { \ ··· 563 563 #endif 564 564 565 565 #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_DEBUG 566 - # define ZFCP_LOG_DEBUG(fmt, args...) 566 + # define ZFCP_LOG_DEBUG(fmt, args...) do { } while (0) 567 567 #else 568 568 # define ZFCP_LOG_DEBUG(fmt, args...) \ 569 569 ZFCP_LOG(ZFCP_LOG_LEVEL_DEBUG, fmt , ##args) 570 570 #endif 571 571 572 572 #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_TRACE 573 - # define ZFCP_LOG_TRACE(fmt, args...) 573 + # define ZFCP_LOG_TRACE(fmt, args...) do { } while (0) 574 574 #else 575 575 # define ZFCP_LOG_TRACE(fmt, args...) \ 576 576 ZFCP_LOG(ZFCP_LOG_LEVEL_TRACE, fmt , ##args)
+1 -1
include/asm-s390/dma.h
··· 11 11 12 12 #define MAX_DMA_ADDRESS 0x80000000 13 13 14 - #define free_dma(x) 14 + #define free_dma(x) do { } while (0) 15 15 16 16 #endif /* _ASM_DMA_H */
+1 -1
include/asm-s390/io.h
··· 116 116 #define outb(x,addr) ((void) writeb(x,addr)) 117 117 #define outb_p(x,addr) outb(x,addr) 118 118 119 - #define mmiowb() 119 + #define mmiowb() do { } while (0) 120 120 121 121 /* 122 122 * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+1 -1
include/asm-s390/smp.h
··· 104 104 #define smp_cpu_not_running(cpu) 1 105 105 #define smp_get_cpu(cpu) ({ 0; }) 106 106 #define smp_put_cpu(cpu) ({ 0; }) 107 - #define smp_setup_cpu_possible_map() 107 + #define smp_setup_cpu_possible_map() do { } while (0) 108 108 #endif 109 109 110 110 #endif