diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2010-12-01 12:22:05 -0500 |
---|---|---|
committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-03-13 21:07:08 -0400 |
commit | abc4f9b099e9e7db3f6f945210aee125571c236d (patch) | |
tree | 9cf11c0eed0646885ca8950cd610464d40cfaa67 | |
parent | da13051cc756756f10b2da8ea97b05bdf84bd7bb (diff) |
USB: Fix usb_add_hcd() checkpatch errors.
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>
-rw-r--r-- | drivers/usb/core/hcd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index e7d0c4571bbe..b70db6e78977 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -2325,10 +2325,12 @@ int usb_add_hcd(struct usb_hcd *hcd, | |||
2325 | 2325 | ||
2326 | snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", | 2326 | snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", |
2327 | hcd->driver->description, hcd->self.busnum); | 2327 | hcd->driver->description, hcd->self.busnum); |
2328 | if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags, | 2328 | retval = request_irq(irqnum, &usb_hcd_irq, irqflags, |
2329 | hcd->irq_descr, hcd)) != 0) { | 2329 | hcd->irq_descr, hcd); |
2330 | if (retval != 0) { | ||
2330 | dev_err(hcd->self.controller, | 2331 | dev_err(hcd->self.controller, |
2331 | "request interrupt %d failed\n", irqnum); | 2332 | "request interrupt %d failed\n", |
2333 | irqnum); | ||
2332 | goto err_request_irq; | 2334 | goto err_request_irq; |
2333 | } | 2335 | } |
2334 | hcd->irq = irqnum; | 2336 | hcd->irq = irqnum; |
@@ -2345,7 +2347,8 @@ int usb_add_hcd(struct usb_hcd *hcd, | |||
2345 | (unsigned long long)hcd->rsrc_start); | 2347 | (unsigned long long)hcd->rsrc_start); |
2346 | } | 2348 | } |
2347 | 2349 | ||
2348 | if ((retval = hcd->driver->start(hcd)) < 0) { | 2350 | retval = hcd->driver->start(hcd); |
2351 | if (retval < 0) { | ||
2349 | dev_err(hcd->self.controller, "startup error %d\n", retval); | 2352 | dev_err(hcd->self.controller, "startup error %d\n", retval); |
2350 | goto err_hcd_driver_start; | 2353 | goto err_hcd_driver_start; |
2351 | } | 2354 | } |