Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a948712d authored by Felipe Balbi's avatar Felipe Balbi
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent fcd12b97

drivers/usb/host/ehci-tegra.c

+3 −3
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
		goto fail;

	}



#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

	if (pdata->operating_mode == TEGRA_USB_OTG) {

		tegra->transceiver =

			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
@@ -794,7 +794,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
	return err;



fail:

#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

	if (!IS_ERR_OR_NULL(tegra->transceiver))

		otg_set_host(tegra->transceiver->otg, NULL);

#endif
@@ -815,7 +815,7 @@ static int tegra_ehci_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

	pm_runtime_put_noidle(&pdev->dev);



#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

	if (!IS_ERR_OR_NULL(tegra->transceiver))

		otg_set_host(tegra->transceiver->otg, NULL);

#endif