From 33b2d2d624da2d088c96ba2fcca50a4e4db47cf5 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 15 May 2012 15:23:52 -0700
Subject: [PATCH] --- yaml --- r: 304715 b: refs/heads/master c:
 bfba5e78a0fe0044609606307c6568c148187aed h: refs/heads/master i:   304713:
 ca5c22196b10e4d244244f8f0c14f3fe35f6fde6   304711:
 bac22fc372bd424a103ed6bc838e388bd5a8430f v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/comedi_parport.c   | 31 +++++--------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index a9489973e774..ec7d2a281815 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eb0f278423e03a1b09699e95050a78c153bfd56
+refs/heads/master: bfba5e78a0fe0044609606307c6568c148187aed
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_parport.c b/trunk/drivers/staging/comedi/drivers/comedi_parport.c
index 21d834dd92b6..117211430070 100644
--- a/trunk/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/trunk/drivers/staging/comedi/drivers/comedi_parport.c
@@ -91,29 +91,6 @@ pin, which can be used to wake up tasks.
 #define PARPORT_B 1
 #define PARPORT_C 2
 
-static int parport_attach(struct comedi_device *dev,
-			  struct comedi_devconfig *it);
-static int parport_detach(struct comedi_device *dev);
-static struct comedi_driver driver_parport = {
-	.driver_name = "comedi_parport",
-	.module = THIS_MODULE,
-	.attach = parport_attach,
-	.detach = parport_detach,
-};
-
-static int __init driver_parport_init_module(void)
-{
-	return comedi_driver_register(&driver_parport);
-}
-
-static void __exit driver_parport_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_parport);
-}
-
-module_init(driver_parport_init_module);
-module_exit(driver_parport_cleanup_module);
-
 struct parport_private {
 	unsigned int a_data;
 	unsigned int c_data;
@@ -408,6 +385,14 @@ static int parport_detach(struct comedi_device *dev)
 	return 0;
 }
 
+static struct comedi_driver parport_driver = {
+	.driver_name	= "comedi_parport",
+	.module		= THIS_MODULE,
+	.attach		= parport_attach,
+	.detach		= parport_detach,
+};
+module_comedi_driver(parport_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");