Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx> wrote: > > > */ > > #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 Well a nicer fix would be to provide a stub implementation of eisa_driver_register() if !CONFIG_EISA, just like pci_register_driver(). Then all the ifdefs go away and the compiler removes all the code for us, after checking that we typed it correctly. - : send the line "unsubscribe linux-net" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
