[PATCH 06/13] staging: comedi: adv_pci1724: rename driver_* funcs and vars

[Ian Abbott <abbotti@xxxxxxxxx>]

Rename a few functions and variables to remove the `driver_` prefix.

Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Frank Mori Hess <fmh6jj@xxxxxxxxx>
---
 drivers/staging/comedi/drivers/adv_pci1724.c | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c
index 24c3df7..c500e4f 100644
--- a/drivers/staging/comedi/drivers/adv_pci1724.c
+++ b/drivers/staging/comedi/drivers/adv_pci1724.c
@@ -154,7 +154,7 @@ static inline struct adv_pci1724_private *priv(struct comedi_device *dev)
 static int adv_pci1724_auto_attach(struct comedi_device *dev,
 				   unsigned long context_unused);
 static void adv_pci1724_detach(struct comedi_device *dev);
-static struct comedi_driver driver_adv_pci1724 = {
+static struct comedi_driver adv_pci1724_driver = {
 	.driver_name = "adv_pci1724",
 	.module = THIS_MODULE,
 	.auto_attach = adv_pci1724_auto_attach,
@@ -179,39 +179,39 @@ static int offset_write_insn(struct comedi_device *dev,
 			    struct comedi_subdevice *s,
 			    struct comedi_insn *insn, unsigned int *data);
 
-static int driver_adv_pci1724_pci_probe(struct pci_dev *dev,
-					const struct pci_device_id *ent)
+static int adv_pci1724_pci_probe(struct pci_dev *dev,
+				 const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &driver_adv_pci1724);
+	return comedi_pci_auto_config(dev, &adv_pci1724_driver);
 }
 
-static struct pci_driver driver_adv_pci1724_pci_driver = {
+static struct pci_driver adv_pci1724_pci_driver = {
 	.id_table = adv_pci1724_pci_table,
-	.probe = &driver_adv_pci1724_pci_probe,
+	.probe = adv_pci1724_pci_probe,
 	.remove = comedi_pci_auto_unconfig,
 };
 
-static int __init driver_adv_pci1724_init_module(void)
+static int __init adv_pci1724_init_module(void)
 {
 	int retval;
 
-	retval = comedi_driver_register(&driver_adv_pci1724);
+	retval = comedi_driver_register(&adv_pci1724_driver);
 	if (retval < 0)
 		return retval;
 
-	driver_adv_pci1724_pci_driver.name =
-		(char *)driver_adv_pci1724.driver_name;
-	return pci_register_driver(&driver_adv_pci1724_pci_driver);
+	adv_pci1724_pci_driver.name =
+		(char *)adv_pci1724_driver.driver_name;
+	return pci_register_driver(&adv_pci1724_pci_driver);
 }
 
-static void __exit driver_adv_pci1724_cleanup_module(void)
+static void __exit adv_pci1724_cleanup_module(void)
 {
-	pci_unregister_driver(&driver_adv_pci1724_pci_driver);
-	comedi_driver_unregister(&driver_adv_pci1724);
+	pci_unregister_driver(&adv_pci1724_pci_driver);
+	comedi_driver_unregister(&adv_pci1724_driver);
 }
 
-module_init(driver_adv_pci1724_init_module);
-module_exit(driver_adv_pci1724_cleanup_module);
+module_init(adv_pci1724_init_module);
+module_exit(adv_pci1724_cleanup_module);
 
 /* Allocate and initialize the subdevice structures.
  */
-- 
1.8.1.2

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel