From patchwork Thu May 15 10:17:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 4180891 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7894BFF02 for ; Thu, 15 May 2014 10:18:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD11420381 for ; Thu, 15 May 2014 10:18:13 +0000 (UTC) Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B61CE2034B for ; Thu, 15 May 2014 10:18:12 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s4FAHEdT012142; Thu, 15 May 2014 05:17:14 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4FAHDZS012768; Thu, 15 May 2014 05:17:13 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Thu, 15 May 2014 05:17:12 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4FAHBo6017748; Thu, 15 May 2014 05:17:11 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id A62C680627; Thu, 15 May 2014 05:17:11 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv84.itg.ti.com (dlelxv84.itg.ti.com [172.17.0.246]) by linux.omap.com (Postfix) with ESMTP id B874380626 for ; Thu, 15 May 2014 05:17:07 -0500 (CDT) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dlelxv84.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4FAH70D028560 for ; Thu, 15 May 2014 05:17:07 -0500 Received: from mail6.bemta8.messagelabs.com (mail6.bemta8.messagelabs.com [216.82.243.55]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id s4FAH7i5021687 for ; Thu, 15 May 2014 05:17:07 -0500 Received: from [216.82.242.131:16041] by server-13.bemta-8.messagelabs.com id 8A/44-14006-32494735; Thu, 15 May 2014 10:17:07 +0000 X-Env-Sender: pebolle@tiscali.nl X-Msg-Ref: server-6.tower-76.messagelabs.com!1400149025!28026910!1 X-Originating-IP: [213.75.39.15] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjEzLjc1LjM5LjE1ID0+IDY1OTY2NA==\n, ML_RADAR_SPEW_LINKS_14,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9607 invoked from network); 15 May 2014 10:17:06 -0000 Received: from cpsmtpb-ews10.kpnxchange.com (HELO cpsmtpb-ews10.kpnxchange.com) (213.75.39.15) by server-6.tower-76.messagelabs.com with SMTP; 15 May 2014 10:17:06 -0000 Received: from cpsps-ews03.kpnxchange.com ([10.94.84.170]) by cpsmtpb-ews10.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 12:17:05 +0200 Received: from CPSMTPM-TLF101.kpnxchange.com ([195.121.3.4]) by cpsps-ews03.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 12:17:05 +0200 Received: from [192.168.10.106] ([195.240.213.44]) by CPSMTPM-TLF101.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 12:17:05 +0200 Message-ID: <1400149025.20469.22.camel@x220> Subject: [PATCH] ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL From: Paul Bolle To: Sekhar Nori , Kevin Hilman , Russell King Date: Thu, 15 May 2014 12:17:05 +0200 X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) MIME-Version: 1.0 X-OriginalArrivalTime: 15 May 2014 10:17:05.0665 (UTC) FILETIME=[D2515F10:01CF7026] X-RcptDomain: linux.davincidsp.com CC: Greg Kroah-Hartman , , , Felipe Balbi , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=ham 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 The Kconfig symbol USB_MUSB_PERIPHERAL was removed in v3.1. The last two checks for its macro now always evaluate to false. So remove these checks. Signed-off-by: Paul Bolle Acked-by: Felipe Balbi --- Eyeball tested only. This is just a straightforward cleanup. It does remove a comment. Is that comment still useful? Anyhow, I do wonder whether a proper fix is possible here. Perhaps Greg or Felipe knows: it is their commit 622859634a66 ("usb: musb: drop a gigantic amount of ifdeferry") that removed USB_MUSB_PERIPHERAL. On the other hand I noticed that config USB_MUSB_DAVINCI depends on BROKEN. So maybe properly fixing just this small problem doesn't buy us much. arch/arm/mach-davinci/board-dm355-evm.c | 4 ---- arch/arm/mach-davinci/board-dm355-leopard.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index ecdc7d44fa70..06d63d5651f3 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -350,11 +350,7 @@ static struct davinci_mmc_config dm355evm_mmc_config = { * you have proper Mini-B or Mini-A cables (or Mini-A adapters) * the ID pin won't need any help. */ -#ifdef CONFIG_USB_MUSB_PERIPHERAL -#define USB_ID_VALUE 0 /* ID pulled high; *should* float */ -#else #define USB_ID_VALUE 1 /* ID pulled low */ -#endif static struct spi_eeprom at25640a = { .byte_len = SZ_64K / 8, diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index 43bacbf15314..680a7a2d9102 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c @@ -208,11 +208,7 @@ static struct davinci_mmc_config dm355leopard_mmc_config = { * you have proper Mini-B or Mini-A cables (or Mini-A adapters) * the ID pin won't need any help. */ -#ifdef CONFIG_USB_MUSB_PERIPHERAL -#define USB_ID_VALUE 0 /* ID pulled high; *should* float */ -#else #define USB_ID_VALUE 1 /* ID pulled low */ -#endif static struct spi_eeprom at25640a = { .byte_len = SZ_64K / 8,