mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Matthias Beyer <mail@beyermatthias.de>
To: gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	Matthias Beyer <mail@beyermatthias.de>
Subject: [PATCH v2 3/5] drivers: usb: core: devio.c: Braces around if-elseif-else
Date: Mon, 14 Oct 2013 21:46:38 +0200	[thread overview]
Message-ID: <1381780000-23327-4-git-send-email-mail@beyermatthias.de> (raw)
In-Reply-To: <1381780000-23327-1-git-send-email-mail@beyermatthias.de>

This patch applies the rules for braces to the if-elseif-else statement
in proc_ioctl().

As the kernel styleguide says: If there is at least one multiline block
in a if-else branching, we should add braces around all blocks. This
includes braces around the switch-statement on the else branch, which
needs a reindent after adding the braces.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 drivers/usb/core/devio.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index d15aa51..dd8701b 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1222,7 +1222,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
 		return -ENOENT;
 
 	u = 0;
-	switch(uurb->type) {
+	switch (uurb->type) {
 	case USBDEVFS_URB_TYPE_CONTROL:
 		if (!usb_endpoint_xfer_control(&ep->desc))
 			return -EINVAL;
@@ -1838,11 +1838,12 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
 		return -ENODEV;
 	}
 
-	if (ps->dev->state != USB_STATE_CONFIGURED)
+	if (ps->dev->state != USB_STATE_CONFIGURED) {
 		retval = -EHOSTUNREACH;
-	else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno)))
+	} else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno))) {
 		retval = -EINVAL;
-	else switch (ctl->ioctl_code) {
+	} else {
+	switch (ctl->ioctl_code) {
 
 	/* disconnect kernel driver from interface */
 	case USBDEVFS_DISCONNECT:
@@ -1874,6 +1875,7 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
 				retval = -ENOTTY;
 		}
 	}
+	}
 
 	/* cleanup and return */
 	if (retval >= 0
-- 
1.8.4


  parent reply	other threads:[~2013-10-14 19:47 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-10 21:41 [PATCH 0/6] drivers: usb: core: Adapt source to styleguide Matthias Beyer
2013-10-10 21:41 ` [PATCH 1/6] drivers: usb: core: {file,hub,sysfs,usb}.c: Whitespace fixes Matthias Beyer
2013-10-10 21:41 ` [PATCH 2/6] drivers: usb: core: file.c: moved asterisk to variable name Matthias Beyer
2013-10-10 21:41 ` [PATCH 3/6] drivers: usb: core: hub.c: Comments shouldnt be C99 // comment style Matthias Beyer
2013-10-10 21:41 ` [PATCH 4/6] drivers: usb: core: devio.c: Coding style fixes Matthias Beyer
2013-10-12  0:06   ` Greg KH
2013-10-12 11:01   ` [PATCH 1/1] " Matthias Beyer
2013-10-12 17:19     ` Sergei Shtylyov
2013-10-14 18:12     ` Greg KH
2013-10-14 19:46       ` [PATCH v2 0/5] " Matthias Beyer
2013-10-14 19:46         ` [PATCH v2 1/5] drivers: usb: core: devio.c: Spaces to tabs for proc_reapurbnonblock() Matthias Beyer
2013-10-14 19:46         ` [PATCH v2 2/5] drivers: usb: core: devio.c: Spaces to tabs for proc_control_compat() Matthias Beyer
2013-10-14 19:46         ` Matthias Beyer [this message]
2013-10-16 20:40           ` [PATCH v2 3/5] drivers: usb: core: devio.c: Braces around if-elseif-else Greg KH
2013-10-14 19:46         ` [PATCH v2 4/5] drivers: usb: core: devio.c: Reindented switch-block Matthias Beyer
2013-10-14 19:46         ` [PATCH v2 5/5] drivers: usb: core: devio.c: Put arguments on new line Matthias Beyer
2013-10-16 20:40           ` Greg KH
2013-10-10 21:41 ` [PATCH 5/6] drivers: usb: core: devio.c: Braces around switch Matthias Beyer
2013-10-12  0:08   ` Greg KH
2013-10-12 11:05   ` [PATCH 1/1] drivers: usb: core: devio.c: Braces around switch (updated) Matthias Beyer
2013-10-14 18:12     ` Greg KH
2013-10-10 21:41 ` [PATCH 6/6] drivers: usb: core: devio.c: Else should be on closing braces Matthias Beyer
2013-10-12  0:09 ` [PATCH 0/6] drivers: usb: core: Adapt source to styleguide Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1381780000-23327-4-git-send-email-mail@beyermatthias.de \
    --to=mail@beyermatthias.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®