From patchwork Tue Jan 9 20:20:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabor Juhos X-Patchwork-Id: 857711 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HrEG2SF/"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zGNp50sq5z9s75 for ; Wed, 10 Jan 2018 07:21:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qKQ4e47aJrOW0QVb2V+U32yX+pHyEUKojLVjXAIgBm4=; b=HrEG2SF/MO49tU lvdzMdQstjFO9+26cxYXmaQlab0Z+sHzOhnc7VkRVsnpPRFaAWxacyZ/nRar5UQgaoXF048DSQds/ jjnG37PuJXZ3OBMrEpm1uX6YPpPZRLu+1Z/hDdCwemiM/9trfonx7lUe7GpHTeXWCD/R25xMR3Dvb HjeLPBzAxIuoqg5map5XMsK3L441xpx7w5NVdW/O/6IRVeURQiEWC9BS/PPD+04SVfX8SogGNIfJG uyUxUNkwQhwOstBFF8o5XS8Bs2m5u601CK33kttlMBS9jT2K4qiIiqo9VBl54bRDEaT20GpA6zVoe wIVZ18GfPeZvLoeadxfw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eZ0Oo-0002AZ-HM; Tue, 09 Jan 2018 20:21:30 +0000 Received: from arrakis.dune.hu ([78.24.191.176]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eZ0OU-0001MJ-GA for lede-dev@lists.infradead.org; Tue, 09 Jan 2018 20:21:13 +0000 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 9EF57B80192; Tue, 9 Jan 2018 21:20:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=ALL_TRUSTED,BAYES_00, FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 Received: from localhost.localdomain (unknown [188.142.137.125]) by arrakis.dune.hu (Postfix) with ESMTPSA; Tue, 9 Jan 2018 21:20:58 +0100 (CET) From: Gabor Juhos To: lede-dev@lists.infradead.org Date: Tue, 9 Jan 2018 21:20:12 +0100 Message-Id: <20180109202014.16144-2-juhosg@freemail.hu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180109202014.16144-1-juhosg@freemail.hu> References: <20180109202014.16144-1-juhosg@freemail.hu> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180109_122110_737020_FA4E6457 X-CRM114-Status: GOOD ( 11.22 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [78.24.191.176 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (juhosg[at]freemail.hu) 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH 1/3] ar71xx: remove obsolete '< KERNEL_VERSION(3, 15, 0)' checks X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gabor Juhos MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Because the oldest supported kernel version on the ar71xx target is 4.4, the condition that the kernel version is smaller than 3.15.0 is always false. Remove the obsolete checks from the target specific source files to clean up the code a bit. Signed-off-by: Gabor Juhos --- target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c | 5 ----- target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c | 12 ------------ 2 files changed, 17 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c index a9bb334a20..4ade218f7e 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c @@ -10,7 +10,6 @@ */ #include -#include #include #include @@ -30,11 +29,7 @@ void __init ath79_register_dsa(struct device *netdev, d->netdev = netdev; for (i = 0; i < d->nr_chips; i++) -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) - d->chip[i].mii_bus = miidev; -#else d->chip[i].host_dev = miidev; -#endif ar71xx_dsa_switch_device.dev.platform_data = d; platform_device_register(&ar71xx_dsa_switch_device); diff --git a/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c b/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c index 1355e3ff6e..82e6e943ff 100644 --- a/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c +++ b/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c @@ -203,19 +203,7 @@ static int nxp_74hc153_remove(struct platform_device *pdev) struct nxp_74hc153_platform_data *pdata = pdev->dev.platform_data; if (nxp) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) - int err; - - err = gpiochip_remove(&nxp->gpio_chip); - if (err) { - dev_err(&pdev->dev, - "unable to remove gpio chip, err=%d\n", - err); - return err; - } -#else gpiochip_remove(&nxp->gpio_chip); -#endif gpio_free(pdata->gpio_pin_2y); gpio_free(pdata->gpio_pin_1y); gpio_free(pdata->gpio_pin_s1);