From patchwork Wed Dec 17 15:40:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hengelein X-Patchwork-Id: 5507561 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 C54FA9F326 for ; Wed, 17 Dec 2014 15:48:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3109209A7 for ; Wed, 17 Dec 2014 15:48:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 115DE209D3 for ; Wed, 17 Dec 2014 15:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750910AbaLQPsm (ORCPT ); Wed, 17 Dec 2014 10:48:42 -0500 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:59865 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905AbaLQPsl (ORCPT ); Wed, 17 Dec 2014 10:48:41 -0500 Received: from faui48e.informatik.uni-erlangen.de (faui48e.informatik.uni-erlangen.de [IPv6:2001:638:a000:4134::ffff:51]) by faui40.informatik.uni-erlangen.de (Postfix) with ESMTP id 076C45904CF; Wed, 17 Dec 2014 16:41:09 +0100 (CET) Received: by faui48e.informatik.uni-erlangen.de (Postfix, from userid 31112) id F08E04E0FA7; Wed, 17 Dec 2014 16:41:08 +0100 (CET) From: Stefan Hengelein To: kgene@kernel.org Cc: linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, m.szyprowski@samsung.com, Stefan Hengelein Subject: [PATCH] ARM: SAMSUNG: remove dead #elif CONFIG_S3C24XX_DMAC Date: Wed, 17 Dec 2014 16:40:37 +0100 Message-Id: <1418830837-7422-1-git-send-email-stefan.hengelein@fau.de> X-Mailer: git-send-email 1.9.1 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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 The corresponding CPP-block can never be selected since there are conflicting Kconfig constraints: - CONFIG_S3C24XX_DMAC has a dependency on ARCH_S3C24XX - The surrounding CPP-block needs CONFIG_S3C64XX_DEV_SPI0 to be defined. - CONFIG_S3C64XX_DEV_SPI0 is only selected by MACH_WLF_CRAGG_6410 - MACH_WLF_CRAGG_6410 however has a dependency on ARCH_S3C64XX (through a surrounding if-statement in Kconfig) - ARCH_S3C64XX and ARCH_S3C24XX are mutually exclusive since they are declared in the same choice and cannot be enabled at the same time. Hence, the innner block "#elif defined(CONFIG_S3C24XX_DMAC)" cannot be enabled at the same time with the surrounding block "#ifdef CONFIG_S3C64XX_DEV_SPI0" and therefore is dead. This (logical) defect has been found with the undertaker tool (https://undertaker.cs.fau.de) Signed-off-by: Stefan Hengelein --- arch/arm/plat-samsung/devs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 83c7d15..b38b601 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -1134,8 +1134,6 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, pd.filter = pl330_filter; #elif defined(CONFIG_S3C64XX_PL080) pd.filter = pl08x_filter_id; -#elif defined(CONFIG_S3C24XX_DMAC) - pd.filter = s3c24xx_dma_filter; #endif s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0);