From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753281AbcHUOFB (ORCPT ); Sun, 21 Aug 2016 10:05:01 -0400 Received: from mout.web.de ([212.227.15.14]:53780 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752976AbcHUOE7 (ORCPT ); Sun, 21 Aug 2016 10:04:59 -0400 Subject: [PATCH 6/7] USB-iowarrior: Delete unnecessary braces To: linux-usb@vger.kernel.org, Greg Kroah-Hartman , Josh Boyer , Wolfram Sang References: <566ABCD9.1060404@users.sourceforge.net> <5f6dd0dd-820e-c3d3-a88d-a16ad5e64aa8@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Sun, 21 Aug 2016 16:04:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <5f6dd0dd-820e-c3d3-a88d-a16ad5e64aa8@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:6fIklRTVEf4pSRE6m89XG4MgQKbZgWINg+0IHJ9OxwuWY6AEL0B p/nSf6RJFJn0WnZLwICwYy80wLjQr7wztM8bhvA1r/+iPC/yqXZLUWQU0xAAuqW9LqdxdW0 YdTQEmyK7hNBTFvEwj8Q8vA7Z+f/V4ySh7Ql+MPg66EQi05hbgAqVz/siWP3aQHN0kNnTeB nWatDVXwl2EzPnxev5/zA== X-UI-Out-Filterresults: notjunk:1;V01:K0:/AdC3msZ3cg=:WMVN//PYu0ozadZiJNOKbr kgTz7WLTgeE2PgHbesWgMb7wa3MVBbbPCfMVblWs++lbyNuR8vLCfHSDIf+SDmUuUK1yHTfWC EZkktIel6OrgXDk9g8OWw+uFn81SN5bnJuTpwerpQQir6OSTVOzmiuQde0bB68qkFyCNu0SI8 rYA9Kpo95r9+aF0Th/KLl8dbn5kXcY+PnBQ+4TGIwKbicMMy6IaFrzmRbozd7puvjmqTmo/gR I7MdZft2PXasPJWqgBeTqXfixvdLP51MRQKwIwWlfpNfmuymuy8qkwkmSRKGCTpItlXv/HedU F1BoPAjstUMgwyIPZX2Qa0DwIPGs2TnaZZLvDEap5g2+BCjwrJzsaNVqPnqa4p2RptU1Z37mD RsZKxWrolF7LcXZBqTQVeoh1ryORzzualON5GRmQRfIWRgwF7VOzZf2yoTnK+wgVp3QyFAITL 2lSm8gzhrMZy/eWaDYrUDMJaapwPsBLIvaotGvcroWKgjj/kjwOszb4BqOD2oWpXSaSYc8HLZ A3tAizd1fk00DWj09C9PxxPP9CXpl7q3SmQhoIM8oIH5bZUa9872xkoVfg42zaVx8a2GlkrPT Kd0KGMLLhYjHP7ukiY+BAOn5LFJLK8mFbn3NiPxdQGLS02HYfNpiCejaBRrIilcd1qNOye1jp CGEfcCVjlFRn4N+oQCpEF+FMTlbz5H1SaZ0phoHZJ1f9V796aOsVujljJMmjWfA+JPx9NvcEt G2IO0X6lcCyXLpyPJWOPtcbj1tvWYXJVtNoEIzXCzzeDFIk0V3sU2Z+9w7gpi43VqsQCo6NQb tDnxYcZ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 21 Aug 2016 15:25:30 +0200 Do not use curly brackets at a few source code places where a single statement should be sufficient. Signed-off-by: Markus Elfring --- drivers/usb/misc/iowarrior.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index ffbbb74..132c8cf 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c @@ -227,10 +227,10 @@ static void iowarrior_write_callback(struct urb *urb) /* sync/async unlink faults aren't errors */ if (status && !(status == -ENOENT || - status == -ECONNRESET || status == -ESHUTDOWN)) { + status == -ECONNRESET || status == -ESHUTDOWN)) dev_dbg(&dev->interface->dev, "nonzero write bulk status received: %d\n", status); - } + /* free up our allocated buffer */ usb_free_coherent(urb->dev, urb->transfer_buffer_length, urb->transfer_buffer, urb->transfer_dma); @@ -304,25 +304,21 @@ static ssize_t iowarrior_read(struct file *file, char __user *buffer, read_index (dev)) != -1)); - if (r) { + if (r) //we were interrupted by a signal return -ERESTART; - } - if (!dev->present) { + if (!dev->present) //The device was unplugged return -ENODEV; - } - if (read_idx == -1) { + if (read_idx == -1) // Can this happen ??? return 0; - } } } offset = read_idx * (dev->report_size + 1); - if (copy_to_user(buffer, dev->read_queue + offset, count)) { + if (copy_to_user(buffer, dev->read_queue + offset, count)) return -EFAULT; - } } while (atomic_read(&dev->overflow_flag)); read_idx = ++read_idx == MAX_INTERRUPT_BUFFER ? 0 : read_idx; @@ -475,9 +471,8 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd, int io_res; /* checks for bytes read/written and copy_to/from_user results */ dev = file->private_data; - if (dev == NULL) { + if (!dev) return -ENODEV; - } buffer = kzalloc(dev->report_size, GFP_KERNEL); if (!buffer) @@ -647,9 +642,8 @@ static int iowarrior_release(struct inode *inode, struct file *file) int retval; dev = file->private_data; - if (dev == NULL) { + if (!dev) return -ENODEV; - } dev_dbg(&dev->interface->dev, "minor %d\n", dev->minor); -- 2.9.3