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

ieee1394: safer definition of empty macros

A deactivated macro, defined as "#define foo(bar)", will result in
silent corruption if somebody forgets a semicolon after a call to foo.
Replace it by "#define foo(bar) do {} while (0)" which will reveal any
respective syntax errors.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

Stefan Richter 611aa19f 4b60912e

+19 -19
+2 -2
drivers/ieee1394/dv1394.c
··· 137 137 #if DV1394_DEBUG_LEVEL >= 2 138 138 #define irq_printk( args... ) printk( args ) 139 139 #else 140 - #define irq_printk( args... ) 140 + #define irq_printk( args... ) do {} while (0) 141 141 #endif 142 142 143 143 #if DV1394_DEBUG_LEVEL >= 1 144 144 #define debug_printk( args... ) printk( args) 145 145 #else 146 - #define debug_printk( args... ) 146 + #define debug_printk( args... ) do {} while (0) 147 147 #endif 148 148 149 149 /* issue a dummy PCI read to force the preceding write
+1 -1
drivers/ieee1394/ieee1394_core.c
··· 85 85 printk("\n"); 86 86 } 87 87 #else 88 - #define dump_packet(a,b,c,d) 88 + #define dump_packet(a,b,c,d) do {} while (0) 89 89 #endif 90 90 91 91 static void abort_requests(struct hpsb_host *host);
+1 -1
drivers/ieee1394/ieee1394_types.h
··· 41 41 #define HPSB_VERBOSE(fmt, args...) HPSB_PRINT(KERN_DEBUG, fmt , ## args) 42 42 #define HPSB_DEBUG_TLABELS 43 43 #else 44 - #define HPSB_VERBOSE(fmt, args...) 44 + #define HPSB_VERBOSE(fmt, args...) do {} while (0) 45 45 #endif 46 46 47 47 #ifdef __BIG_ENDIAN
+4 -4
drivers/ieee1394/ohci1394.c
··· 136 136 #define DBGMSG(fmt, args...) \ 137 137 printk(KERN_INFO "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 138 138 #else 139 - #define DBGMSG(fmt, args...) 139 + #define DBGMSG(fmt, args...) do {} while (0) 140 140 #endif 141 141 142 142 #ifdef CONFIG_IEEE1394_OHCI_DMA_DEBUG ··· 148 148 --global_outstanding_dmas, ## args) 149 149 static int global_outstanding_dmas = 0; 150 150 #else 151 - #define OHCI_DMA_ALLOC(fmt, args...) 152 - #define OHCI_DMA_FREE(fmt, args...) 151 + #define OHCI_DMA_ALLOC(fmt, args...) do {} while (0) 152 + #define OHCI_DMA_FREE(fmt, args...) do {} while (0) 153 153 #endif 154 154 155 155 /* print general (card independent) information */ ··· 210 210 } 211 211 #else 212 212 /* Don't waste cycles on same sex byte swaps */ 213 - #define packet_swab(w,x) 213 + #define packet_swab(w,x) do {} while (0) 214 214 #endif /* !LITTLE_ENDIAN */ 215 215 216 216 /***********************************
+1 -1
drivers/ieee1394/raw1394.c
··· 67 67 #define DBGMSG(fmt, args...) \ 68 68 printk(KERN_INFO "raw1394:" fmt "\n" , ## args) 69 69 #else 70 - #define DBGMSG(fmt, args...) 70 + #define DBGMSG(fmt, args...) do {} while (0) 71 71 #endif 72 72 73 73 static LIST_HEAD(host_info_list);
+9 -9
drivers/ieee1394/sbp2.c
··· 203 203 #define outstanding_orb_incr global_outstanding_command_orbs++ 204 204 #define outstanding_orb_decr global_outstanding_command_orbs-- 205 205 #else 206 - #define SBP2_ORB_DEBUG(fmt, args...) 207 - #define outstanding_orb_incr 208 - #define outstanding_orb_decr 206 + #define SBP2_ORB_DEBUG(fmt, args...) do {} while (0) 207 + #define outstanding_orb_incr do {} while (0) 208 + #define outstanding_orb_decr do {} while (0) 209 209 #endif 210 210 211 211 #ifdef CONFIG_IEEE1394_SBP2_DEBUG_DMA ··· 217 217 --global_outstanding_dmas, ## args) 218 218 static u32 global_outstanding_dmas = 0; 219 219 #else 220 - #define SBP2_DMA_ALLOC(fmt, args...) 221 - #define SBP2_DMA_FREE(fmt, args...) 220 + #define SBP2_DMA_ALLOC(fmt, args...) do {} while (0) 221 + #define SBP2_DMA_FREE(fmt, args...) do {} while (0) 222 222 #endif 223 223 224 224 #if CONFIG_IEEE1394_SBP2_DEBUG >= 2 ··· 232 232 #define SBP2_NOTICE(fmt, args...) HPSB_NOTICE("sbp2: "fmt, ## args) 233 233 #define SBP2_WARN(fmt, args...) HPSB_WARN("sbp2: "fmt, ## args) 234 234 #else 235 - #define SBP2_DEBUG(fmt, args...) 235 + #define SBP2_DEBUG(fmt, args...) do {} while (0) 236 236 #define SBP2_INFO(fmt, args...) HPSB_INFO("sbp2: "fmt, ## args) 237 237 #define SBP2_NOTICE(fmt, args...) HPSB_NOTICE("sbp2: "fmt, ## args) 238 238 #define SBP2_WARN(fmt, args...) HPSB_WARN("sbp2: "fmt, ## args) ··· 375 375 } 376 376 #else /* BIG_ENDIAN */ 377 377 /* Why waste the cpu cycles? */ 378 - #define sbp2util_be32_to_cpu_buffer(x,y) 379 - #define sbp2util_cpu_to_be32_buffer(x,y) 378 + #define sbp2util_be32_to_cpu_buffer(x,y) do {} while (0) 379 + #define sbp2util_cpu_to_be32_buffer(x,y) do {} while (0) 380 380 #endif 381 381 382 382 #ifdef CONFIG_IEEE1394_SBP2_PACKET_DUMP ··· 412 412 return; 413 413 } 414 414 #else 415 - #define sbp2util_packet_dump(w,x,y,z) 415 + #define sbp2util_packet_dump(w,x,y,z) do {} while (0) 416 416 #endif 417 417 418 418 static DECLARE_WAIT_QUEUE_HEAD(access_wq);
+1 -1
drivers/ieee1394/video1394.c
··· 129 129 #define DBGMSG(card, fmt, args...) \ 130 130 printk(KERN_INFO "video1394_%d: " fmt "\n" , card , ## args) 131 131 #else 132 - #define DBGMSG(card, fmt, args...) 132 + #define DBGMSG(card, fmt, args...) do {} while (0) 133 133 #endif 134 134 135 135 /* print general (card independent) information */