From: <dinguyen@opensource.altera.com>
To: <paulz@synopsys.com>, <balbi@ti.com>
Cc: <dinh.linux@gmail.com>, <swarren@wwwdotorg.org>,
<b.zolnierkie@samsung.com>, <matthijs@stdin.nl>,
<r.baldyga@samsung.com>, <jg1.han@samsung.com>,
<sachin.kamat@linaro.org>, <ben-linux@fluff.org>,
<dianders@chromium.org>, <kever.yang@rock-chips.com>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Dinh Nguyen <dinguyen@opensource.altera.com>
Subject: [PATCHv6 8/8] usb: dwc2: move usb_disabled() call to host driver only
Date: Tue, 28 Oct 2014 18:25:49 -0500 [thread overview]
Message-ID: <1414538749-14735-9-git-send-email-dinguyen@opensource.altera.com> (raw)
In-Reply-To: <1414538749-14735-1-git-send-email-dinguyen@opensource.altera.com>
From: Dinh Nguyen <dinguyen@opensource.altera.com>
Now that platform.c will get built for both Host and Gadget, if we leave the
usb_disabled() call in platform.c, it results in the following build error
when (!USB && USB_GADGET) condition is met.
ERROR: "usb_disabled" [drivers/usb/dwc2/dwc2_platform.ko] undefined!
Since usb_disabled() is mostly used to disable USB host functionality, move
the call the host portion for the DWC2 driver.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
drivers/usb/dwc2/hcd.c | 3 +++
drivers/usb/dwc2/platform.c | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index fa49c72..b741997 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -2780,6 +2780,9 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
int i, num_channels;
int retval;
+ if (usb_disabled())
+ return -ENODEV;
+
dev_dbg(hsotg->dev, "DWC OTG HCD INIT\n");
/* Detect config values from hardware */
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 77c8417..123cf54 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -157,9 +157,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
int retval;
int irq;
- if (usb_disabled())
- return -ENODEV;
-
match = of_match_device(dwc2_of_match_table, &dev->dev);
if (match && match->data) {
params = match->data;
--
2.0.3
next prev parent reply other threads:[~2014-10-28 23:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 23:25 [PATCHv6 0/8] usb: dwc2: Add support for dual-role dinguyen
2014-10-28 23:25 ` [PATCHv6 1/8] usb: dwc2: Update the gadget driver to use common dwc2_hsotg structure dinguyen
2014-10-30 13:54 ` Felipe Balbi
2014-10-31 14:55 ` Dinh Nguyen
2014-10-31 2:47 ` Kever Yang
2014-10-31 13:48 ` Felipe Balbi
2014-10-28 23:25 ` [PATCHv6 2/8] usb: dwc2: Move gadget probe function into platform code dinguyen
2014-10-30 13:57 ` Felipe Balbi
2014-10-31 14:59 ` Dinh Nguyen
2014-10-28 23:25 ` [PATCHv6 3/8] usb: dwc2: Initialize the USB core for peripheral mode dinguyen
2014-10-28 23:25 ` [PATCHv6 4/8] usb: dwc2: Update common interrupt handler to call gadget interrupt handler dinguyen
2014-10-30 14:00 ` Felipe Balbi
2014-10-31 15:00 ` Dinh Nguyen
2014-10-31 20:12 ` Paul Zimmerman
2014-10-28 23:25 ` [PATCHv6 5/8] usb: dwc2: Add call_gadget functions for perpheral mode interrupts dinguyen
2014-10-30 14:01 ` Felipe Balbi
2014-10-31 15:01 ` Dinh Nguyen
2014-10-28 23:25 ` [PATCHv6 6/8] usb: dwc2: gadget: Do not fail probe if there isn't a clock node dinguyen
2014-10-29 1:30 ` Paul Zimmerman
2014-10-30 14:04 ` Felipe Balbi
2014-10-31 15:20 ` Dinh Nguyen
2014-10-31 17:42 ` Felipe Balbi
2014-10-31 19:31 ` Dinh Nguyen
2014-10-31 19:56 ` Dinh Nguyen
2014-11-03 15:25 ` Felipe Balbi
2014-10-31 2:38 ` Kever Yang
2014-10-31 13:49 ` Felipe Balbi
2014-10-28 23:25 ` [PATCHv6 7/8] usb: dwc2: Update Kconfig to support dual-role dinguyen
2014-10-28 23:25 ` dinguyen [this message]
2014-10-29 1:26 ` [PATCHv6 8/8] usb: dwc2: move usb_disabled() call to host driver only Paul Zimmerman
2014-10-29 13:35 ` Dinh Nguyen
2014-10-30 14:07 ` Felipe Balbi
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=1414538749-14735-9-git-send-email-dinguyen@opensource.altera.com \
--to=dinguyen@opensource.altera.com \
--cc=b.zolnierkie@samsung.com \
--cc=balbi@ti.com \
--cc=ben-linux@fluff.org \
--cc=dianders@chromium.org \
--cc=dinh.linux@gmail.com \
--cc=jg1.han@samsung.com \
--cc=kever.yang@rock-chips.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=matthijs@stdin.nl \
--cc=paulz@synopsys.com \
--cc=r.baldyga@samsung.com \
--cc=sachin.kamat@linaro.org \
--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
Powered by JetHome