USB: ohci-omap: Use usb_put_transceiver instead of put_device
authorJarkko Nikula <jarkko.nikula@bitmer.com>
Sun, 13 May 2012 18:10:43 +0000 (21:10 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 May 2012 15:49:50 +0000 (08:49 -0700)
Currently usb_put_transceiver calls put_device so this is a no-op but it
is better to keep API usage consistent as ohci->transceiver is allocated
with usb_get_transceiver.

While at there remove one extra ohci->transceiver test as the code block
has already tested it.

Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-omap.c

index 96451e4..74b5320 100644 (file)
@@ -217,8 +217,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
                        dev_dbg(hcd->self.controller, "init %s transceiver, status %d\n",
                                        ohci->transceiver->label, status);
                        if (status) {
-                               if (ohci->transceiver)
-                                       put_device(ohci->transceiver->dev);
+                               usb_put_transceiver(ohci->transceiver);
                                return status;
                        }
                } else {
@@ -405,7 +404,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
        usb_remove_hcd(hcd);
        if (ohci->transceiver) {
                (void) otg_set_host(ohci->transceiver->otg, 0);
-               put_device(ohci->transceiver->dev);
+               usb_put_transceiver(ohci->transceiver);
        }
        if (machine_is_omap_osk())
                gpio_free(9);