diff options
author | Felipe Balbi <balbi@ti.com> | 2013-03-07 04:24:58 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-03-18 05:18:07 -0400 |
commit | a948712d2a064be5f928f37d137e9d14b48cc94f (patch) | |
tree | 5899139e29993aa26924c5e34c182391126c9d9a | |
parent | fcd12b9711816e7cb0a3eb1b47790979e4c14c58 (diff) |
usb: ehci: tegra: check against CONFIG_USB_PHY
CONFIG_USB_OTG_UTILS will be removed very
soon, so we should check CONFIG_USB_PHY
instead.
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/host/ehci-tegra.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 568aecc7075b..fafbc819ab18 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c | |||
@@ -768,7 +768,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) | |||
768 | goto fail; | 768 | goto fail; |
769 | } | 769 | } |
770 | 770 | ||
771 | #ifdef CONFIG_USB_OTG_UTILS | 771 | #if IS_ENABLED(CONFIG_USB_PHY) |
772 | if (pdata->operating_mode == TEGRA_USB_OTG) { | 772 | if (pdata->operating_mode == TEGRA_USB_OTG) { |
773 | tegra->transceiver = | 773 | tegra->transceiver = |
774 | devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); | 774 | devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); |
@@ -794,7 +794,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) | |||
794 | return err; | 794 | return err; |
795 | 795 | ||
796 | fail: | 796 | fail: |
797 | #ifdef CONFIG_USB_OTG_UTILS | 797 | #if IS_ENABLED(CONFIG_USB_PHY) |
798 | if (!IS_ERR_OR_NULL(tegra->transceiver)) | 798 | if (!IS_ERR_OR_NULL(tegra->transceiver)) |
799 | otg_set_host(tegra->transceiver->otg, NULL); | 799 | otg_set_host(tegra->transceiver->otg, NULL); |
800 | #endif | 800 | #endif |
@@ -815,7 +815,7 @@ static int tegra_ehci_remove(struct platform_device *pdev) | |||
815 | pm_runtime_disable(&pdev->dev); | 815 | pm_runtime_disable(&pdev->dev); |
816 | pm_runtime_put_noidle(&pdev->dev); | 816 | pm_runtime_put_noidle(&pdev->dev); |
817 | 817 | ||
818 | #ifdef CONFIG_USB_OTG_UTILS | 818 | #if IS_ENABLED(CONFIG_USB_PHY) |
819 | if (!IS_ERR_OR_NULL(tegra->transceiver)) | 819 | if (!IS_ERR_OR_NULL(tegra->transceiver)) |
820 | otg_set_host(tegra->transceiver->otg, NULL); | 820 | otg_set_host(tegra->transceiver->otg, NULL); |
821 | #endif | 821 | #endif |