USB: Fix usb_add_hcd() checkpatch errors.
authorSarah Sharp <sarah.a.sharp@linux.intel.com>
Wed, 1 Dec 2010 17:22:05 +0000 (09:22 -0800)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Mon, 14 Mar 2011 01:07:08 +0000 (18:07 -0700)
The irq enabling code is going to be refactored into a new function, so
clean up some checkpatch errors before moving it.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
drivers/usb/core/hcd.c

index e7d0c4571bbe4be1e6540ad4cd44dfb6c55afafe..b70db6e78977e7e5501a6cb4ae6c234d6144fd51 100644 (file)
@@ -2325,10 +2325,12 @@ int usb_add_hcd(struct usb_hcd *hcd,
 
                snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
                                hcd->driver->description, hcd->self.busnum);
-               if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
-                               hcd->irq_descr, hcd)) != 0) {
+               retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
+                               hcd->irq_descr, hcd);
+               if (retval != 0) {
                        dev_err(hcd->self.controller,
-                                       "request interrupt %d failed\n", irqnum);
+                                       "request interrupt %d failed\n",
+                                       irqnum);
                        goto err_request_irq;
                }
                hcd->irq = irqnum;
@@ -2345,7 +2347,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
                                        (unsigned long long)hcd->rsrc_start);
        }
 
-       if ((retval = hcd->driver->start(hcd)) < 0) {
+       retval = hcd->driver->start(hcd);
+       if (retval < 0) {
                dev_err(hcd->self.controller, "startup error %d\n", retval);
                goto err_hcd_driver_start;
        }