Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964896AbVKBJ21 (ORCPT ); Wed, 2 Nov 2005 04:28:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964888AbVKBJ21 (ORCPT ); Wed, 2 Nov 2005 04:28:27 -0500 Received: from gepetto.dc.ltu.se ([130.240.42.40]:46272 "EHLO gepetto.dc.ltu.se") by vger.kernel.org with ESMTP id S964785AbVKBJ20 (ORCPT ); Wed, 2 Nov 2005 04:28:26 -0500 Message-ID: <4368878D.4040406@student.ltu.se> Date: Wed, 02 Nov 2005 10:31:57 +0100 From: Richard Knutsson User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Ashutosh Naik CC: rick@remotepoint.com, davej@suse.de, acme@conectiva.com.br, linux-net@vger.kernel.org, akpm@osdl.org, linux-kernel@vger.kernel.org, stable@kernel.org Subject: Re: [PATCH]dgrs - Fixes Warnings when CONFIG_ISA and CONFIG_PCI are not enabled References: <81083a450511012314q4ec69927gfa60cb19ba8f437a@mail.gmail.com> In-Reply-To: <81083a450511012314q4ec69927gfa60cb19ba8f437a@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2402 Lines: 84 Ashutosh Naik wrote: >This patch fixes compiler warnings when CONFIG_ISA and CONFIG_PCI are >not enabled in the dgrc network driver. > >Signed-off-by: Ashutosh Naik > >-- >diff -Naurp linux-2.6.14/drivers/net/dgrs.c >linux-2.6.14-git1/drivers/net/dgrs.c--- >linux-2.6.14/drivers/net/dgrs.c 2005-10-28 05:32:08.000000000 >+0530 >+++ linux-2.6.14-git1/drivers/net/dgrs.c 2005-11-01 >10:30:03.000000000 +0530 >@@ -1549,8 +1549,12 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwi > static int __init dgrs_init_module (void) { > int i; >- int eisacount = 0, pcicount = 0; >- >+#ifdef CONFIG_EISA >+ int eisacount = 0; >+#endif >+#ifdef CONFIG_PCI >+ int pcicount = 0; >+#endif > /* > * Command line variable overrides > * debug=NNN >- > > Since eisacount and pcicount is doing the same task (and they are only used in sequence) and to preventing more #ifdef in the source-code, why not use the same variable? It will give an warning if both of them is not defined, but is that an issue? If so, #if !defined CONFIG_EISA && !defined CONFIG_PCI could encapsulate the variable to prevent that. Posted 26'th of October and now also checked against 2.6.14-git1. Signed-off-by: Richard Knutsson --- diff -uNr a/drivers/net/dgrs.c b/drivers/net/dgrs.c --- a/drivers/net/dgrs.c 2005-08-29 01:41:01.000000000 +0200 +++ b/drivers/net/dgrs.c 2005-10-26 15:53:43.000000000 +0200 @@ -1549,7 +1549,7 @@ static int __init dgrs_init_module (void) { int i; - int eisacount = 0, pcicount = 0; + int count; /* * Command line variable overrides @@ -1591,14 +1591,14 @@ * Find and configure all the cards */ #ifdef CONFIG_EISA - eisacount = eisa_driver_register(&dgrs_eisa_driver); - if (eisacount < 0) - return eisacount; + count = eisa_driver_register(&dgrs_eisa_driver); + if (count < 0) + return count; #endif #ifdef CONFIG_PCI - pcicount = pci_register_driver(&dgrs_pci_driver); - if (pcicount) - return pcicount; + count = pci_register_driver(&dgrs_pci_driver); + if (count) + return count; #endif 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/