Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932703AbVKBNQL (ORCPT ); Wed, 2 Nov 2005 08:16:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932705AbVKBNQL (ORCPT ); Wed, 2 Nov 2005 08:16:11 -0500 Received: from nproxy.gmail.com ([64.233.182.192]:59018 "EHLO nproxy.gmail.com") by vger.kernel.org with ESMTP id S932703AbVKBNQJ convert rfc822-to-8bit (ORCPT ); Wed, 2 Nov 2005 08:16:09 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=sSqMCiq76avp7mI8N8Dxse5bTh0Qbxys29q4zRfPWFoRzyq1VFDEY/7RICPDw3PCJGkzHqAyjxgScF/oKmEn/8KZ18ZH44JrgCEamwegRZkNG3biIN6XQepxRNT4C6LXiycYds52QQGmR82GHeKWneOH1Hc3zQQUyrZnJkKbHQY= Message-ID: Date: Wed, 2 Nov 2005 18:46:08 +0530 From: Ashutosh Naik To: Richard Knutsson Subject: Re: [PATCH]dgrs - Fixes Warnings when CONFIG_ISA and CONFIG_PCI are not enabled Cc: Ashutosh Naik , 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 In-Reply-To: <4368878D.4040406@student.ltu.se> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Content-Disposition: inline References: <81083a450511012314q4ec69927gfa60cb19ba8f437a@mail.gmail.com> <4368878D.4040406@student.ltu.se> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2888 Lines: 89 On 11/2/05, Richard Knutsson wrote: > 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; > } Well, both of them do the same stuff, but one of these patches needs to be committed. Cheers Ashutosh - 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/