---

yaml
---
r: 317128
b: refs/heads/master
c: c25386f
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bb6dfc407b7c29d22dc9b5d21db86f50653b46e
+refs/heads/master: c25386f5db48ee5d94b6ff3b1dc43ea6c87c9560

trunk/drivers/staging/comedi/drivers/amplc_pc236.c

@@ -167,7 +167,7 @@ struct pc236_private {
  */
 static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it);
 static void pc236_detach(struct comedi_device *dev);
-static struct comedi_driver driver_amplc_pc236 = {
+static struct comedi_driver amplc_pc236_driver = {
 	.driver_name = PC236_DRIVER_NAME,
 	.module = THIS_MODULE,
 	.attach = pc236_attach,
@@ -178,58 +178,28 @@ static struct comedi_driver driver_amplc_pc236 = {
 };
 
 #if IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI)
-static int __devinit driver_amplc_pc236_pci_probe(struct pci_dev *dev,
+static int __devinit amplc_pc236_pci_probe(struct pci_dev *dev,
 						  const struct pci_device_id
 						  *ent)
 {
-	return comedi_pci_auto_config(dev, &driver_amplc_pc236);
+	return comedi_pci_auto_config(dev, &amplc_pc236_driver);
 }
 
-static void __devexit driver_amplc_pc236_pci_remove(struct pci_dev *dev)
+static void __devexit amplc_pc236_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }
 
-static struct pci_driver driver_amplc_pc236_pci_driver = {
+static struct pci_driver amplc_pc236_pci_driver = {
+	.name = PC236_DRIVER_NAME,
 	.id_table = pc236_pci_table,
-	.probe = &driver_amplc_pc236_pci_probe,
-	.remove = __devexit_p(&driver_amplc_pc236_pci_remove)
+	.probe = &amplc_pc236_pci_probe,
+	.remove = __devexit_p(&amplc_pc236_pci_remove)
 };
 
-static int __init driver_amplc_pc236_init_module(void)
-{
-	int retval;
-
-	retval = comedi_driver_register(&driver_amplc_pc236);
-	if (retval < 0)
-		return retval;
-
-	driver_amplc_pc236_pci_driver.name =
-	    (char *)driver_amplc_pc236.driver_name;
-	return pci_register_driver(&driver_amplc_pc236_pci_driver);
-}
-
-static void __exit driver_amplc_pc236_cleanup_module(void)
-{
-	pci_unregister_driver(&driver_amplc_pc236_pci_driver);
-	comedi_driver_unregister(&driver_amplc_pc236);
-}
-
-module_init(driver_amplc_pc236_init_module);
-module_exit(driver_amplc_pc236_cleanup_module);
+module_comedi_pci_driver(amplc_pc236_driver, amplc_pc236_pci_driver);
 #else
-static int __init driver_amplc_pc236_init_module(void)
-{
-	return comedi_driver_register(&driver_amplc_pc236);
-}
-
-static void __exit driver_amplc_pc236_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_amplc_pc236);
-}
-
-module_init(driver_amplc_pc236_init_module);
-module_exit(driver_amplc_pc236_cleanup_module);
+module_comedi_driver(amplc_pc236_driver);
 #endif
 
 #if IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_ISA)