Hi Andrew,
On 11/5/05, Andrew Morton <akpm@xxxxxxxx> wrote:
> Andrew Morton <akpm@xxxxxxxx> wrote:
> >
> > Let's go with Ashutosh's patch then, thanks.
>
> (It was wordwrapped. Please fix your email client)
I am attaching the patch.
Signed-off-by: Ashutosh Naik <ashutosh.naik@xxxxxxxxx>
> 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;
> }
>
Signed-off-by: Ashutosh Naik <ashutosh.naik@xxxxxxxxx>
Acked. The above patch does the trick too. Any one can be committed.
Cheers
Ashutosh
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
