Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751239AbVKECbL (ORCPT ); Fri, 4 Nov 2005 21:31:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750819AbVKECbL (ORCPT ); Fri, 4 Nov 2005 21:31:11 -0500 Received: from smtp.osdl.org ([65.172.181.4]:18312 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1750723AbVKECbJ (ORCPT ); Fri, 4 Nov 2005 21:31:09 -0500 Date: Fri, 4 Nov 2005 18:30:43 -0800 From: Andrew Morton To: 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: <20051104183043.27a2229c.akpm@osdl.org> In-Reply-To: <20051104182537.741be3d9.akpm@osdl.org> References: <81083a450511012314q4ec69927gfa60cb19ba8f437a@mail.gmail.com> <4368878D.4040406@student.ltu.se> <436927CA.3090105@student.ltu.se> <20051104182537.741be3d9.akpm@osdl.org> 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: 1515 Lines: 49 Andrew Morton wrote: > > Let's go with Ashutosh's patch then, thanks. (It was wordwrapped. Please fix your email client) 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; } _ - 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/