usb: otg: utils: rename function name in OTG utils
authorKishon Vijay Abraham I <kishon@ti.com>
Fri, 22 Jun 2012 11:32:45 +0000 (17:02 +0530)
committerFelipe Balbi <balbi@ti.com>
Mon, 25 Jun 2012 11:04:26 +0000 (14:04 +0300)
_transceiver() in otg.c is replaced with _phy. usb_set_transceiver is
replaced with usb_add_phy to make it similar to other usb standard
function names like usb_add_hcd.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
36 files changed:
drivers/power/ab8500_charger.c
drivers/power/isp1704_charger.c
drivers/power/pda_power.c
drivers/power/twl4030_charger.c
drivers/usb/chipidea/udc.c
drivers/usb/gadget/fsl_udc_core.c
drivers/usb/gadget/mv_udc_core.c
drivers/usb/gadget/omap_udc.c
drivers/usb/gadget/pxa25x_udc.c
drivers/usb/gadget/pxa27x_udc.c
drivers/usb/gadget/s3c-hsudc.c
drivers/usb/host/ehci-fsl.c
drivers/usb/host/ehci-msm.c
drivers/usb/host/ehci-mv.c
drivers/usb/host/ehci-tegra.c
drivers/usb/host/ohci-omap.c
drivers/usb/musb/am35x.c
drivers/usb/musb/blackfin.c
drivers/usb/musb/da8xx.c
drivers/usb/musb/davinci.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_dsps.c
drivers/usb/musb/omap2430.c
drivers/usb/musb/tusb6010.c
drivers/usb/musb/ux500.c
drivers/usb/otg/ab8500-usb.c
drivers/usb/otg/fsl_otg.c
drivers/usb/otg/gpio_vbus.c
drivers/usb/otg/isp1301_omap.c
drivers/usb/otg/msm_otg.c
drivers/usb/otg/mv_otg.c
drivers/usb/otg/nop-usb-xceiv.c
drivers/usb/otg/otg.c
drivers/usb/otg/twl4030-usb.c
drivers/usb/otg/twl6030-usb.c
include/linux/usb/otg.h

index d2303d0b7c755669f7ab48b968e062474241997b..cf5ffc4d104855f3c55918f0233c0f514f433f94 100644 (file)
@@ -2517,7 +2517,7 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev)
                dev_err(di->dev, "%s mask and set failed\n", __func__);
 
        usb_unregister_notifier(di->usb_phy, &di->nb);
-       usb_put_transceiver(di->usb_phy);
+       usb_put_phy(di->usb_phy);
 
        /* Delete the work queue */
        destroy_workqueue(di->charger_wq);
@@ -2688,7 +2688,7 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
                goto free_ac;
        }
 
-       di->usb_phy = usb_get_transceiver();
+       di->usb_phy = usb_get_phy();
        if (!di->usb_phy) {
                dev_err(di->dev, "failed to get usb transceiver\n");
                ret = -EINVAL;
@@ -2747,7 +2747,7 @@ free_irq:
                free_irq(irq, di);
        }
 put_usb_phy:
-       usb_put_transceiver(di->usb_phy);
+       usb_put_phy(di->usb_phy);
 free_usb:
        power_supply_unregister(&di->usb_chg.psy);
 free_ac:
index e5ccd29797732d8dae6992a558eabd896fe6a9f0..50773ae6f72ed99e73641986dc98c1071c5448e1 100644 (file)
@@ -415,7 +415,7 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
        if (!isp)
                return -ENOMEM;
 
-       isp->phy = usb_get_transceiver();
+       isp->phy = usb_get_phy();
        if (!isp->phy)
                goto fail0;
 
@@ -475,7 +475,7 @@ fail2:
        power_supply_unregister(&isp->psy);
 fail1:
        isp1704_charger_set_power(isp, 0);
-       usb_put_transceiver(isp->phy);
+       usb_put_phy(isp->phy);
 fail0:
        kfree(isp);
 
@@ -490,7 +490,7 @@ static int __devexit isp1704_charger_remove(struct platform_device *pdev)
 
        usb_unregister_notifier(isp->phy, &isp->nb);
        power_supply_unregister(&isp->psy);
-       usb_put_transceiver(isp->phy);
+       usb_put_phy(isp->phy);
        isp1704_charger_set_power(isp, 0);
        kfree(isp);
 
index 214468f4444a0d68e61468dc19f8ec1abf56b40b..e0f206b0775b2a09cf24caed61ae08d5098af940 100644 (file)
@@ -321,7 +321,7 @@ static int pda_power_probe(struct platform_device *pdev)
        }
 
 #ifdef CONFIG_USB_OTG_UTILS
