From patchwork Fri Jan 29 11:39:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101037 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1059427lbb; Fri, 29 Jan 2016 03:42:58 -0800 (PST) X-Received: by 10.98.10.81 with SMTP id s78mr12739209pfi.119.1454067778648; Fri, 29 Jan 2016 03:42:58 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w13si1790858pas.67.2016.01.29.03.42.58; Fri, 29 Jan 2016 03:42:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755985AbcA2Lmi (ORCPT + 30 others); Fri, 29 Jan 2016 06:42:38 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:52922 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756029AbcA2Lkh (ORCPT ); Fri, 29 Jan 2016 06:40:37 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0M2pmM-1a88Dl21Be-00sc6a; Fri, 29 Jan 2016 12:40:03 +0100 From: Arnd Bergmann To: David Miller , Jaroslav Kysela Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/7] net: hp100: remove unnecessary #ifdefs Date: Fri, 29 Jan 2016 12:39:11 +0100 Message-Id: <1454067557-3546883-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454067557-3546883-1-git-send-email-arnd@arndb.de> References: <1454067557-3546883-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:SGD87V+BdyO+VzxahUbk5qXrW4rzL5q9dbPeX6flFuuFtWEPPHH T6MBVHxazEmFiQpiBdVll2MTP18JADOzCoPSyrugIROsIvLl3FoZDmoqqeB4/P7Rc7Sgg/N 3cUbOqOgaXh4+B72DgUfWmZe7WUoDq4WbzDpWXX5e65WCbPj1njkDO+GN26bDOiU7g1sV8K WgkqNI8sC2E1NGs2PogAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:gGWoVEBlOwI=:FUqPdR8m/8Nhg37hUFMRoY 5kbeUHhn0ga9QPCdtudJPnXLmu92Clawz8GBxfSMM1/ConHgOMwuLbxyWu7TKNZCbacarHYjh TljXgS9HMnY6lCViaXGghPngXwP2we/eWx1frilCtSGJUNRbfVMy3/RaPtYTpSYBvjdv/V7ff KmOc/97GRizc87T+DEjNBIfOkAuDxYnXWzFC+7y76CybGf0x+g6aiDXpds2USJjfw2FF9oqoC HEHJgMZoHttvXtTwUtQNn5CAjrYmuYYhDqS27nu7MlNhUi3xASrTIMq4IKNfc13lwM6pxxmPe PtkHjqM9HfjBZqNOzvvBfprPQXst+F79bwSTWYRPzbzPnKslFyszFkicQsQ3WdfGFX7KBi57A GFcMynHRW4qXeOQBMER4os7ofikren8pubFdJ6O1zwZe3+btirobSulpF33Qdijb4ICWosPLt dDIU8oCrJtL0XVUtl+7gzcW7kVzTQUBfUGVAsBh9IH7OgHlx1f5dERMBdfjsC7/gtvsQGBSXQ nq0ZefmF4p3UO8wgAKYuIk83PE7i68dhrmyXTbfsWi4cCOA/tKY1912v2AsmK5kuc7xBW1tg6 oUtdhWmVisJbd/5EoiRuer0aAj+7uweOGHsJXswtn+vkQ7liSR6rhmTl65lgQzzxSXFuAtQS2 klkv+FBSNQIxJRTkfYuciWJ4QAXzESIN4kYNqWxbaVRRv5Mf3jnIPa7oohiG+w9Og0Ks= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building the hp100 ethernet driver causes warnings when both the PCI and EISA drivers are disabled: ethernet/hp/hp100.c: In function 'hp100_module_init': ethernet/hp/hp100.c:3047:2: warning: label 'out3' defined but not used [-Wunused-label] ethernet/hp/hp100.c: At top level: ethernet/hp/hp100.c:2828:13: warning: 'cleanup_dev' defined but not used [-Wunused-function] We can easily avoid the warnings and make the driver look slightly nicer by removing the #ifdefs that check for the CONFIG_PCI and CONFIG_EISA, as all the registration functions are designed to have no effect when the buses are disabled. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/hp/hp100.c | 18 ------------------ 1 file changed, 18 deletions(-) -- 2.7.0 diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c index 1d5c3e16d8f4..3daf2d4a7ca0 100644 --- a/drivers/net/ethernet/hp/hp100.c +++ b/drivers/net/ethernet/hp/hp100.c @@ -194,7 +194,6 @@ static const char *hp100_isa_tbl[] = { }; #endif -#ifdef CONFIG_EISA static struct eisa_device_id hp100_eisa_tbl[] = { { "HWPF180" }, /* HP J2577 rev A */ { "HWP1920" }, /* HP 27248B */ @@ -205,9 +204,7 @@ static struct eisa_device_id hp100_eisa_tbl[] = { { "" } /* Mandatory final entry ! */ }; MODULE_DEVICE_TABLE(eisa, hp100_eisa_tbl); -#endif -#ifdef CONFIG_PCI static const struct pci_device_id hp100_pci_tbl[] = { {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585A, PCI_ANY_ID, PCI_ANY_ID,}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585B, PCI_ANY_ID, PCI_ANY_ID,}, @@ -219,7 +216,6 @@ static const struct pci_device_id hp100_pci_tbl[] = { {} /* Terminating entry */ }; MODULE_DEVICE_TABLE(pci, hp100_pci_tbl); -#endif static int hp100_rx_ratio = HP100_DEFAULT_RX_RATIO; static int hp100_priority_tx = HP100_DEFAULT_PRIORITY_TX; @@ -2842,7 +2838,6 @@ static void cleanup_dev(struct net_device *d) free_netdev(d); } -#ifdef CONFIG_EISA static int hp100_eisa_probe(struct device *gendev) { struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); @@ -2884,9 +2879,7 @@ static struct eisa_driver hp100_eisa_driver = { .remove = hp100_eisa_remove, } }; -#endif -#ifdef CONFIG_PCI static int hp100_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -2955,7 +2948,6 @@ static struct pci_driver hp100_pci_driver = { .probe = hp100_pci_probe, .remove = hp100_pci_remove, }; -#endif /* * module section @@ -3032,23 +3024,17 @@ static int __init hp100_module_init(void) err = hp100_isa_init(); if (err && err != -ENODEV) goto out; -#ifdef CONFIG_EISA err = eisa_driver_register(&hp100_eisa_driver); if (err && err != -ENODEV) goto out2; -#endif -#ifdef CONFIG_PCI err = pci_register_driver(&hp100_pci_driver); if (err && err != -ENODEV) goto out3; -#endif out: return err; out3: -#ifdef CONFIG_EISA eisa_driver_unregister (&hp100_eisa_driver); out2: -#endif hp100_isa_cleanup(); goto out; } @@ -3057,12 +3043,8 @@ static int __init hp100_module_init(void) static void __exit hp100_module_exit(void) { hp100_isa_cleanup(); -#ifdef CONFIG_EISA eisa_driver_unregister (&hp100_eisa_driver); -#endif -#ifdef CONFIG_PCI pci_unregister_driver (&hp100_pci_driver); -#endif } module_init(hp100_module_init)