From: Felipe Balbi <balbi@ti.com>
To: Linux USB Mailing List <linux-usb@vger.kernel.org>
Cc: Greg KH <greg@kroah.com>,
Sergei Shtylyov <sshtylyov@ru.mvista.com>,
Anand Gadiyar <gadiyar@ti.com>, Hema Kalliguddi <hemahk@ti.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Tony Lindgren <tony@atomide.com>, Felipe Balbi <balbi@ti.com>
Subject: [patch v2.6.39 1/3] usb: musb: do not error out if Kconfig doesn't match board mode
Date: Thu, 17 Feb 2011 13:30:19 +0200 [thread overview]
Message-ID: <1297942221-22995-2-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1297942221-22995-1-git-send-email-balbi@ti.com>
During development, even though board is wired
to e.g. OTG, we might want to compile host-only
or peripheral-only configurations.
Let's allow that to happen.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/usb/musb/musb_core.c | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 54a8bd1..bc29655 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1949,31 +1949,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
goto fail0;
}
- switch (plat->mode) {
- case MUSB_HOST:
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
- break;
-#else
- goto bad_config;
-#endif
- case MUSB_PERIPHERAL:
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
- break;
-#else
- goto bad_config;
-#endif
- case MUSB_OTG:
-#ifdef CONFIG_USB_MUSB_OTG
- break;
-#else
-bad_config:
-#endif
- default:
- dev_err(dev, "incompatible Kconfig role setting\n");
- status = -EINVAL;
- goto fail0;
- }
-
/* allocate */
musb = allocate_instance(dev, plat->config, ctrl);
if (!musb) {
--
1.7.4.rc2
next prev parent reply other threads:[~2011-02-17 11:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 11:30 [patch v2.6.39 0/3] Patches for next merge window Felipe Balbi
2011-02-17 11:30 ` Felipe Balbi [this message]
2011-02-17 11:30 ` [patch v2.6.39 2/3] usb: musb: gadget: beautify usb_gadget_probe_driver()/usb_gadget_unregister_driver Felipe Balbi
[not found] ` <1297942221-22995-3-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
2011-02-17 13:00 ` Sergei Shtylyov
2011-02-17 13:15 ` Felipe Balbi
2011-02-17 15:23 ` Felipe Balbi
[not found] ` <1297942221-22995-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
2011-02-17 11:30 ` [patch v2.6.39 3/3] usb: musb: gadget: do not poke with gadget's list_head 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=1297942221-22995-2-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=gadiyar@ti.com \
--cc=greg@kroah.com \
--cc=hemahk@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sshtylyov@ru.mvista.com \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.