![]() | |||||||||||||
Messages in this thread |
Andrew Morton wrote:
>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;
> }
>
>
I do not know what to think about this one:
* reduce one #ifdef: good
* check for something clearly stated not to: not so good
But as Ashutosh Naik said: Any one can be committed.
/Richard
-
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/
| ||||||||||||
| Last update: 2005-11-05 09:36 [W:0.486 / U:0.010 seconds] ©2003-2008 Jasper Spaans | |||||||||||||