dm: avoid 'do {} while(0)' loop in single statement macros

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 8e3d31a..868b158 100644 (file)
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -113,9 +113,9 @@ struct journal_entry {
 #endif
 #define journal_entry_get_sector(je)           le64_to_cpu((je)->u.sector)
 #define journal_entry_is_unused(je)            ((je)->u.s.sector_hi == cpu_to_le32(-1))
-#define journal_entry_set_unused(je)           do { ((je)->u.s.sector_hi = cpu_to_le32(-1)); } while (0)
+#define journal_entry_set_unused(je)           ((je)->u.s.sector_hi = cpu_to_le32(-1))
 #define journal_entry_is_inprogress(je)                ((je)->u.s.sector_hi == cpu_to_le32(-2))
-#define journal_entry_set_inprogress(je)       do { ((je)->u.s.sector_hi = cpu_to_le32(-2)); } while (0)
+#define journal_entry_set_inprogress(je)       ((je)->u.s.sector_hi = cpu_to_le32(-2))
 
 #define JOURNAL_BLOCK_SECTORS          8
 #define JOURNAL_SECTOR_DATA            ((1 << SECTOR_SHIFT) - sizeof(commit_id_t))

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 0ea168b..371a38b 100644 (file)
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -472,13 +472,11 @@ failed:
  * it has been invoked.
  */
 #define dm_report_EIO(m)                                               \
-do {                                                                   \
        DMDEBUG_LIMIT("%s: returning EIO; QIFNP = %d; SQIFNP = %d; DNFS = %d", \
                      dm_table_device_name((m)->ti->table),             \
                      test_bit(MPATHF_QUEUE_IF_NO_PATH, &(m)->flags),   \
                      test_bit(MPATHF_SAVED_QUEUE_IF_NO_PATH, &(m)->flags), \
-                     dm_noflush_suspending((m)->ti));                  \
-} while (0)
+                     dm_noflush_suspending((m)->ti))
 
 /*
  * Check whether bios must be queued in the device-mapper core rather