Messages in this thread | | | Date | Sat, 05 Nov 2005 12:54:27 +0100 | From | Richard Knutsson <> | Subject | Re: [PATCH]dgrs - Fixes Warnings when CONFIG_ISA and CONFIG_PCI are not enabled |
| |
Andrew Morton wrote:
>Richard Knutsson <ricknu-0@student.ltu.se> 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. > > Oh, sorry. Missed the stub implementation of the pci-driver. I "ack" your patch.
BTW, can anyone ack or is that up to the maintainers? BTW #2, why not remove #ifdef CONFIG_PCI on dgrs_cleanup_module() at the same time? Or maybe that should be in a "remove config_pci"-patch...
/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/
| |