Commit 6bdc31db authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: skel: remove driver_ prefix

Remove the `driver_` prefix from variable and function names.  Rename
`driver_skel` to `skel_driver`.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0a42b34
...@@ -148,7 +148,7 @@ struct skel_private { ...@@ -148,7 +148,7 @@ struct skel_private {
*/ */
static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it); static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static void skel_detach(struct comedi_device *dev); static void skel_detach(struct comedi_device *dev);
static struct comedi_driver driver_skel = { static struct comedi_driver skel_driver = {
.driver_name = "dummy", .driver_name = "dummy",
.module = THIS_MODULE, .module = THIS_MODULE,
.attach = skel_attach, .attach = skel_attach,
...@@ -582,45 +582,45 @@ static int skel_dio_insn_config(struct comedi_device *dev, ...@@ -582,45 +582,45 @@ static int skel_dio_insn_config(struct comedi_device *dev,
} }
#ifdef CONFIG_COMEDI_PCI_DRIVERS #ifdef CONFIG_COMEDI_PCI_DRIVERS
static int __devinit driver_skel_pci_probe(struct pci_dev *dev, static int __devinit skel_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
return comedi_pci_auto_config(dev, &driver_skel); return comedi_pci_auto_config(dev, &skel_driver);
} }
static void __devexit driver_skel_pci_remove(struct pci_dev *dev) static void __devexit skel_pci_remove(struct pci_dev *dev)
{ {
comedi_pci_auto_unconfig(dev); comedi_pci_auto_unconfig(dev);
} }
static struct pci_driver driver_skel_pci_driver = { static struct pci_driver skel_pci_driver = {
.id_table = skel_pci_table, .id_table = skel_pci_table,
.probe = &driver_skel_pci_probe, .probe = &skel_pci_probe,
.remove = __devexit_p(&driver_skel_pci_remove) .remove = __devexit_p(&skel_pci_remove)
}; };
static int __init driver_skel_init_module(void) static int __init skel_init_module(void)
{ {
int retval; int retval;
retval = comedi_driver_register(&driver_skel); retval = comedi_driver_register(&skel_driver);
if (retval < 0) if (retval < 0)
return retval; return retval;
driver_skel_pci_driver.name = (char *)driver_skel.driver_name; skel_pci_driver.name = (char *)skel_driver.driver_name;
return pci_register_driver(&driver_skel_pci_driver); return pci_register_driver(&skel_pci_driver);
} }
static void __exit driver_skel_cleanup_module(void) static void __exit skel_cleanup_module(void)
{ {
pci_unregister_driver(&driver_skel_pci_driver); pci_unregister_driver(&skel_pci_driver);
comedi_driver_unregister(&driver_skel); comedi_driver_unregister(&skel_driver);
} }
module_init(driver_skel_init_module); module_init(skel_init_module);
module_exit(driver_skel_cleanup_module); module_exit(skel_cleanup_module);
#else #else
module_comedi_driver(driver_skel); module_comedi_driver(skel_driver);
#endif #endif
MODULE_AUTHOR("Comedi http://www.comedi.org"); MODULE_AUTHOR("Comedi http://www.comedi.org");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment