usb: ehci: marvel: check against CONFIG_USB_PHY
authorFelipe Balbi <balbi@ti.com>
Thu, 7 Mar 2013 09:24:32 +0000 (11:24 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 18 Mar 2013 09:18:06 +0000 (11:18 +0200)
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>
drivers/usb/host/ehci-mv.c

index 3065809546b159c1966b87f5fe4cdc6c333bc3da..9751823395e1c31e4f891d7a085c40886578a74c 100644 (file)
@@ -240,7 +240,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
+#if IS_ENABLED(CONFIG_USB_PHY)
                ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
                if (IS_ERR_OR_NULL(ehci_mv->otg)) {
                        dev_err(&pdev->dev,
@@ -260,7 +260,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
                mv_ehci_disable(ehci_mv);
 #else
                dev_info(&pdev->dev, "MV_USB_MODE_OTG "
-                        "must have CONFIG_USB_OTG_UTILS enabled\n");
+                        "must have CONFIG_USB_PHY enabled\n");
                goto err_disable_clk;
 #endif
        } else {