ipc: remove braces for single statements

Deal with checkpatch messages:
     WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Davidlohr Bueso <davidlohr@hp.com>
Cc: Aswin Chandramouleeswaran <aswin@hp.com>
Cc: Rik van Riel <riel@redhat.com>
Acked-by: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/ipc/compat.c b/ipc/compat.c
index ed0530beef0b34af64079e0d915a5a7580cf5818..f71e962756d815230b9c9dea727b1be63f009445 100644 (file)
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -288,11 +288,11 @@ static long do_compat_semctl(int first, int second, int third, u32 pad)
                break;
 
        case IPC_SET:
-               if (version == IPC_64) {
+               if (version == IPC_64)
                        err = get_compat_semid64_ds(&s64, compat_ptr(pad));
-               } else {
+               else
                        err = get_compat_semid_ds(&s64, compat_ptr(pad));
-               }
+
                up64 = compat_alloc_user_space(sizeof(s64));
                if (copy_to_user(up64, &s64, sizeof(s64)))
                        err = -EFAULT;
@@ -515,11 +515,11 @@ long compat_sys_msgctl(int first, int second, void __user *uptr)
                break;
 
        case IPC_SET:
-               if (version == IPC_64) {
+               if (version == IPC_64)
                        err = get_compat_msqid64(&m64, uptr);
-               } else {
+               else
                        err = get_compat_msqid(&m64, uptr);
-               }
+
                if (err)
                        break;
                p = compat_alloc_user_space(sizeof(m64));
@@ -702,11 +702,11 @@ long compat_sys_shmctl(int first, int second, void __user *uptr)
 
 
        case IPC_SET:
-               if (version == IPC_64) {
+               if (version == IPC_64)
                        err = get_compat_shmid64_ds(&s64, uptr);
-               } else {
+               else
                        err = get_compat_shmid_ds(&s64, uptr);
-               }
+
                if (err)
                        break;
                p = compat_alloc_user_space(sizeof(s64));

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index bb36aaeb58a05f5bdb10d62af5113a94943e5ccd..ccf1f9fd263acdfae7dc56a87bceddd3170f69d9 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1303,11 +1303,11 @@ retry:
 out_fput:
        fdput(f);
 out:
-       if (sock) {
+       if (sock)
                netlink_detachskb(sock, nc);
-       } else if (nc) {
+       else if (nc)
                dev_kfree_skb(nc);
-       }
+
        return ret;
 }
 

diff --git a/ipc/sem.c b/ipc/sem.c
index 1b1acdb0aee89353e567956f3775bc0f602ab33e..bee5554173120780374e6b42228d13c786ceb315 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -492,9 +492,9 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
 
        size = sizeof(*sma) + nsems * sizeof(struct sem);
        sma = ipc_rcu_alloc(size);
-       if (!sma) {
+       if (!sma)
                return -ENOMEM;
-       }
+
        memset(sma, 0, size);
 
        sma->sem_perm.mode = (semflg & S_IRWXUGO);
@@ -1967,10 +1967,8 @@ sleep_again:
         * If queue.status != -EINTR we are woken up by another process.
         * Leave without unlink_queue(), but with sem_unlock().
         */
-
-       if (error != -EINTR) {
+       if (error != -EINTR)
                goto out_unlock_free;
-       }
 
        /*
         * If an interrupt occurred we have to clean up the queue

diff --git a/ipc/util.c b/ipc/util.c
index af976fc6a464ff1015cf6ccc64088e385f43872f..cfbd8fafb19b013ca07f5bb4c171cdad870988a3 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -183,9 +183,8 @@ void __init ipc_init_proc_interface(const char *path, const char *header,
                               NULL,           /* parent dir */
                               &sysvipc_proc_fops,
                               iface);
-       if (!pde) {
+       if (!pde)
                kfree(iface);
-       }
 }
 #endif