From patchwork Fri May 16 12:29:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 4190861 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 AE21A9F387 for ; Fri, 16 May 2014 12:29:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF0D820295 for ; Fri, 16 May 2014 12:29:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D886620272 for ; Fri, 16 May 2014 12:29:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754454AbaEPM3T (ORCPT ); Fri, 16 May 2014 08:29:19 -0400 Received: from cpsmtpb-ews04.kpnxchange.com ([213.75.39.7]:57086 "EHLO cpsmtpb-ews04.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751004AbaEPM3S (ORCPT ); Fri, 16 May 2014 08:29:18 -0400 Received: from cpsps-ews13.kpnxchange.com ([10.94.84.180]) by cpsmtpb-ews04.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 16 May 2014 14:29:16 +0200 Received: from CPSMTPM-TLF104.kpnxchange.com ([195.121.3.7]) by cpsps-ews13.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 16 May 2014 14:29:16 +0200 Received: from [192.168.10.106] ([195.240.213.44]) by CPSMTPM-TLF104.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 16 May 2014 14:29:15 +0200 Message-ID: <1400243355.20342.43.camel@x220> Subject: [PATCH] ARM: S3C24XX: check for 'CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710' From: Paul Bolle To: Ben Dooks , Kukjin Kim , Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 16 May 2014 14:29:15 +0200 X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 16 May 2014 12:29:16.0021 (UTC) FILETIME=[73976A50:01CF7102] X-RcptDomain: vger.kernel.org Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Since v2.6.34 there are two checks for CONFIG_SND_SOC_SMDK2443_WM9710. But a Kconfig symbol SND_SOC_SMDK2443_WM9710 has never been part of the tree. However, in v2.6.38 a symbol SND_SOC_SAMSUNG_SMDK2443_WM9710 was added, so it seems these checks should be for its macro. But the second check is a guard for s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0); And since neither s3c24xx_ac97_setup_gpio nor S3C24XX_AC97_GPE0 are defined anywhere, that second check can be dropped entirely. Signed-off-by: Paul Bolle --- Tested with git grep. Needs further testing, obviously. arch/arm/mach-s3c24xx/mach-smdk2443.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/mach-s3c24xx/mach-smdk2443.c b/arch/arm/mach-s3c24xx/mach-smdk2443.c index 06c4d77de3a5..ce842189bc64 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2443.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c @@ -112,7 +112,7 @@ static struct platform_device *smdk2443_devices[] __initdata = { &s3c_device_wdt, &s3c_device_i2c0, &s3c_device_hsmmc1, -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710 +#ifdef CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710 &s3c_device_ac97, #endif &s3c2443_device_dma, @@ -130,10 +130,6 @@ static void __init smdk2443_machine_init(void) { s3c_i2c0_set_platdata(NULL); -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710 - s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0); -#endif - platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices)); smdk_machine_init(); }