Refactor the function a bit to remove the need for the local variable.
The extern prototype of usb_disabled() is not needed.
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Alan Stern <st...@rowland.harvard.edu>
Cc: Lennert Buytenhek <ker...@wantstofly.org>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/usb/host/ohci-ep93xx.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 28fa6b8..bdc2908 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -138,17 +138,12 @@ static struct hc_driver ohci_ep93xx_hc_driver = {
.start_port_reset = ohci_start_port_reset,
};
-extern int usb_disabled(void);
-
static int ohci_hcd_ep93xx_drv_probe(struct platform_device *pdev)
{
- int ret;
-
- ret = -ENODEV;
- if (!usb_disabled())
- ret = usb_hcd_ep93xx_probe(&ohci_ep93xx_hc_driver, pdev);
+ if (usb_disabled())
+ return -ENODEV;
- return ret;
+ return usb_hcd_ep93xx_probe(&ohci_ep93xx_hc_driver, pdev);
}
static int ohci_hcd_ep93xx_drv_remove(struct platform_device *pdev)
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
