From patchwork Wed Jan 27 14:04:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101072 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2602286lbb; Wed, 27 Jan 2016 06:06:57 -0800 (PST) X-Received: by 10.67.22.97 with SMTP id hr1mr42970787pad.49.1453903617453; Wed, 27 Jan 2016 06:06:57 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qp8si9710212pac.229.2016.01.27.06.06.57; Wed, 27 Jan 2016 06:06:57 -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 S932822AbcA0OGz (ORCPT + 30 others); Wed, 27 Jan 2016 09:06:55 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:62662 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754261AbcA0OGx (ORCPT ); Wed, 27 Jan 2016 09:06:53 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0M6rkj-1aCPer0yvN-00wo6I; Wed, 27 Jan 2016 15:06:20 +0100 From: Arnd Bergmann To: "David S. Miller" Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , netdev@vger.kernel.org, Jaroslav Kysela , linux-kernel@vger.kernel.org Subject: [PATCH 2/9] net: hp100: remove unnecessary #ifdefs Date: Wed, 27 Jan 2016 15:04:52 +0100 Message-Id: <1453903507-3427225-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453903507-3427225-1-git-send-email-arnd@arndb.de> References: <1453903507-3427225-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:S0UMsy6g/rlB5xKZahO3FbAcszoBrkodb4sKHU2a2WqU/qlJUWc UVunQ+sy38AfR+tA5Ek6XqyUTNfgOKhNVrf5Gdda+3xi/fspHlrT0xu/xZ/azQ377UovYF+ al1fERbfY/OOlyphEh63rBYXcVwcvOwJClzl9hrMjGHonVUesK9bVMS5n023k8DqeRSL3MW Nb7xvXRnF8xDPOnpzNC7Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:WsiXQYkskAs=:vbDRddyKXCiUSblpB1VIlO BspKQ91ElXPTk99HvNoOv6Qs34A+eDtnV1JUT2YoHSUkxADtG0wx6w+OTKSkjrYSv54WttD++ xDcQsKhV525PflQ385MmsyWTAitU1SAZs0+NEutg4OS+D/tbnwClDGVJDVoJ0GnZRn6WpEobt vSSlZAMCxxgw/+pPrCXkSCKtG1GnfxYZUPRB0ciKQg+TQYwT7t6V2BEjd11px1aNoRzhjuzOW vYCSudhJ8D+fLxVqIxZAUAFdztGymx+4l7F5EHk7yYsJEOFTMFKCNtH8mjkP3KSF3Isyjcdoa uDA0AY5+8XXbe/vqrFgsYMcQKBmqWRLazr7iu+oqV4ve8RsEkFt6JFUeF315thaYQ2XlsXX78 hKaxGkOD24qdWgp6ollrw+cK/0BzZWIrpCcy3GNgayiigF9PJYzbtG1Jm2GrXcTJmPDHEJYbZ qpbcGSfHWZJFt+oLLrEIJCeSHtYg01FIN+/qM7NJv1dB2V0ZwSqwSCcbnSl78ELglKnevJbYU 2ZPmC2FTau2w/ZV5cK9dL8lZ5+f51cfabL8DuAOQN0wBTPuopT8dN224LhgUakfZWGIDDmqLt 0rDHRNttTYmCG0PrU9ZeNJ3bCivguGrME8/OTW12X5uyIBkOQcxEyJCStzRi6fbJl/MxQjtyS pxXUcfYwNYZ+1xXlEH9z3VhKVssve70+0IxshiClZxYpqSF+MXAf6uLRAmkRHk2Vlf/c= 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)