Thread (12 messages) flat view 12 messages, 3 authors, 2005-11-05

Re: [PATCH]dgrs - Fixes Warnings when CONFIG_ISA and CONFIG_PCI are not enabled

From: Ashutosh Naik <hidden>
Date: 2005-11-05 04:51:51
Also in: lkml

Hi Andrew,

On 11/5/05, Andrew Morton [off-list ref] wrote:
Andrew Morton [off-list ref] wrote:
quoted
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 <redacted>
quoted hunk ↗ jump to hunk
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 <redacted>

Acked. The above patch does the trick too. Any one can be committed.

Cheers
Ashutosh

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help