From patchwork Wed Jan 29 23:10:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 3555061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6702F9F2E9 for ; Wed, 29 Jan 2014 23:10:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FE4A20160 for ; Wed, 29 Jan 2014 23:10:08 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A4BFC2015E for ; Wed, 29 Jan 2014 23:10:07 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W8eGJ-0006jy-G7; Wed, 29 Jan 2014 23:09:39 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W8eGB-0004k5-6H; Wed, 29 Jan 2014 23:09:31 +0000 Received: from mail-pd0-x22a.google.com ([2607:f8b0:400e:c02::22a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W8eG2-0004hz-Vk for linux-arm-kernel@lists.infradead.org; Wed, 29 Jan 2014 23:09:24 +0000 Received: by mail-pd0-f170.google.com with SMTP id p10so2291353pdj.15 for ; Wed, 29 Jan 2014 15:09:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=92ZVKd6YawF+BVQ7AP+uB2nbxaWXvxrIDvekgIDi5aM=; b=m3ArTsx0duC3trPwdFWD6Z5MPEaOXZeea+l73X+CZAbTNNIjOr7IhAwcfmSl4/cvKq Zt8p4mWm2TbLkg8j8/cnSKU86uCTDCeJKGmrJLTf0Aswmow3SacSPmTCYC2+6qrlVc7P ndvGTQoUYR3h9L5W20ao8qVjGOVjhdQwd2A+YjNyqNXDrtDWp7h0C4SBSQRPb+DcuSsD U1ejNGIUVxEsTQQnZdR2A5I15Lw3IS6k1bHrTG02jFUt1n3+GkU6f9c4ofGPFH7pnbDg MQpFSy9y1oc9TAvPKOd2Yz2T7u8eH5V2OZsvjYO0CJqAs5lDAGmrRwhJy0XGe74/pSVb +Edw== X-Received: by 10.66.141.231 with SMTP id rr7mr10476313pab.41.1391036941392; Wed, 29 Jan 2014 15:09:01 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id xs1sm26839711pac.7.2014.01.29.15.08.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2014 15:08:59 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Thu, 30 Jan 2014 08:10:09 +0900 Message-Id: <20140129231009.22655.45084.sendpatchset@w520> In-Reply-To: <20140129230959.22655.55645.sendpatchset@w520> References: <20140129230959.22655.55645.sendpatchset@w520> Subject: [PATCH 01/03] ARM: shmobile: Remove Lager USBHS UDC ifdefs X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140129_180923_184202_94F50929 X-CRM114-Status: UNSURE ( 9.36 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: horms@verge.net.au, Magnus Damm , valentine.barshak@cogentembedded.com, ben.dooks@codethink.co.uk, laurent.pinchart@ideasonboard.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Remove ifdefs to make the Lager USBHS device always present. This makes it more like other devices, no need to be special. Also, these ifdefs by themselves do not hurt much, but combined with USB Host device ifdefs that were proposed earlier we could basically end up with a kernel that drives VBUS incorrectly depending on the kernel configuration - lets not do that. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-lager.c | 4 ---- 1 file changed, 4 deletions(-) --- 0003/arch/arm/mach-shmobile/board-lager.c +++ work/arch/arm/mach-shmobile/board-lager.c 2014-01-24 10:16:15.000000000 +0900 @@ -368,7 +368,6 @@ static const struct platform_device_info }; /* USBHS */ -#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC) static const struct resource usbhs_resources[] __initconst = { DEFINE_RES_MEM(0xe6590000, 0x100), DEFINE_RES_IRQ(gic_spi(107)), @@ -478,9 +477,6 @@ static void __init lager_register_usbhs( &usbhs_priv.info, sizeof(usbhs_priv.info)); } -#else /* CONFIG_USB_RENESAS_USBHS_UDC */ -static inline void lager_register_usbhs(void) { } -#endif /* CONFIG_USB_RENESAS_USBHS_UDC */ /* USBHS PHY */ static const struct rcar_gen2_phy_platform_data usbhs_phy_pdata __initconst = {