The patch titled
ieee1394: safer definition of empty macros
has been added to the -mm tree. Its filename is
ieee1394-safer-definition-of-empty-macros.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ieee1394: safer definition of empty macros
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/dv1394.c | 4 ++--
drivers/ieee1394/ieee1394_core.c | 2 +-
drivers/ieee1394/ieee1394_types.h | 2 +-
drivers/ieee1394/ohci1394.c | 8 ++++----
drivers/ieee1394/raw1394.c | 2 +-
drivers/ieee1394/sbp2.c | 18 +++++++++---------
drivers/ieee1394/video1394.c | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff -puN drivers/ieee1394/dv1394.c~ieee1394-safer-definition-of-empty-macros drivers/ieee1394/dv1394.c
--- a/drivers/ieee1394/dv1394.c~ieee1394-safer-definition-of-empty-macros
+++ a/drivers/ieee1394/dv1394.c
@@ -137,13 +137,13 @@
#if DV1394_DEBUG_LEVEL >= 2
#define irq_printk( args... ) printk( args )
#else
-#define irq_printk( args... )
+#define irq_printk( args... ) do {} while (0)
#endif
#if DV1394_DEBUG_LEVEL >= 1
#define debug_printk( args... ) printk( args)
#else
-#define debug_printk( args... )
+#define debug_printk( args... ) do {} while (0)
#endif
/* issue a dummy PCI read to force the preceding write
diff -puN drivers/ieee1394/ieee1394_core.c~ieee1394-safer-definition-of-empty-macros drivers/ieee1394/ieee1394_core.c
--- a/drivers/ieee1394/ieee1394_core.c~ieee1394-safer-definition-of-empty-macros
+++ a/drivers/ieee1394/ieee1394_core.c
@@ -85,7 +85,7 @@ static void dump_packet(const char *text
printk("\n");
}
#else
-#define dump_packet(a,b,c,d)
+#define dump_packet(a,b,c,d) do {} while (0)
#endif
static void abort_requests(struct hpsb_host *host);
diff -puN drivers/ieee1394/ieee1394_types.h~ieee1394-safer-definition-of-empty-macros drivers/ieee1394/ieee1394_types.h
--- a/drivers/ieee1394/ieee1394_types.h~ieee1394-safer-definition-of-empty-macros
+++ a/drivers/ieee1394/ieee1394_types.h
@@ -41,7 +41,7 @@ typedef u16 arm_length_t;
#define HPSB_VERBOSE(fmt, args...) HPSB_PRINT(KERN_DEBUG, fmt , ## args)
#define HPSB_DEBUG_TLABELS
#else
-#define HPSB_VERBOSE(fmt, args...)
+#define HPSB_VERBOSE(fmt, args...) do {} while (0)
#endif
#ifdef __BIG_ENDIAN
diff -puN drivers/ieee1394/ohci1394.c~ieee1394-safer-definition-of-empty-macros drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/ohci1394.c~ieee1394-safer-definition-of-empty-macros
+++ a/drivers/ieee1394/ohci1394.c
@@ -136,7 +136,7 @@
#define DBGMSG(fmt, args...) \
printk(KERN_INFO "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
#else
-#define DBGMSG(fmt, args...)
+#define DBGMSG(fmt, args...) do {} while (0)
#endif
#ifdef CONFIG_IEEE1394_OHCI_DMA_DEBUG
@@ -148,8 +148,8 @@ printk(KERN_INFO "%s: fw-host%d: " fmt "
--global_outstanding_dmas, ## args)
static int global_outstanding_dmas = 0;
#else
-#define OHCI_DMA_ALLOC(fmt, args...)
-#define OHCI_DMA_FREE(fmt, args...)
+#define OHCI_DMA_ALLOC(fmt, args...) do {} while (0)
+#define OHCI_DMA_FREE(fmt, args...) do {} while (0)
#endif
/* print general (card independent) information */
@@ -210,7 +210,7 @@ static inline void packet_swab(quadlet_t
}
#else
/* Don't waste cycles on same sex byte swaps */
-#define packet_swab(w,x)
+#define packet_swab(w,x) do {} while (0)
#endif /* !LITTLE_ENDIAN */
/***********************************
diff -puN drivers/ieee1394/raw1394.c~ieee1394-safer-definition-of-empty-macros drivers/ieee1394/raw1394.c
--- a/drivers/ieee1394/raw1394.c~ieee1394-safer-definition-of-empty-macros
+++ a/drivers/ieee1394/raw1394.c
@@ -67,7 +67,7 @@
#define DBGMSG(fmt, args...) \
printk(KERN_INFO "raw1394:" fmt "\n" , ## args)
#else
-#define DBGMSG(fmt, args...)
+#define DBGMSG(fmt, args...) do {} while (0)
#endif
static LIST_HEAD(host_info_list);
diff -puN drivers/ieee1394/sbp2.c~ieee1394-safer-definition-of-empty-macros drivers/ieee1394/sbp2.c
--- a/drivers/ieee1394/sbp2.c~ieee1394-safer-definition-of-empty-macros
+++ a/drivers/ieee1394/sbp2.c
@@ -208,9 +208,9 @@ static u32 global_outstanding_command_or
#define outstanding_orb_incr global_outstanding_command_orbs++
#define outstanding_orb_decr global_outstanding_command_orbs--
#else
-#define SBP2_ORB_DEBUG(fmt, args...)
-#define outstanding_orb_incr
-#define outstanding_orb_decr
+#define SBP2_ORB_DEBUG(fmt, args...) do {} while (0)
+#define outstanding_orb_incr do {} while (0)
+#define outstanding_orb_decr do {} while (0)
#endif
#ifdef CONFIG_IEEE1394_SBP2_DEBUG_DMA
@@ -222,8 +222,8 @@ static u32 global_outstanding_command_or
--global_outstanding_dmas, ## args)
static u32 global_outstanding_dmas = 0;
#else
-#define SBP2_DMA_ALLOC(fmt, args...)
-#define SBP2_DMA_FREE(fmt, args...)
+#define SBP2_DMA_ALLOC(fmt, args...) do {} while (0)
+#define SBP2_DMA_FREE(fmt, args...) do {} while (0)
#endif
#if CONFIG_IEEE1394_SBP2_DEBUG >= 2
@@ -237,7 +237,7 @@ static u32 global_outstanding_dmas = 0;
#define SBP2_NOTICE(fmt, args...) HPSB_NOTICE("sbp2: "fmt, ## args)
#define SBP2_WARN(fmt, args...) HPSB_WARN("sbp2: "fmt, ## args)
#else
-#define SBP2_DEBUG(fmt, args...)
+#define SBP2_DEBUG(fmt, args...) do {} while (0)
#define SBP2_INFO(fmt, args...) HPSB_INFO("sbp2: "fmt, ## args)
#define SBP2_NOTICE(fmt, args...) HPSB_NOTICE("sbp2: "fmt, ## args)
#define SBP2_WARN(fmt, args...) HPSB_WARN("sbp2: "fmt, ## args)
@@ -380,8 +380,8 @@ static inline void sbp2util_cpu_to_be32_
}
#else /* BIG_ENDIAN */
/* Why waste the cpu cycles? */
-#define sbp2util_be32_to_cpu_buffer(x,y)
-#define sbp2util_cpu_to_be32_buffer(x,y)
+#define sbp2util_be32_to_cpu_buffer(x,y) do {} while (0)
+#define sbp2util_cpu_to_be32_buffer(x,y) do {} while (0)
#endif
#ifdef CONFIG_IEEE1394_SBP2_PACKET_DUMP
@@ -417,7 +417,7 @@ static void sbp2util_packet_dump(void *b
return;
}
#else
-#define sbp2util_packet_dump(w,x,y,z)
+#define sbp2util_packet_dump(w,x,y,z) do {} while (0)
#endif
static DECLARE_WAIT_QUEUE_HEAD(access_wq);
diff -puN drivers/ieee1394/video1394.c~ieee1394-safer-definition-of-empty-macros drivers/ieee1394/video1394.c
--- a/drivers/ieee1394/video1394.c~ieee1394-safer-definition-of-empty-macros
+++ a/drivers/ieee1394/video1394.c
@@ -129,7 +129,7 @@ struct file_ctx {
#define DBGMSG(card, fmt, args...) \
printk(KERN_INFO "video1394_%d: " fmt "\n" , card , ## args)
#else
-#define DBGMSG(card, fmt, args...)
+#define DBGMSG(card, fmt, args...) do {} while (0)
#endif
/* print general (card independent) information */
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
ieee1394-remove-include-asm-semaphoreh.patch
ieee1394-sbp2-safer-last_orb-and.patch
ieee1394-sbp2-discard-return-value-of.patch
ieee1394-sbp2-optimize-dma-direction-of.patch
ieee1394-sbp2-safer-initialization-of.patch
ieee1394-sbp2-more-checks-of-status.patch
ieee1394-sbp2-convert.patch
ieee1394-safer-definition-of-empty-macros.patch
ieee1394-sbp2-workaround-for-write-protect-bit-of.patch
ieee1394-sbp2-enable-auto-spin-up-for-all-sbp-2-devices.patch
initialize-ieee1394-early-when-built-in.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
