diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-05-11 16:16:20 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-14 13:49:49 -0700 |
commit | 75e6301baa78b2dff00e2cc3051301c32618acd7 (patch) | |
tree | bc3c781e25ca6f27e60350e69cf23039edef04ba /drivers/staging/comedi/drivers/adl_pci8164.c | |
parent | d4899c6ff86ea9836c89250cb2127aa64765b35a (diff) |
staging: comedi: Use module_comedi_pci_driver and standardize drivers
Convert the refactored comedi pci drivers to use the
module_comedi_pci_driver() macro which makes the code
smaller and a bit simpler.
In the process, rename some of the symbols in the driver
to standardize the comedi pci drivers.
Based on the driver {name}:
1) Rename the comedi_driver to {name}_driver.
2) Use a static string {name} for the comedi_driver.driver_name.
3) Rename the pci probe/remove functions to {name)_pci_probe/remove.
4) Rename the pci id_table to {name}_pci_table.
5) Add the static string {name} for the pci_driver.name.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/adl_pci8164.c')
-rw-r--r-- | drivers/staging/comedi/drivers/adl_pci8164.c | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c index 6b32e45c0228..9c5906bb1a15 100644 --- a/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/drivers/staging/comedi/drivers/adl_pci8164.c @@ -327,21 +327,20 @@ static int adl_pci8164_detach(struct comedi_device *dev) return 0; } -static struct comedi_driver driver_adl_pci8164 = { +static struct comedi_driver adl_pci8164_driver = { .driver_name = "adl_pci8164", .module = THIS_MODULE, .attach = adl_pci8164_attach, .detach = adl_pci8164_detach, }; -static int __devinit driver_adl_pci8164_pci_probe(struct pci_dev *dev, - const struct pci_device_id - *ent) +static int __devinit adl_pci8164_pci_probe(struct pci_dev *dev, + const struct pci_device_id *ent) { - return comedi_pci_auto_config(dev, &driver_adl_pci8164); + return comedi_pci_auto_config(dev, &adl_pci8164_driver); } -static void __devexit driver_adl_pci8164_pci_remove(struct pci_dev *dev) +static void __devexit adl_pci8164_pci_remove(struct pci_dev *dev) { comedi_pci_auto_unconfig(dev); } @@ -352,32 +351,13 @@ static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = { }; MODULE_DEVICE_TABLE(pci, adl_pci8164_pci_table); -static struct pci_driver driver_adl_pci8164_pci_driver = { +static struct pci_driver adl_pci8164_pci_driver = { + .name = "adl_pci8164", .id_table = adl_pci8164_pci_table, - .probe = driver_adl_pci8164_pci_probe, - .remove = __devexit_p(driver_adl_pci8164_pci_remove), + .probe = adl_pci8164_pci_probe, + .remove = __devexit_p(adl_pci8164_pci_remove), }; - -static int __init driver_adl_pci8164_init_module(void) -{ - int retval; - - retval = comedi_driver_register(&driver_adl_pci8164); - if (retval < 0) - return retval; - - driver_adl_pci8164_pci_driver.name = - (char *)driver_adl_pci8164.driver_name; - return pci_register_driver(&driver_adl_pci8164_pci_driver); -} -module_init(driver_adl_pci8164_init_module); - -static void __exit driver_adl_pci8164_cleanup_module(void) -{ - pci_unregister_driver(&driver_adl_pci8164_pci_driver); - comedi_driver_unregister(&driver_adl_pci8164); -} -module_exit(driver_adl_pci8164_cleanup_module); +module_comedi_pci_driver(adl_pci8164_driver, adl_pci8164_pci_driver); MODULE_AUTHOR("Comedi http://www.comedi.org"); MODULE_DESCRIPTION("Comedi low-level driver"); |