staging: comedi: ni_65xx: use module_comedi_pci_driver()

Use the macro `module_comedi_pci_driver(comedi_driver, pci_driver)` to
register the module as a Comedi PCI driver.  Rename variables and
functions that have prefix `driver_` for consistency.  Set the `name`
member of the `struct pci_driver` variable in its initializer instead of
initializing it in the module initialization function.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index ca5e07503178e1950e998bdb27c29f383f2fa640..529f4d527833f63471afe1fd9da4ee4ef1c96e77 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -112,7 +112,7 @@ static inline unsigned Filter_Enable(unsigned port)
 static int ni_65xx_attach(struct comedi_device *dev,
                          struct comedi_devconfig *it);
 static void ni_65xx_detach(struct comedi_device *dev);
-static struct comedi_driver driver_ni_65xx = {
+static struct comedi_driver ni_65xx_driver = {
        .driver_name = "ni_65xx",
        .module = THIS_MODULE,
        .attach = ni_65xx_attach,
@@ -822,43 +822,24 @@ static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot)
        return -EIO;
 }
 
-static int __devinit driver_ni_65xx_pci_probe(struct pci_dev *dev,
-                                             const struct pci_device_id *ent)
+static int __devinit ni_65xx_pci_probe(struct pci_dev *dev,
+                                      const struct pci_device_id *ent)
 {
-       return comedi_pci_auto_config(dev, &driver_ni_65xx);
+       return comedi_pci_auto_config(dev, &ni_65xx_driver);
 }
 
-static void __devexit driver_ni_65xx_pci_remove(struct pci_dev *dev)
+static void __devexit ni_65xx_pci_remove(struct pci_dev *dev)
 {
        comedi_pci_auto_unconfig(dev);
 }
 
-static struct pci_driver driver_ni_65xx_pci_driver = {
+static struct pci_driver ni_65xx_pci_driver = {
+       .name = "ni_65xx",
        .id_table = ni_65xx_pci_table,
-       .probe = &driver_ni_65xx_pci_probe,
-       .remove = __devexit_p(&driver_ni_65xx_pci_remove)
+       .probe = ni_65xx_pci_probe,
+       .remove = __devexit_p(ni_65xx_pci_remove)
 };
-
-static int __init driver_ni_65xx_init_module(void)
-{
-       int retval;
-
-       retval = comedi_driver_register(&driver_ni_65xx);
-       if (retval < 0)
-               return retval;
-
-       driver_ni_65xx_pci_driver.name = (char *)driver_ni_65xx.driver_name;
-       return pci_register_driver(&driver_ni_65xx_pci_driver);
-}
-
-static void __exit driver_ni_65xx_cleanup_module(void)
-{
-       pci_unregister_driver(&driver_ni_65xx_pci_driver);
-       comedi_driver_unregister(&driver_ni_65xx);
-}
-
-module_init(driver_ni_65xx_init_module);
-module_exit(driver_ni_65xx_cleanup_module);
+module_comedi_pci_driver(ni_65xx_driver, ni_65xx_pci_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");