1 files changed, 37 insertions, 55 deletions

diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index 647c228abfbf..02cf44b38590 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -343,49 +343,8 @@ static struct pnp_device_id device_ids[] = {
 
 MODULE_DEVICE_TABLE(pnp, device_ids);
 
-static int ni_atmio_attach(struct comedi_device *dev,
-                           struct comedi_devconfig *it);
-static int ni_atmio_detach(struct comedi_device *dev);
-static struct comedi_driver driver_atmio = {
-        .driver_name = "ni_atmio",
-        .module = THIS_MODULE,
-        .attach = ni_atmio_attach,
-        .detach = ni_atmio_detach,
-};
-
-static int __init driver_atmio_init_module(void)
-{
-        return comedi_driver_register(&driver_atmio);
-}
-
-static void __exit driver_atmio_cleanup_module(void)
-{
-        comedi_driver_unregister(&driver_atmio);
-}
-
-module_init(driver_atmio_init_module);
-module_exit(driver_atmio_cleanup_module);
-
 #include "ni_mio_common.c"
 
-static int ni_getboardtype(struct comedi_device *dev);
-
-/* clean up allocated resources */
-static int ni_atmio_detach(struct comedi_device *dev)
-{
-        mio_common_detach(dev);
-
-        if (dev->iobase)
-                release_region(dev->iobase, NI_SIZE);
-        if (dev->irq)
-                free_irq(dev->irq, dev);
-
-        if (devpriv->isapnp_dev)
-                pnp_device_detach(devpriv->isapnp_dev);
-
-        return 0;
-}
-
 static int ni_isapnp_find_board(struct pnp_dev **dev)
 {
         struct pnp_dev *isapnp_dev = NULL;
@@ -424,6 +383,26 @@ static int ni_isapnp_find_board(struct pnp_dev **dev)
         return 0;
 }
 
+static int ni_getboardtype(struct comedi_device *dev)
+{
+        int device_id = ni_read_eeprom(dev, 511);
+        int i;
+
+        for (i = 0; i < n_ni_boards; i++) {
+                if (ni_boards[i].device_id == device_id)
+                        return i;
+
+        }
+        if (device_id == 255)
+                printk(" can't find board\n");
+         else if (device_id == 0)
+                printk(" EEPROM read error (?) or device not found\n");
+         else
+                printk(" unknown device ID %d -- contact author\n", device_id);
+
+        return -1;
+}
+
 static int ni_atmio_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
@@ -518,22 +497,25 @@ static int ni_atmio_attach(struct comedi_device *dev,
         return 0;
 }
 
-static int ni_getboardtype(struct comedi_device *dev)
+static int ni_atmio_detach(struct comedi_device *dev)
 {
-        int device_id = ni_read_eeprom(dev, 511);
-        int i;
+        mio_common_detach(dev);
 
-        for (i = 0; i < n_ni_boards; i++) {
-                if (ni_boards[i].device_id == device_id)
-                        return i;
+        if (dev->iobase)
+                release_region(dev->iobase, NI_SIZE);
+        if (dev->irq)
+                free_irq(dev->irq, dev);
 
-        }
-        if (device_id == 255)
-                printk(" can't find board\n");
-         else if (device_id == 0)
-                printk(" EEPROM read error (?) or device not found\n");
-         else
-                printk(" unknown device ID %d -- contact author\n", device_id);
+        if (devpriv->isapnp_dev)
+                pnp_device_detach(devpriv->isapnp_dev);
 
-        return -1;
+        return 0;
 }
+
+static struct comedi_driver ni_atmio_driver = {
+        .driver_name    = "ni_atmio",
+        .module         = THIS_MODULE,
+        .attach         = ni_atmio_attach,
+        .detach         = ni_atmio_detach,
+};
+module_comedi_driver(ni_atmio_driver);