[PATCH 2/2] drivers/usb/core: devio.c: Removed various warnings and errors generated by checkpatch.pl
Removed warnings and erros from checkpatch.pl that go against the coding style. Lines 29 and 103: removed unwanted spaces. Lines 1040 and 1591: changed dev_printk(KERN_DEBUG, ...) to dev_dbg(>dev). Lines 1942: changed an else switch to else { switch (...) {...} }. (Makes more sense(to me)). Lines 1319 and 1906: added spaces to fit coding style consistently. Signed-off-by: Chase Metzger --- drivers/usb/core/devio.c | 69 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 4b0448c..1a97df0 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -29,7 +29,7 @@ *22.12.1999 0.1 Initial release (split from proc_usb.c) *04.01.2000 0.2 Turned into its own filesystem *30.09.2005 0.3 Fix user-triggerable oops in async URB delivery - * (CAN-2005-3055) + * (CAN-2005-3055) */ /*/ @@ -103,7 +103,7 @@ MODULE_PARM_DESC(usbfs_snoop, "true to log all usbfs traffic"); #define snoop(dev, format, arg...) \ do {\ if (usbfs_snoop)\ - dev_info(dev , format , ## arg);\ + dev_info(dev, format, ## arg); \ } while (0) enum snoop_when { @@ -1040,7 +1040,7 @@ static int proc_control(struct usb_dev_state *ps, void __user *arg) snoop_urb(dev, NULL, pipe, max(i, 0), min(i, 0), COMPLETE, NULL, 0); } if (i < 0 && i != -EPIPE) { - dev_printk(KERN_DEBUG, >dev, "usbfs: USBDEVFS_CONTROL " + dev_dbg(>dev, "usbfs: USBDEVFS_CONTROL " "failed cmd %s rqt %u rq %u len %u ret %d\n", current->comm, ctrl.bRequestType, ctrl.bRequest, ctrl.wLength, i); @@ -1319,7 +1319,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb is_in = (uurb->endpoint & USB_ENDPOINT_DIR_MASK) != 0; u = 0; - switch(uurb->type) { + switch (uurb->type) { case USBDEVFS_URB_TYPE_CONTROL: if (!usb_endpoint_xfer_control(>desc)) return -EINVAL; @@ -1591,8 +1591,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb } if (ret) { - dev_printk(KERN_DEBUG, >dev->dev, - "usbfs: usb_submit_urb returned %d\n", ret); + dev_dbg(>dev->dev, "usbfs: usb_submit_urb returned %d\n", ret); snoop_urb(ps->dev, as->userurb, as->urb->pipe, 0, ret, COMPLETE, NULL, 0); async_removepending(as); @@ -1906,7 +1905,7 @@ static int proc_releaseinterface(struct usb_dev_state *ps, void __user *arg) return -EFAULT; if ((ret = releaseintf(ps, ifnum)) < 0) return ret; - destroy_async_on_interface (ps, ifnum); + destroy_async_on_interface(ps, ifnum); return 0; } @@ -1942,36 +1941,38 @@ static int proc_ioctl(struct usb_dev_state *ps, struct usbdevfs_ioctl *ctl) retval = -EHOSTUNREACH; else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno))) retval = -EINVAL; - else switch (ctl->ioctl_code) { - - /* disconnect kernel driver from interface */ - case USBDEVFS_DISCONNECT: - if (intf->dev.driver) { - driver = to_usb_driver(intf->dev.driver); - dev_dbg(>dev, "disconnect by usbfs\n"); - usb_driver_release_interface(driver, intf); - } else - retval = -ENODATA; - break; + else { + switch (ctl->ioctl_code) { + + /* disconnect kernel driver from interface */ + case USBDEVFS_DISCONNECT: + if (intf->dev.driver) { + driver = to_usb_driver(intf->dev.driver); + dev_dbg(>dev, "disconnect by usbfs\n"); + usb_driver_release_interface(driver, intf); + } else + retval = -ENODATA; + break; - /* let kernel drivers try to (re)bind to the interface */ - case USBDEVFS_CONNECT: - if (!intf->dev.driver) - retval = device_attach(>dev); - else - retval = -EBUSY; - break; + /* let kernel drivers try to (re)bind to the interface */ + case USBDEVFS_CONNECT: + if (!intf->dev.driver) + retval
[PATCH 2/2] drivers/usb/core: devio.c: Removed various warnings and errors generated by checkpatch.pl
Removed warnings and erros from checkpatch.pl that go against the coding style. Lines 29 and 103: removed unwanted spaces. Lines 1040 and 1591: changed dev_printk(KERN_DEBUG, ...) to dev_dbg(dev-dev). Lines 1942: changed an else switch to else { switch (...) {...} }. (Makes more sense(to me)). Lines 1319 and 1906: added spaces to fit coding style consistently. Signed-off-by: Chase Metzger chasemetzge...@gmail.com --- drivers/usb/core/devio.c | 69 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 4b0448c..1a97df0 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -29,7 +29,7 @@ *22.12.1999 0.1 Initial release (split from proc_usb.c) *04.01.2000 0.2 Turned into its own filesystem *30.09.2005 0.3 Fix user-triggerable oops in async URB delivery - * (CAN-2005-3055) + * (CAN-2005-3055) */ /*/ @@ -103,7 +103,7 @@ MODULE_PARM_DESC(usbfs_snoop, true to log all usbfs traffic); #define snoop(dev, format, arg...) \ do {\ if (usbfs_snoop)\ - dev_info(dev , format , ## arg);\ + dev_info(dev, format, ## arg); \ } while (0) enum snoop_when { @@ -1040,7 +1040,7 @@ static int proc_control(struct usb_dev_state *ps, void __user *arg) snoop_urb(dev, NULL, pipe, max(i, 0), min(i, 0), COMPLETE, NULL, 0); } if (i 0 i != -EPIPE) { - dev_printk(KERN_DEBUG, dev-dev, usbfs: USBDEVFS_CONTROL + dev_dbg(dev-dev, usbfs: USBDEVFS_CONTROL failed cmd %s rqt %u rq %u len %u ret %d\n, current-comm, ctrl.bRequestType, ctrl.bRequest, ctrl.wLength, i); @@ -1319,7 +1319,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb is_in = (uurb-endpoint USB_ENDPOINT_DIR_MASK) != 0; u = 0; - switch(uurb-type) { + switch (uurb-type) { case USBDEVFS_URB_TYPE_CONTROL: if (!usb_endpoint_xfer_control(ep-desc)) return -EINVAL; @@ -1591,8 +1591,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb } if (ret) { - dev_printk(KERN_DEBUG, ps-dev-dev, - usbfs: usb_submit_urb returned %d\n, ret); + dev_dbg(ps-dev-dev, usbfs: usb_submit_urb returned %d\n, ret); snoop_urb(ps-dev, as-userurb, as-urb-pipe, 0, ret, COMPLETE, NULL, 0); async_removepending(as); @@ -1906,7 +1905,7 @@ static int proc_releaseinterface(struct usb_dev_state *ps, void __user *arg) return -EFAULT; if ((ret = releaseintf(ps, ifnum)) 0) return ret; - destroy_async_on_interface (ps, ifnum); + destroy_async_on_interface(ps, ifnum); return 0; } @@ -1942,36 +1941,38 @@ static int proc_ioctl(struct usb_dev_state *ps, struct usbdevfs_ioctl *ctl) retval = -EHOSTUNREACH; else if (!(intf = usb_ifnum_to_if(ps-dev, ctl-ifno))) retval = -EINVAL; - else switch (ctl-ioctl_code) { - - /* disconnect kernel driver from interface */ - case USBDEVFS_DISCONNECT: - if (intf-dev.driver) { - driver = to_usb_driver(intf-dev.driver); - dev_dbg(intf-dev, disconnect by usbfs\n); - usb_driver_release_interface(driver, intf); - } else - retval = -ENODATA; - break; + else { + switch (ctl-ioctl_code) { + + /* disconnect kernel driver from interface */ + case USBDEVFS_DISCONNECT: + if (intf-dev.driver) { + driver = to_usb_driver(intf-dev.driver); + dev_dbg(intf-dev, disconnect by usbfs\n); + usb_driver_release_interface(driver, intf); + } else + retval = -ENODATA; + break; - /* let kernel drivers try to (re)bind to the interface */ - case USBDEVFS_CONNECT: - if (!intf-dev.driver) - retval = device_attach(intf-dev); - else - retval = -EBUSY; - break; + /* let kernel drivers try to (re)bind to the interface */ + case USBDEVFS_CONNECT: + if (!intf-dev.driver) +