From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Knutsson Subject: Re: [PATCH]dgrs - Fixes Warnings when CONFIG_ISA and CONFIG_PCI are not enabled Date: Sat, 05 Nov 2005 09:36:18 +0100 Message-ID: <436C6F02.90904@student.ltu.se> References: <81083a450511012314q4ec69927gfa60cb19ba8f437a@mail.gmail.com> <4368878D.4040406@student.ltu.se> <436927CA.3090105@student.ltu.se> <20051104182537.741be3d9.akpm@osdl.org> <20051104183043.27a2229c.akpm@osdl.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: ashutosh.lkml@gmail.com, netdev@vger.kernel.org, davej@suse.de, acme@conectiva.com.br, linux-net@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org Return-path: To: Andrew Morton In-Reply-To: <20051104183043.27a2229c.akpm@osdl.org> Sender: linux-net-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Andrew Morton wrote: >In fact we can de-ifdef things a bit. > >diff -puN drivers/net/dgrs.c~dgrs-fixes-warnings-when-config_isa-and-config_pci-are-not-enabled drivers/net/dgrs.c >--- devel/drivers/net/dgrs.c~dgrs-fixes-warnings-when-config_isa-and-config_pci-are-not-enabled 2005-11-04 18:26:59.000000000 -0800 >+++ devel-akpm/drivers/net/dgrs.c 2005-11-04 18:29:24.000000000 -0800 >@@ -1549,7 +1549,7 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwi > static int __init dgrs_init_module (void) > { > int i; >- int eisacount = 0, pcicount = 0; >+ int cardcount = 0; > > /* > * Command line variable overrides >@@ -1591,15 +1591,13 @@ static int __init dgrs_init_module (void > * Find and configure all the cards > */ > #ifdef CONFIG_EISA >- eisacount = eisa_driver_register(&dgrs_eisa_driver); >- if (eisacount < 0) >- return eisacount; >-#endif >-#ifdef CONFIG_PCI >- pcicount = pci_register_driver(&dgrs_pci_driver); >- if (pcicount) >- return pcicount; >+ cardcount = eisa_driver_register(&dgrs_eisa_driver); >+ if (cardcount < 0) >+ return cardcount; > #endif >+ cardcount = pci_register_driver(&dgrs_pci_driver); >+ if (cardcount) >+ return cardcount; > return 0; > } > > I do not know what to think about this one: * reduce one #ifdef: good * check for something clearly stated not to: not so good But as Ashutosh Naik said: Any one can be committed. /Richard