From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753748AbdJPPHh (ORCPT ); Mon, 16 Oct 2017 11:07:37 -0400 Received: from mout.web.de ([217.72.192.78]:58381 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753428AbdJPPHd (ORCPT ); Mon, 16 Oct 2017 11:07:33 -0400 Subject: [PATCH 4/4] char/snsc: Delete unnecessary braces in five functions From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman Cc: LKML References: Message-ID: Date: Mon, 16 Oct 2017 17:07:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:p96tGsEvF7AMH8IXYOh7mOECR+aMs2C8moEUDP018clIsBm0sHP ZmnHipXxasHVOs0Nm7OgQV9yIW3IloDZ06ufAWcWxOYdS43klK+0vcOYN1jbZIs4uZ5zK1g Mwrwgrvjsc6A/y5sP04EwA/PPJ8V7SqZv896IMHsVx3C1VX5JDKhSeThjH89IUf3zq8Dy3e wpMw68iXJ7NLGQH+jgcjQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:bXiQiH29kOY=:xoFd7MT6/FC+i7Z0iTzHDS nldROBoThV4O4kzviZ465E9s6fDcuwRaqQYGCWh6QGT03F25mjJlaEftcxoZ6QPlouQ0AmDfw DKzQ89gnBoxQLbXuVKR/vIGwvAYLKWDPUW2DtPwAexTQFrZBn/i3XCAUEWk4iJyMT7mB+nYUc zzPwtoT9aCjz0LgLgJxB1or3K3HDgVQjfC3gYvKfJ10CO7CJm7QdTWZnuxOxyKbnWvKllipEo mAviWrM38GM7d9QlLZi4DpP083pUdcbwqIYKjx+iFtu87zcMS0lg5ATXhgymCLQAz3TGGtC9g Bq85c98h09J8KW3y8PhYRZ9wfLHbywfmZC7UcjruGQ8bajl/u0ayTHbaOYDHl1QsDDcsMdGCQ F/MW09J1ceJRrX+JKPlo63eqr2ml7hNe8+DGyrWnWd/Eo1jHbOs+Ityy/egG9Mj5EGRVRqDSw PW4MNzyW7uk+lN6atgEV0eJcyvJsG3U4sEGF0yAbfzdBR9eI1uA32nUllsoNzp4scUjsjgBHN MG/7sE1aWdWuQ2RHMe2mK1c9qGiH8LeNRKnkmgcGrxO0UGahwFp5uOshFxOTE1mbWrDZwFZ7u GuKWzOcRNCR1o2x6/wSDxKP8H1Ql/1KkyPCwMg2pUA89rG+Fz927UU1sO0+jVYAkHONmpNamo fDvSDVVjtEExUqfFEG3pB2U3U8LlbknrcWt84kUxCe2r+1NFmhEDB2hKd5ehMzyfnvho8EfBW QoQ65GRveA/REahrkNt5bOZOKsM6J2psCXaXM3PkS/FFRw1zrZStDj29PL9xZymyq35+Ept0d 20I0s0IQyXd3SNpWElHks8HlWRxqF/ihqddFx39f++5BDQ3HVo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 16 Oct 2017 16:48:24 +0200 Do not use curly brackets at some source code places where a single statement should be sufficient. Signed-off-by: Markus Elfring --- drivers/char/snsc.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index bec3bd966b1f..aea0ee083511 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c @@ -47,9 +47,9 @@ scdrv_interrupt(int irq, void *subch_data) status = ia64_sn_irtr_intr(sd->sd_nasid, sd->sd_subch); if (status > 0) { - if (status & SAL_IROUTER_INTR_RECV) { + if (status & SAL_IROUTER_INTR_RECV) wake_up(&sd->sd_rq); - } + if (status & SAL_IROUTER_INTR_XMIT) { ia64_sn_irtr_intr_disable (sd->sd_nasid, sd->sd_subch, @@ -165,14 +165,13 @@ scdrv_read(struct file *file, char __user *buf, size_t count, loff_t *f_pos) /* somebody else has it now; * if we're non-blocking, then exit... */ - if (file->f_flags & O_NONBLOCK) { + if (file->f_flags & O_NONBLOCK) return -EAGAIN; - } + /* ...or if we want to block, then do so here */ - if (down_interruptible(&sd->sd_rbs)) { + if (down_interruptible(&sd->sd_rbs)) /* something went wrong with wait */ return -ERESTARTSYS; - } } /* anything to read? */ @@ -257,14 +256,13 @@ scdrv_write(struct file *file, const char __user *buf, /* somebody else has it now; * if we're non-blocking, then exit... */ - if (file->f_flags & O_NONBLOCK) { + if (file->f_flags & O_NONBLOCK) return -EAGAIN; - } + /* ...or if we want to block, then do so here */ - if (down_interruptible(&sd->sd_wbs)) { + if (down_interruptible(&sd->sd_wbs)) /* something went wrong with wait */ return -ERESTARTSYS; - } } count = min((int) count, CHUNKSIZE); @@ -336,12 +334,11 @@ scdrv_poll(struct file *file, struct poll_table_struct *wait) spin_unlock_irqrestore(&sd->sd_rlock, flags); if (status > 0) { - if (status & SAL_IROUTER_INTR_RECV) { + if (status & SAL_IROUTER_INTR_RECV) mask |= POLLIN | POLLRDNORM; - } - if (status & SAL_IROUTER_INTR_XMIT) { + + if (status & SAL_IROUTER_INTR_XMIT) mask |= POLLOUT | POLLWRNORM; - } } return mask; @@ -450,9 +447,8 @@ scdrv_init(void) /* on the console nasid, prepare to receive * system controller environmental events */ - if(scd->scd_nasid == event_nasid) { + if (scd->scd_nasid == event_nasid) scdrv_event_init(scd); - } } return 0; } -- 2.14.2