From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH]dgrs - Fixes Warnings when CONFIG_ISA and CONFIG_PCI are not enabled Date: Sat, 5 Nov 2005 00:46:09 -0800 Message-ID: <20051105004609.0f04481c.akpm@osdl.org> 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> <436C6F02.90904@student.ltu.se> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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: Richard Knutsson In-Reply-To: <436C6F02.90904@student.ltu.se> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Richard Knutsson wrote: > > > */ > > #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 Well a nicer fix would be to provide a stub implementation of eisa_driver_register() if !CONFIG_EISA, just like pci_register_driver(). Then all the ifdefs go away and the compiler removes all the code for us, after checking that we typed it correctly.