Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932132AbVKERqF (ORCPT ); Sat, 5 Nov 2005 12:46:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932125AbVKERqF (ORCPT ); Sat, 5 Nov 2005 12:46:05 -0500 Received: from smtp.osdl.org ([65.172.181.4]:26780 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S932070AbVKERqC (ORCPT ); Sat, 5 Nov 2005 12:46:02 -0500 Date: Sat, 5 Nov 2005 09:45:38 -0800 From: Andrew Morton To: Richard Knutsson Cc: ricknu-0@student.ltu.se, 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 Subject: Re: [PATCH]dgrs - Fixes Warnings when CONFIG_ISA and CONFIG_PCI are not enabled Message-Id: <20051105094538.7ffcd85f.akpm@osdl.org> In-Reply-To: <436CCFEC.50709@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> <436C6F02.90904@student.ltu.se> <20051105004609.0f04481c.akpm@osdl.org> <436C9D73.5030506@student.ltu.se> <436CCFEC.50709@student.ltu.se> X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2117 Lines: 63 Richard Knutsson wrote: > > Richard Knutsson wrote: > > > Andrew Morton wrote: > > > >> 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. > >> > >> > > Oh, sorry. Missed the stub implementation of the pci-driver. I "ack" > > your patch. > > > > BTW, can anyone ack or is that up to the maintainers? > > BTW #2, why not remove #ifdef CONFIG_PCI on dgrs_cleanup_module() at > > the same time? Or maybe that should be in a "remove config_pci"-patch... > > > > /Richard > > Just realized; what happens if CONFIG_EISA && !CONFIG_PCI and > eisa_driver_register() returns value > 0, then the if-statement for the > pci-driver is going to return the value, instead of 0. if !CONFIG_PCI, pci_register_driver() will return zero. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/