Skip to contentSkip to conversation

Cleanup of unnecessary do while 0 in api mappings

PATCH Applied Nicholas Mc Guire 2 participants 2 messages Feb 8, 2014 – Feb 14, 2014 Locking primitives

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Cleanup of unnecessary do while 0 in api mappings

Cleanup of unnecessary do while 0 in api mappings

With the migration pushdonw a few of the do{ }while(0) loops became obsolete but got left over - this patch only removes this fallout.

Patch applies on top of 3.12.9-rt13

---
 include/linux/rwlock_rt.h |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)
include/linux/rwlock_rt.h +4 -16
index e85a5df..4c729ce 100644
@@ -42,10 +42,7 @@ extern void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key
 		flags = rt_write_lock_irqsave(lock);	\
 	} while (0)
 
-#define read_lock(lock)					\
-	do {						\
-		rt_read_lock(lock);			\
-	} while (0)
+#define read_lock(lock)		rt_read_lock(lock)
 
 #define read_lock_bh(lock)				\
 	do {						\
@@ -55,10 +52,7 @@ extern void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key
 
 #define read_lock_irq(lock)	read_lock(lock)
 
-#define write_lock(lock)				\
-	do {						\
-		rt_write_lock(lock);			\
-	} while (0)
+#define write_lock(lock)	rt_write_lock(lock)
 
 #define write_lock_bh(lock)				\
 	do {						\
@@ -68,10 +62,7 @@ extern void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key
 
 #define write_lock_irq(lock)	write_lock(lock)
 
-#define read_unlock(lock)				\
-	do {						\
-		rt_read_unlock(lock);			\
-	} while (0)
+#define read_unlock(lock)	rt_read_unlock(lock)
 
 #define read_unlock_bh(lock)				\
 	do {						\
@@ -81,10 +72,7 @@ extern void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key
 
 #define read_unlock_irq(lock)	read_unlock(lock)
 
-#define write_unlock(lock)				\
-	do {						\
-		rt_write_unlock(lock);			\
-	} while (0)
+#define write_unlock(lock)	rt_write_unlock(lock)
 
 #define write_unlock_bh(lock)				\
 	do {						\
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 10 lines · * Nicholas Mc Guire | 2014-02-08 12:39:20 [+0100]:

Cleanup of unnecessary do while 0 in api mappings

With the migration pushdonw a few of the do{ }while(0) loops became obsolete but got left over - this patch only removes this fallout.

Patch applies on top of 3.12.9-rt13

Applied.

Sebastian