Linux on ARM based TI OMAP SoCs
 help / color / mirror / Atom feed
From: Felipe Balbi <balbi@ti.com>
To: Linux USB Mailing List <linux-usb@vger.kernel.org>
Cc: Greg KH <gregkh@linuxfoundation.org>,
	cbou@mail.ru, dwmw2@infradead.org, stern@rowland.harvard.edu,
	swarren@wwwdotorg.org, arnd@arndb.de,
	linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org,
	Felipe Balbi <balbi@ti.com>
Subject: [PATCH 09/10] usb: ehci: tegra: check against CONFIG_USB_PHY
Date: Thu, 7 Mar 2013 11:36:08 +0200	[thread overview]
Message-ID: <1362648969-13737-10-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1362648969-13737-1-git-send-email-balbi@ti.com>

CONFIG_USB_OTG_UTILS will be removed very
soon, so we should check CONFIG_USB_PHY
instead.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/usb/host/ehci-tegra.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 568aecc..fafbc81 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)
 		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
-- 
1.8.1.rc1.5.g7e0651a


  parent reply	other threads:[~2013-03-07  9:36 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-07  9:35 [PATCH 00/10] usb: phy: cleanups to Kconfig and directories Felipe Balbi
2013-03-07  9:36 ` [PATCH 01/10] usb: otg: prefix otg_state_string with usb_ Felipe Balbi
2013-03-07  9:36 ` [PATCH 02/10] usb: otg: move usb_otg_state_string to usb-common.c Felipe Balbi
2013-03-07  9:36 ` [PATCH 03/10] usb: phy: convert EXPORT_SYMBOL to EXPORT_SYMBOL_GPL Felipe Balbi
2013-03-07  9:36 ` [PATCH 04/10] usb: phy: move all PHY drivers to drivers/usb/phy/ Felipe Balbi
2013-03-07  9:36 ` [PATCH 05/10] usb: phy: make it a menuconfig Felipe Balbi
2013-03-07  9:36 ` [PATCH 07/10] usb: gadget: mv_udc_core: check against CONFIG_USB_PHY Felipe Balbi
2013-03-07  9:36 ` Felipe Balbi [this message]
     [not found]   ` <1362648969-13737-10-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
2013-03-07 20:54     ` [PATCH 09/10] usb: ehci: tegra: " Stephen Warren
2013-03-08  7:10       ` Felipe Balbi
2013-03-07  9:36 ` [PATCH 10/10] usb: phy: remove CONFIG_USB_OTG_UTILS Felipe Balbi
     [not found]   ` <1362648969-13737-11-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
2013-03-07 14:41     ` [PATCH v2] " Felipe Balbi
2013-03-07 16:01 ` [PATCH 00/10] usb: phy: cleanups to Kconfig and directories Alan Stern
     [not found]   ` <Pine.LNX.4.44L0.1303071101190.1646-100000-IYeN2dnnYyZXsRXLowluHWD2FQJk+8+b@public.gmane.org>
2013-03-07 16:41     ` Felipe Balbi
     [not found] ` <1362648969-13737-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
2013-03-07  9:36   ` [PATCH 06/10] usb: power: pda_power: check against CONFIG_USB_PHY Felipe Balbi
2013-03-07  9:36   ` [PATCH 08/10] usb: ehci: marvel: " Felipe Balbi
2013-03-07 21:20   ` [PATCH 00/10] usb: phy: cleanups to Kconfig and directories Stephen Warren
     [not found]     ` <513904A4.7040101-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-03-08  7:14       ` Felipe Balbi
     [not found]         ` <20130308071453.GD21589-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2013-03-08 17:14           ` Stephen Warren
     [not found]             ` <513A1C63.9050704-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-03-08 18:26               ` Felipe Balbi
     [not found]                 ` <20130308182623.GD900-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2013-03-08 18:37                   ` Stephen Warren
     [not found]                     ` <513A2FDD.2040800-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-03-08 23:08                       ` Arnd Bergmann
     [not found]                         ` <201303082308.31499.arnd-r2nGTMty4D4@public.gmane.org>
2013-03-08 23:23                           ` Stephen Warren
     [not found]                             ` <513A72E8.2070707-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-03-08 23:56                               ` Arnd Bergmann
     [not found]                                 ` <201303082356.35033.arnd-r2nGTMty4D4@public.gmane.org>
2013-03-09  0:10                                   ` Stephen Warren
2013-03-14 11:01                     ` Felipe Balbi
     [not found]                       ` <20130314110129.GI32369-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2013-03-15 20:50                         ` Stephen Warren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1362648969-13737-10-git-send-email-balbi@ti.com \
    --to=balbi@ti.com \
    --cc=arnd@arndb.de \
    --cc=cbou@mail.ru \
    --cc=dwmw2@infradead.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stern@rowland.harvard.edu \
    --cc=swarren@wwwdotorg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox