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@xxxxxxxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
