Staging: comedi: Remove COMEDI_PCI_INITCLEANUP macro

[deliverable/linux.git] / drivers / staging / comedi / drivers / cb_pcidas64.c

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 3443fc1b9186fb08c197086c7de4d029a7221968..ba7c48ab6d92af631939c7af91b34f01d52ef8d8 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1183,8 +1183,8 @@ static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 static irqreturn_t handle_interrupt(int irq, void *d);
 static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
 static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
-static int dio_callback(int dir, int port, int data, void __iomem *base);
-static int dio_callback_4020(int dir, int port, int data, void __iomem *base);
+static int dio_callback(int dir, int port, int data, unsigned long arg);
+static int dio_callback_4020(int dir, int port, int data, unsigned long arg);
 static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
                    struct comedi_insn *insn, unsigned int *data);
 static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
@@ -1237,7 +1237,43 @@ static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags);
 static void load_ao_dma(struct comedi_device *dev,
                        const struct comedi_cmd *cmd);
 
-COMEDI_PCI_INITCLEANUP(driver_cb_pcidas, pcidas64_pci_table);
+static int __devinit driver_cb_pcidas_pci_probe(struct pci_dev *dev,
+                                               const struct pci_device_id *ent)
+{
+       return comedi_pci_auto_config(dev, driver_cb_pcidas.driver_name);
+}
+
+static void __devexit driver_cb_pcidas_pci_remove(struct pci_dev *dev)
+{
+       comedi_pci_auto_unconfig(dev);
+}
+
+static struct pci_driver driver_cb_pcidas_pci_driver = {
+       .id_table = pcidas64_pci_table,
+       .probe = &driver_cb_pcidas_pci_probe,
+       .remove = __devexit_p(&driver_cb_pcidas_pci_remove)
+};
+
+static int __init driver_cb_pcidas_init_module(void)
+{
+       int retval;
+
+       retval = comedi_driver_register(&driver_cb_pcidas);
+       if (retval < 0)
+               return retval;
+
+       driver_cb_pcidas_pci_driver.name = (char *)driver_cb_pcidas.driver_name;
+       return pci_register_driver(&driver_cb_pcidas_pci_driver);
+}
+
+static void __exit driver_cb_pcidas_cleanup_module(void)
+{
+       pci_unregister_driver(&driver_cb_pcidas_pci_driver);
+       comedi_driver_unregister(&driver_cb_pcidas);
+}
+
+module_init(driver_cb_pcidas_init_module);
+module_exit(driver_cb_pcidas_cleanup_module);
 
 static unsigned int ai_range_bits_6xxx(const struct comedi_device *dev,
                                       unsigned int range_index)
@@ -3658,8 +3694,9 @@ static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
        return 0;
 }
 
-static int dio_callback(int dir, int port, int data, void __iomem *iobase)
+static int dio_callback(int dir, int port, int data, unsigned long arg)
 {
+       void __iomem *iobase = (void __iomem *)arg;
        if (dir) {
                writeb(data, iobase + port);
                DEBUG_PRINT("wrote 0x%x to port %i\n", data, port);
@@ -3669,8 +3706,9 @@ static int dio_callback(int dir, int port, int data, void __iomem *iobase)
        }
 }
 
-static int dio_callback_4020(int dir, int port, int data, void __iomem *iobase)
+static int dio_callback_4020(int dir, int port, int data, unsigned long arg)
 {
+       void __iomem *iobase = (void __iomem *)arg;
        if (dir) {
                writew(data, iobase + 2 * port);
                return 0;
@@ -4301,3 +4339,7 @@ static void i2c_write(struct comedi_device *dev, unsigned int address,
        }
        i2c_stop(dev);
 }
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");