Merge tag 'xceiv-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[karo-tx-linux.git] / drivers / usb / host / ehci-fsl.c

diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 32865a7145a86d394edb740ba617f7a4f91f66db..74914de8b9bf64ad9d758222bc1bc9075bc8aa78 100644 (file)
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -143,19 +143,19 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
        if (pdata->operating_mode == FSL_USB2_DR_OTG) {
                struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
-               ehci->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
-               dev_dbg(&pdev->dev, "hcd=0x%p  ehci=0x%p, transceiver=0x%p\n",
-                       hcd, ehci, ehci->transceiver);
+               hcd->phy = usb_get_phy(USB_PHY_TYPE_USB2);
+               dev_dbg(&pdev->dev, "hcd=0x%p  ehci=0x%p, phy=0x%p\n",
+                       hcd, ehci, hcd->phy);
 
-               if (!IS_ERR_OR_NULL(ehci->transceiver)) {
-                       retval = otg_set_host(ehci->transceiver->otg,
+               if (!IS_ERR_OR_NULL(hcd->phy)) {
+                       retval = otg_set_host(hcd->phy->otg,
                                              &ehci_to_hcd(ehci)->self);
                        if (retval) {
-                               usb_put_phy(ehci->transceiver);
+                               usb_put_phy(hcd->phy);
                                goto err4;
                        }
                } else {
-                       dev_err(&pdev->dev, "can't find transceiver\n");
+                       dev_err(&pdev->dev, "can't find phy\n");
                        retval = -ENODEV;
                        goto err4;
                }
@@ -191,11 +191,10 @@ static void usb_hcd_fsl_remove(struct usb_hcd *hcd,
                               struct platform_device *pdev)
 {
        struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
-       if (!IS_ERR_OR_NULL(ehci->transceiver)) {
-               otg_set_host(ehci->transceiver->otg, NULL);
-               usb_put_phy(ehci->transceiver);
+       if (!IS_ERR_OR_NULL(hcd->phy)) {
+               otg_set_host(hcd->phy->otg, NULL);
+               usb_put_phy(hcd->phy);
        }
 
        usb_remove_hcd(hcd);