-       transceiver = usb_get_transceiver();
+       transceiver = usb_get_phy();
        if (transceiver && !pdata->is_usb_online) {
                pdata->is_usb_online = otg_is_usb_online;
        }
@@ -409,7 +409,7 @@ usb_supply_failed:
                free_irq(ac_irq->start, &pda_psy_ac);
 #ifdef CONFIG_USB_OTG_UTILS
        if (transceiver)
-               usb_put_transceiver(transceiver);
+               usb_put_phy(transceiver);
 #endif
 ac_irq_failed:
        if (pdata->is_ac_online)
@@ -444,7 +444,7 @@ static int pda_power_remove(struct platform_device *pdev)
                power_supply_unregister(&pda_psy_ac);
 #ifdef CONFIG_USB_OTG_UTILS
        if (transceiver)
-               usb_put_transceiver(transceiver);
+               usb_put_phy(transceiver);
 #endif
        if (ac_draw) {
                regulator_put(ac_draw);
index fdad850c77d3264c49b0981a8656bd8afbd74529..fcddd115cc084dc16bd98edf77e2845c84b008bd 100644 (file)
@@ -479,7 +479,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
 
        INIT_WORK(&bci->work, twl4030_bci_usb_work);
 
-       bci->transceiver = usb_get_transceiver();
+       bci->transceiver = usb_get_phy();
        if (bci->transceiver != NULL) {
                bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
                usb_register_notifier(bci->transceiver, &bci->usb_nb);
@@ -509,7 +509,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
 fail_unmask_interrupts:
        if (bci->transceiver != NULL) {
                usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
-               usb_put_transceiver(bci->transceiver);
+               usb_put_phy(bci->transceiver);
        }
        free_irq(bci->irq_bci, bci);
 fail_bci_irq:
@@ -540,7 +540,7 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
 
        if (bci->transceiver != NULL) {
                usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
-               usb_put_transceiver(bci->transceiver);
+               usb_put_phy(bci->transceiver);
        }
        free_irq(bci->irq_bci, bci);
        free_irq(bci->irq_chg, bci);
index 51f96942dc5ef109319429464d267acc43d09600..4468f2c2dddd421d6a8c00ac6845055e8d1715c1 100644 (file)
@@ -1687,7 +1687,7 @@ static int udc_start(struct ci13xxx *udc)
 
        udc->gadget.ep0 = &udc->ep0in->ep;
 
-       udc->transceiver = usb_get_transceiver();
+       udc->transceiver = usb_get_phy();
 
        if (udc->udc_driver->flags & CI13XXX_REQUIRE_TRANSCEIVER) {
                if (udc->transceiver == NULL) {
@@ -1731,7 +1731,7 @@ static int udc_start(struct ci13xxx *udc)
 remove_trans:
        if (udc->transceiver) {
                otg_set_peripheral(udc->transceiver->otg, &udc->gadget);
-               usb_put_transceiver(udc->transceiver);
+               usb_put_phy(udc->transceiver);
        }
 
        dev_err(dev, "error = %i\n", retval);
@@ -1741,7 +1741,7 @@ unreg_device:
        device_unregister(&udc->gadget.dev);
 put_transceiver:
        if (udc->transceiver)
-               usb_put_transceiver(udc->transceiver);
+               usb_put_phy(udc->transceiver);
 free_pools:
        dma_pool_destroy(udc->td_pool);
 free_qh_pool:
@@ -1774,7 +1774,7 @@ static void udc_stop(struct ci13xxx *udc)
 
        if (udc->transceiver) {
                otg_set_peripheral(udc->transceiver->otg, NULL);
-               usb_put_transceiver(udc->transceiver);
+               usb_put_phy(udc->transceiver);
        }
        dbg_remove_files(&udc->gadget.dev);
        device_unregister(&udc->gadget.dev);
index 28316858208bfeed10ab933b770295a9e6619b50..d7038509b95656eb5990b518799094742a6a7649 100644 (file)
@@ -2455,7 +2455,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_USB_OTG
        if (pdata->operating_mode == FSL_USB2_DR_OTG) {
-               udc_controller->transceiver = usb_get_transceiver();
+               udc_controller->transceiver = usb_get_phy();
                if (!udc_controller->transceiver) {
                        ERR("Can't find OTG driver!\n");
                        ret = -ENODEV;
index dbcd1329495ef015ed097ef8fec074ac71371011..5d779955d5a610b03f06871f65514688e3e6024a 100644 (file)
@@ -2180,7 +2180,7 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
 
 #ifdef CONFIG_USB_OTG_UTILS
        if (pdata->mode == MV_USB_MODE_OTG)
-               udc->transceiver = usb_get_transceiver();
+               udc->transceiver = usb_get_phy();
 #endif
 
        udc->clknum = pdata->clknum;
index 7ba32469c5bdc789ac55abbe883b288bc1607c19..74b9bb8099e7246da5fb931706b568aee17d1dbe 100644 (file)
@@ -2865,7 +2865,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
                 * use it.  Except for OTG, we don't _need_ to talk to one;
                 * but not having one probably means no VBUS detection.
                 */
-               xceiv = usb_get_transceiver();
+               xceiv = usb_get_phy();
                if (xceiv)
                        type = xceiv->label;
                else if (config->otg) {
@@ -3011,7 +3011,7 @@ cleanup1:
 
 cleanup0:
        if (xceiv)
-               usb_put_transceiver(xceiv);
+               usb_put_phy(xceiv);
 
        if (cpu_is_omap16xx() || cpu_is_omap24xx() || cpu_is_omap7xx()) {
                clk_disable(hhc_clk);
@@ -3041,7 +3041,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
 
        pullup_disable(udc);
        if (udc->transceiver) {
-               usb_put_transceiver(udc->transceiver);
+               usb_put_phy(udc->transceiver);
                udc->transceiver = NULL;
        }
        omap_writew(0, UDC_SYSCON1);
index d7c8cb3bf759f66e02daecda062da3f0c4e0ac90..a658e446caba4cab334dbdda1af8f6c08f248790 100644 (file)
@@ -2159,7 +2159,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
        dev->dev = &pdev->dev;
        dev->mach = pdev->dev.platform_data;
 
-       dev->transceiver = usb_get_transceiver();
+       dev->transceiver = usb_get_phy();
 
        if (gpio_is_valid(dev->mach->gpio_pullup)) {
                if ((retval = gpio_request(dev->mach->gpio_pullup,
@@ -2238,7 +2238,7 @@ lubbock_fail0:
                gpio_free(dev->mach->gpio_pullup);
  err_gpio_pullup:
        if (dev->transceiver) {
-               usb_put_transceiver(dev->transceiver);
+               usb_put_phy(dev->transceiver);
                dev->transceiver = NULL;
        }
        clk_put(dev->clk);
@@ -2280,7 +2280,7 @@ static int __exit pxa25x_udc_remove(struct platform_device *pdev)
        clk_put(dev->clk);
 
        if (dev->transceiver) {
-               usb_put_transceiver(dev->transceiver);
+               usb_put_phy(dev->transceiver);
                dev->transceiver = NULL;
        }
 
index 98acb3ab9e1791f966c44be9b80c430d46a492fb..b982304a49c168be7ed126ce606d701316ff8d8c 100644 (file)
@@ -2464,7 +2464,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev)
 
        udc->dev = &pdev->dev;
        udc->mach = pdev->dev.platform_data;
-       udc->transceiver = usb_get_transceiver();
+       udc->transceiver = usb_get_phy();
 
        gpio = udc->mach->gpio_pullup;
        if (gpio_is_valid(gpio)) {
@@ -2543,7 +2543,7 @@ static int __exit pxa_udc_remove(struct platform_device *_dev)
        if (gpio_is_valid(gpio))
                gpio_free(gpio);
 
-       usb_put_transceiver(udc->transceiver);
+       usb_put_phy(udc->transceiver);
 
        udc->transceiver = NULL;
        platform_set_drvdata(_dev, NULL);
index 36c6836eeb0f93818be4eb01367863db2e9e6ed8..9ad33395f564416c85f0585577345cb5d917725b 100644 (file)
@@ -1282,7 +1282,7 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev)
        hsudc->dev = dev;
        hsudc->pd = pdev->dev.platform_data;
 
-       hsudc->transceiver = usb_get_transceiver();
+       hsudc->transceiver = usb_get_phy();
 
        for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++)
                hsudc->supplies[i].supply = s3c_hsudc_supply_names[i];
@@ -1386,7 +1386,7 @@ err_remap:
        release_mem_region(res->start, resource_size(res));
 err_res:
        if (hsudc->transceiver)
-               usb_put_transceiver(hsudc->transceiver);
+               usb_put_phy(hsudc->transceiver);
 
        regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
 err_supplies:
index 43362577b54afb6f42530c9743474e9c3ffe028c..0e8976a0ed517ee1beabea805850ee95a06e1934 100644 (file)
@@ -142,7 +142,7 @@ 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_transceiver();
+               ehci->transceiver = usb_get_phy();
                dev_dbg(&pdev->dev, "hcd=0x%p  ehci=0x%p, transceiver=0x%p\n",
                        hcd, ehci, ehci->transceiver);
 
@@ -150,7 +150,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
                        retval = otg_set_host(ehci->transceiver->otg,
                                              &ehci_to_hcd(ehci)->self);
                        if (retval) {
-                               usb_put_transceiver(ehci->transceiver);
+                               usb_put_phy(ehci->transceiver);
                                goto err4;
                        }
                } else {
@@ -194,7 +194,7 @@ static void usb_hcd_fsl_remove(struct usb_hcd *hcd,
 
        if (ehci->transceiver) {
                otg_set_host(ehci->transceiver->otg, NULL);
-               usb_put_transceiver(ehci->transceiver);
+               usb_put_phy(ehci->transceiver);
        }
 
        usb_remove_hcd(hcd);
index 9803a55fd5f464b600d47b02ae3c2f923060473d..7badd5db398ce2c84319e80a1102acedb6be84f9 100644 (file)
@@ -145,7 +145,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
         * powering up VBUS, mapping of registers address space and power
         * management.
         */
-       phy = usb_get_transceiver();
+       phy = usb_get_phy();
        if (!phy) {
                dev_err(&pdev->dev, "unable to find transceiver\n");
                ret = -ENODEV;
@@ -169,7 +169,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
        return 0;
 
 put_transceiver:
-       usb_put_transceiver(phy);
+       usb_put_phy(phy);
 unmap:
        iounmap(hcd->regs);
 put_hcd:
@@ -187,7 +187,7 @@ static int __devexit ehci_msm_remove(struct platform_device *pdev)
        pm_runtime_set_suspended(&pdev->dev);
 
        otg_set_host(phy->otg, NULL);
-       usb_put_transceiver(phy);
+       usb_put_phy(phy);
 
        usb_put_hcd(hcd);
 
index a936bbcff8f496cd99d23256731887ecdd42c233..24f838fe25ac1a8a62dfa9e13cd02ffac2dae15d 100644 (file)
@@ -253,7 +253,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
        ehci_mv->mode = pdata->mode;
        if (ehci_mv->mode == MV_USB_MODE_OTG) {
 #ifdef CONFIG_USB_OTG_UTILS
-               ehci_mv->otg = usb_get_transceiver();
+               ehci_mv->otg = usb_get_phy();
                if (!ehci_mv->otg) {
                        dev_err(&pdev->dev,
                                "unable to find transceiver\n");
@@ -303,7 +303,7 @@ err_set_vbus:
 #ifdef CONFIG_USB_OTG_UTILS
 err_put_transceiver:
        if (ehci_mv->otg)
-               usb_put_transceiver(ehci_mv->otg);
+               usb_put_phy(ehci_mv->otg);
 #endif
 err_disable_clk:
        mv_ehci_disable(ehci_mv);
@@ -333,7 +333,7 @@ static int mv_ehci_remove(struct platform_device *pdev)
 
        if (ehci_mv->otg) {
                otg_set_host(ehci_mv->otg->otg, NULL);
-               usb_put_transceiver(ehci_mv->otg);
+               usb_put_phy(ehci_mv->otg);
        }
 
        if (ehci_mv->mode == MV_USB_MODE_HOST) {
index 68548236ec4228ceb224d69845daba6345bf9971..ee17d19b1b824f23957357e3c5c17ee5dba9cdf8 100644 (file)
@@ -749,7 +749,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_USB_OTG_UTILS
        if (pdata->operating_mode == TEGRA_USB_OTG) {
-               tegra->transceiver = usb_get_transceiver();
+               tegra->transceiver = usb_get_phy();
                if (tegra->transceiver)
                        otg_set_host(tegra->transceiver->otg, &hcd->self);
        }
@@ -775,7 +775,7 @@ fail:
 #ifdef CONFIG_USB_OTG_UTILS
        if (tegra->transceiver) {
                otg_set_host(tegra->transceiver->otg, NULL);
-               usb_put_transceiver(tegra->transceiver);
+               usb_put_phy(tegra->transceiver);
        }
 #endif
        tegra_usb_phy_close(tegra->phy);
@@ -810,7 +810,7 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 #ifdef CONFIG_USB_OTG_UTILS
        if (tegra->transceiver) {
                otg_set_host(tegra->transceiver->otg, NULL);
-               usb_put_transceiver(tegra->transceiver);
+               usb_put_phy(tegra->transceiver);
        }
 #endif
 
index 9ce35d0d9d5daad531209e6b651a1fcc714efb18..c2c1f55889a4a6e18e5605a24f0cef432d9408ed 100644 (file)
@@ -211,14 +211,14 @@ static int ohci_omap_init(struct usb_hcd *hcd)
 
 #ifdef CONFIG_USB_OTG
        if (need_transceiver) {
-               ohci->transceiver = usb_get_transceiver();
+               ohci->transceiver = usb_get_phy();
                if (ohci->transceiver) {
                        int     status = otg_set_host(ohci->transceiver->otg,
                                                &ohci_to_hcd(ohci)->self);
                        dev_dbg(hcd->self.controller, "init %s transceiver, status %d\n",
                                        ohci->transceiver->label, status);
                        if (status) {
-                               usb_put_transceiver(ohci->transceiver);
+                               usb_put_phy(ohci->transceiver);
                                return status;
                        }
                } else {
@@ -405,7 +405,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);
-               usb_put_transceiver(ohci->transceiver);
+               usb_put_phy(ohci->transceiver);
        }
        if (machine_is_omap_osk())
                gpio_free(9);
index 9f3eda91ea4ddd980a8a7465d319e53ae30c19f4..a75989bbb3d48e8e2a25175d425d6a8290a08282 100644 (file)
@@ -364,7 +364,7 @@ static int am35x_musb_init(struct musb *musb)
                return -ENODEV;
 
        usb_nop_xceiv_register();
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv)
                return -ENODEV;
 
@@ -406,7 +406,7 @@ static int am35x_musb_exit(struct musb *musb)
        if (data->set_phy_power)
                data->set_phy_power(0);
 
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
        usb_nop_xceiv_unregister();
 
        return 0;
index a087ed6c3be9433c9e761bdb5f8b84374e62a853..522a4a263df80c98a40a6c3e443d2d74215880b1 100644 (file)
@@ -415,7 +415,7 @@ static int bfin_musb_init(struct musb *musb)
        gpio_direction_output(musb->config->gpio_vrsel, 0);
 
        usb_nop_xceiv_register();
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv) {
                gpio_free(musb->config->gpio_vrsel);
                return -ENODEV;
@@ -440,7 +440,7 @@ static int bfin_musb_exit(struct musb *musb)
 {
        gpio_free(musb->config->gpio_vrsel);
 
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
        usb_nop_xceiv_unregister();
        return 0;
 }
index 8bd9566f3fbb0dc35968fe5b83d3be219662a730..61868d604b2812f6212eb883d571b087658247d8 100644 (file)
@@ -425,7 +425,7 @@ static int da8xx_musb_init(struct musb *musb)
                goto fail;
 
        usb_nop_xceiv_register();
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv)
                goto fail;
 
@@ -458,7 +458,7 @@ static int da8xx_musb_exit(struct musb *musb)
 
        phy_off();
 
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
        usb_nop_xceiv_unregister();
 
        return 0;
index 768b4b55c816a6960733f73d7e0d7b86be54697f..441f776366f34c30f7cfcd038574ab58c273a0b3 100644 (file)
@@ -384,7 +384,7 @@ static int davinci_musb_init(struct musb *musb)
        u32             revision;
 
        usb_nop_xceiv_register();
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv)
                goto unregister;
 
@@ -443,7 +443,7 @@ static int davinci_musb_init(struct musb *musb)
        return 0;
 
 fail:
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
 unregister:
        usb_nop_xceiv_unregister();
        return -ENODEV;
@@ -493,7 +493,7 @@ static int davinci_musb_exit(struct musb *musb)
 
        phy_off();
 
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
        usb_nop_xceiv_unregister();
 
        return 0;
index db3dff854b715f2bf781846962db45caefe26487..26f1befb489677a7d214bcb90b26bf1775f67733 100644 (file)
@@ -1909,7 +1909,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
        /* The musb_platform_init() call:
         *   - adjusts musb->mregs and musb->isr if needed,
         *   - may initialize an integrated tranceiver
-        *   - initializes musb->xceiv, usually by otg_get_transceiver()
+        *   - initializes musb->xceiv, usually by otg_get_phy()
         *   - stops powering VBUS
         *
         * There are various transceiver configurations.  Blackfin,
index 23db42db761a5de85a91e23efabe7ae53cfebaa2..716c113608f40dd22180f2ac7410d8600ea0a3d2 100644 (file)
@@ -376,7 +376,7 @@ static int dsps_musb_init(struct musb *musb)
 
        /* NOP driver needs change if supporting dual instance */
        usb_nop_xceiv_register();
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv)
                return -ENODEV;
 
@@ -409,7 +409,7 @@ static int dsps_musb_init(struct musb *musb)
 
        return 0;
 err0:
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
        usb_nop_xceiv_unregister();
        return status;
 }
@@ -430,7 +430,7 @@ static int dsps_musb_exit(struct musb *musb)
                data->set_phy_power(0);
 
        /* NOP driver needs change if supporting dual instance */
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
        usb_nop_xceiv_unregister();
 
        return 0;
index c7785e81254cdf96eef46f352ee134fc8ca759aa..e16dbbf7f30536a143de71f6f290f378ebcd32d5 100644 (file)
@@ -292,7 +292,7 @@ static int omap2430_musb_init(struct musb *musb)
         * up through ULPI.  TWL4030-family PMICs include one,
         * which needs a driver, drivers aren't always needed.
         */
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv) {
                pr_err("HS USB OTG: no transceiver configured\n");
                return -ENODEV;
@@ -391,7 +391,7 @@ static int omap2430_musb_exit(struct musb *musb)
        cancel_work_sync(&musb->otg_notifier_work);
 
        omap2430_low_level_exit(musb);
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
 
        return 0;
 }
index de1355946a83a850a5df01bbb9e42e36320cf7c8..a004736186f1764062af1b36160262492ac12540 100644 (file)
@@ -1078,7 +1078,7 @@ static int tusb_musb_init(struct musb *musb)
        int                     ret;
 
        usb_nop_xceiv_register();
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv)
                return -ENODEV;
 
@@ -1130,7 +1130,7 @@ done:
                if (sync)
                        iounmap(sync);
 
-               usb_put_transceiver(musb->xceiv);
+               usb_put_phy(musb->xceiv);
                usb_nop_xceiv_unregister();
        }
        return ret;
@@ -1146,7 +1146,7 @@ static int tusb_musb_exit(struct musb *musb)
 
        iounmap(musb->sync_va);
 
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
        usb_nop_xceiv_unregister();
        return 0;
 }
index aa09dd417b9465662764943d49ed84b37070d369..53006b113b12c64166bb93c1606f8e65d225904b 100644 (file)
@@ -37,7 +37,7 @@ struct ux500_glue {
 
 static int ux500_musb_init(struct musb *musb)
 {
-       musb->xceiv = usb_get_transceiver();
+       musb->xceiv = usb_get_phy();
        if (!musb->xceiv) {
                pr_err("HS USB OTG: no transceiver configured\n");
                return -ENODEV;
@@ -48,7 +48,7 @@ static int ux500_musb_init(struct musb *musb)
 
 static int ux500_musb_exit(struct musb *musb)
 {
-       usb_put_transceiver(musb->xceiv);
+       usb_put_phy(musb->xceiv);
 
        return 0;
 }
index a84af677dc5941387dfc0d3805a5444fe21d0243..672e28c8143769a3c95f6c3b48ca6ad9a74f3d92 100644 (file)
@@ -529,7 +529,7 @@ static int __devinit ab8500_usb_probe(struct platform_device *pdev)
        if (err < 0)
                goto fail0;
 
-       err = usb_set_transceiver(&ab->phy);
+       err = usb_add_phy(&ab->phy);
        if (err) {
                dev_err(&pdev->dev, "Can't register transceiver\n");
                goto fail1;
@@ -556,7 +556,7 @@ static int __devexit ab8500_usb_remove(struct platform_device *pdev)
 
        cancel_work_sync(&ab->phy_dis_work);
 
-       usb_set_transceiver(NULL);
+       usb_add_phy(NULL);
 
        ab8500_usb_host_phy_dis(ab);
        ab8500_usb_peri_phy_dis(ab);
index be4a63e8302f17a0e4bc6fba6fc0ab408a2efb1f..73561edd81dea431a6ad470793af14045636849a 100644 (file)
@@ -806,7 +806,7 @@ static int fsl_otg_conf(struct platform_device *pdev)
        fsl_otg_dev = fsl_otg_tc;
 
        /* Store the otg transceiver */
-       status = usb_set_transceiver(&fsl_otg_tc->phy);
+       status = usb_add_phy(&fsl_otg_tc->phy);
        if (status) {
                pr_warn(FSL_OTG_NAME ": unable to register OTG transceiver.\n");
                goto err;
@@ -824,7 +824,7 @@ err:
 int usb_otg_start(struct platform_device *pdev)
 {
        struct fsl_otg *p_otg;
-       struct usb_phy *otg_trans = usb_get_transceiver();
+       struct usb_phy *otg_trans = usb_get_phy();
        struct otg_fsm *fsm;
        int status;
        struct resource *res;
@@ -1134,7 +1134,7 @@ static int __devexit fsl_otg_remove(struct platform_device *pdev)
 {
        struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
 
-       usb_set_transceiver(NULL);
+       usb_add_phy(NULL);
        free_irq(fsl_otg_dev->irq, fsl_otg_dev);
 
        iounmap((void *)usb_dr_regs);
index bde6298a9693aa01f15f218bac544b252082ee3e..9b3c264cdb567c1e099272b79168e882fa285195 100644 (file)
@@ -320,7 +320,7 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
        }
 
        /* only active when a gadget is registered */
-       err = usb_set_transceiver(&gpio_vbus->phy);
+       err = usb_add_phy(&gpio_vbus->phy);
        if (err) {
                dev_err(&pdev->dev, "can't register transceiver, err: %d\n",
                        err);
@@ -354,7 +354,7 @@ static int __exit gpio_vbus_remove(struct platform_device *pdev)
        cancel_delayed_work_sync(&gpio_vbus->work);
        regulator_put(gpio_vbus->vbus_draw);
 
-       usb_set_transceiver(NULL);
+       usb_add_phy(NULL);
 
        free_irq(gpio_vbus->irq, pdev);
        if (gpio_is_valid(pdata->gpio_pullup))
index 33cd709b084e286acd12992d3ca97d5a915e756f..b74df3fec56f863990ef8dd44a2d25bd4083d539 100644 (file)
@@ -1611,7 +1611,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
        dev_dbg(&i2c->dev, "scheduled timer, %d min\n", TIMER_MINUTES);
 #endif
 
-       status = usb_set_transceiver(&isp->phy);
+       status = usb_add_phy(&isp->phy);
        if (status < 0)
                dev_err(&i2c->dev, "can't register transceiver, %d\n",
                        status);
@@ -1650,7 +1650,7 @@ subsys_initcall(isp_init);
 static void __exit isp_exit(void)
 {
        if (the_transceiver)
-               usb_set_transceiver(NULL);
+               usb_add_phy(NULL);
        i2c_del_driver(&isp1301_driver);
 }
 module_exit(isp_exit);
index 1d0347c247d184c42548b30d3fc8c3496296b819..dd606c0100356f923e90ecd17290a3b34fab24a9 100644 (file)
@@ -1555,9 +1555,9 @@ static int __init msm_otg_probe(struct platform_device *pdev)
        phy->otg->set_host = msm_otg_set_host;
        phy->otg->set_peripheral = msm_otg_set_peripheral;
 
-       ret = usb_set_transceiver(&motg->phy);
+       ret = usb_add_phy(&motg->phy);
        if (ret) {
-               dev_err(&pdev->dev, "usb_set_transceiver failed\n");
+               dev_err(&pdev->dev, "usb_add_phy failed\n");
                goto free_irq;
        }
 
@@ -1624,7 +1624,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 0);
        pm_runtime_disable(&pdev->dev);
 
-       usb_set_transceiver(NULL);
+       usb_add_phy(NULL);
        free_irq(motg->irq, motg);
 
        /*
index 6cc6c3ffbb83d6b4f2f8b036da714a7dbb0b1f42..18e90fe1fbd162f2516ae64337320fbbdc141f99 100644 (file)
@@ -690,7 +690,7 @@ int mv_otg_remove(struct platform_device *pdev)
        for (clk_i = 0; clk_i <= mvotg->clknum; clk_i++)
                clk_put(mvotg->clk[clk_i]);
 
-       usb_set_transceiver(NULL);
+       usb_add_phy(NULL);
        platform_set_drvdata(pdev, NULL);
 
        kfree(mvotg->phy.otg);
@@ -853,7 +853,7 @@ static int mv_otg_probe(struct platform_device *pdev)
                goto err_disable_clk;
        }
 
-       retval = usb_set_transceiver(&mvotg->phy);
+       retval = usb_add_phy(&mvotg->phy);
        if (retval < 0) {
                dev_err(&pdev->dev, "can't register transceiver, %d\n",
                        retval);
@@ -880,7 +880,7 @@ static int mv_otg_probe(struct platform_device *pdev)
        return 0;
 
 err_set_transceiver:
-       usb_set_transceiver(NULL);
+       usb_add_phy(NULL);
 err_free_irq:
        free_irq(mvotg->irq, mvotg);
 err_disable_clk:
index 58b26df6afd1b3a457f2f1897b3c43d176a6e42c..33000dae7200d339b7904a4651188ea5d64d1c1d 100644 (file)
@@ -117,7 +117,7 @@ static int __devinit nop_usb_xceiv_probe(struct platform_device *pdev)
        nop->phy.otg->set_host          = nop_set_host;
        nop->phy.otg->set_peripheral    = nop_set_peripheral;
 
-       err = usb_set_transceiver(&nop->phy);
+       err = usb_add_phy(&nop->phy);
        if (err) {
                dev_err(&pdev->dev, "can't register transceiver, err: %d\n",
                        err);
@@ -139,7 +139,7 @@ static int __devexit nop_usb_xceiv_remove(struct platform_device *pdev)
 {
        struct nop_usb_xceiv *nop = platform_get_drvdata(pdev);
 
-       usb_set_transceiver(NULL);
+       usb_add_phy(NULL);
 
        platform_set_drvdata(pdev, NULL);
        kfree(nop->phy.otg);
index 801e597a15413ece58964805e494c959315b26a1..300a995cfdbec36398b7de7eda545ae32aa9c55e 100644 (file)
 static struct usb_phy *phy;
 
 /**
- * usb_get_transceiver - find the (single) USB transceiver
+ * usb_get_phy - find the (single) USB PHY
  *
- * Returns the transceiver driver, after getting a refcount to it; or
- * null if there is no such transceiver.  The caller is responsible for
- * calling usb_put_transceiver() to release that count.
+ * Returns the phy driver, after getting a refcount to it; or
+ * null if there is no such phy.  The caller is responsible for
+ * calling usb_put_phy() to release that count.
  *
  * For use by USB host and peripheral drivers.
  */
-struct usb_phy *usb_get_transceiver(void)
+struct usb_phy *usb_get_phy(void)
 {
        if (phy)
                get_device(phy->dev);
        return phy;
 }
-EXPORT_SYMBOL(usb_get_transceiver);
+EXPORT_SYMBOL(usb_get_phy);
 
 /**
- * usb_put_transceiver - release the (single) USB transceiver
- * @x: the transceiver returned by usb_get_transceiver()
+ * usb_put_phy - release the (single) USB PHY
+ * @x: the phy returned by usb_get_phy()
  *
- * Releases a refcount the caller received from usb_get_transceiver().
+ * Releases a refcount the caller received from usb_get_phy().
  *
  * For use by USB host and peripheral drivers.
  */
-void usb_put_transceiver(struct usb_phy *x)
+void usb_put_phy(struct usb_phy *x)
 {
        if (x)
                put_device(x->dev);
 }
-EXPORT_SYMBOL(usb_put_transceiver);
+EXPORT_SYMBOL(usb_put_phy);
 
 /**
- * usb_set_transceiver - declare the (single) USB transceiver
- * @x: the USB transceiver to be used; or NULL
+ * usb_add_phy - declare the (single) USB PHY
+ * @x: the USB phy to be used; or NULL
  *
- * This call is exclusively for use by transceiver drivers, which
+ * This call is exclusively for use by phy drivers, which
  * coordinate the activities of drivers for host and peripheral
  * controllers, and in some cases for VBUS current regulation.
  */
-int usb_set_transceiver(struct usb_phy *x)
+int usb_add_phy(struct usb_phy *x)
 {
        if (phy && x)
                return -EBUSY;
        phy = x;
        return 0;
 }
-EXPORT_SYMBOL(usb_set_transceiver);
+EXPORT_SYMBOL(usb_add_phy);
 
 const char *otg_state_string(enum usb_otg_state state)
 {
index 02979306bf83c3bf11e7005ebdb6562bc9dd4166..01022c891e2600eb08dc0289abf8d26a3521d2c8 100644 (file)
@@ -633,7 +633,7 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
                kfree(twl);
                return err;
        }
-       usb_set_transceiver(&twl->phy);
+       usb_add_phy(&twl->phy);
 
        platform_set_drvdata(pdev, twl);
        if (device_create_file(&pdev->dev, &dev_attr_vbus))
index d2a9a8e691b9dd47ea6dbeca37c870e028d5dd1e..a8be20878eb9796c8dadf5b106bb68258e5dab34 100644 (file)
@@ -443,7 +443,7 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
                kfree(twl);
                return err;
        }
-       usb_set_transceiver(&twl->phy);
+       usb_add_phy(&twl->phy);
 
        platform_set_drvdata(pdev, twl);
        if (device_create_file(&pdev->dev, &dev_attr_vbus))
index 38ab3f46346ff4852eabc4e0bbfc3fc2d5e2e793..0e739c8105258d6383ce4c24d504d40bdadaf29a 100644 (file)
@@ -121,7 +121,7 @@ struct usb_phy {
 
 
 /* for board-specific init logic */
-extern int usb_set_transceiver(struct usb_phy *);
+extern int usb_add_phy(struct usb_phy *);
 
 #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
 /* sometimes transceivers are accessed only through e.g. ULPI */
@@ -172,16 +172,16 @@ usb_phy_shutdown(struct usb_phy *x)
 
 /* for usb host and peripheral controller drivers */
 #ifdef CONFIG_USB_OTG_UTILS
-extern struct usb_phy *usb_get_transceiver(void);
-extern void usb_put_transceiver(struct usb_phy *);
+extern struct usb_phy *usb_get_phy(void);
+extern void usb_put_phy(struct usb_phy *);
 extern const char *otg_state_string(enum usb_otg_state state);
 #else
-static inline struct usb_phy *usb_get_transceiver(void)
+static inline struct usb_phy *usb_get_phy(void)
 {
        return NULL;
 }
 
-static inline void usb_put_transceiver(struct usb_phy *x)
+static inline void usb_put_phy(struct usb_phy *x)
 {
 }