From patchwork Thu Feb 17 11:30:19 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Felipe Balbi <balbi@ti.com>
X-Patchwork-Id: 569771
X-Patchwork-Delegate: me@felipebalbi.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1HBUb6H013118
	for <patchwork-omap@patchwork.kernel.org>;
	Thu, 17 Feb 2011 11:30:38 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755745Ab1BQLad (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 17 Feb 2011 06:30:33 -0500
Received: from na3sys009aog104.obsmtp.com ([74.125.149.73]:56085 "EHLO
	na3sys009aog104.obsmtp.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1755618Ab1BQLac (ORCPT
	<rfc822;linux-omap@vger.kernel.org>);
	Thu, 17 Feb 2011 06:30:32 -0500
Received: from source ([209.85.214.43]) (using TLSv1) by
	na3sys009aob104.postini.com ([74.125.148.12]) with SMTP
	ID DSNKTV0G1nBSg3uT2TnGQVxqMFfXXifwrhOZ@postini.com;
	Thu, 17 Feb 2011 03:30:32 PST
Received: by bwz14 with SMTP id 14so2542716bwz.30
	for <multiple recipients>; Thu, 17 Feb 2011 03:30:29 -0800 (PST)
Received: by 10.204.59.8 with SMTP id j8mr1511763bkh.26.1297942229182;
	Thu, 17 Feb 2011 03:30:29 -0800 (PST)
Received: from localhost (cs181221087.pp.htv.fi [82.181.221.87])
	by mx.google.com with ESMTPS id j11sm572027bka.12.2011.02.17.03.30.26
	(version=TLSv1/SSLv3 cipher=OTHER);
	Thu, 17 Feb 2011 03:30:28 -0800 (PST)
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
Message-Id: <1297942221-22995-2-git-send-email-balbi@ti.com>
X-Mailer: git-send-email 1.7.4.rc2
In-Reply-To: <1297942221-22995-1-git-send-email-balbi@ti.com>
References: <1297942221-22995-1-git-send-email-balbi@ti.com>
Organization: Texas Instruments\n
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Thu, 17 Feb 2011 11:30:38 +0000 (UTC)


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) {