Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra

[sfrench/cifs-2.6.git] / drivers / staging / comedi / drivers / cb_pcimdda.c

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index f404ec7723e52cb1c3a8481e730c58ad0b8af6db..8c981a89ab63cad9f459c0937c8a9e65ec4d8a2f 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -195,7 +195,45 @@ MODULE_DESCRIPTION("Comedi low-level driver for the Computerboards PCIM-DDA "
                   "series.  Currently only supports PCIM-DDA06-16 (which "
                   "also happens to be the only board in this series. :) ) ");
 MODULE_LICENSE("GPL");
-COMEDI_PCI_INITCLEANUP_NOMODULE(cb_pcimdda_driver, pci_table);
+static int __devinit cb_pcimdda_driver_pci_probe(struct pci_dev *dev,
+                                                const struct pci_device_id
+                                                *ent)
+{
+       return comedi_pci_auto_config(dev, cb_pcimdda_driver.driver_name);
+}
+
+static void __devexit cb_pcimdda_driver_pci_remove(struct pci_dev *dev)
+{
+       comedi_pci_auto_unconfig(dev);
+}
+
+static struct pci_driver cb_pcimdda_driver_pci_driver = {
+       .id_table = pci_table,
+       .probe = &cb_pcimdda_driver_pci_probe,
+       .remove = __devexit_p(&cb_pcimdda_driver_pci_remove)
+};
+
+static int __init cb_pcimdda_driver_init_module(void)
+{
+       int retval;
+
+       retval = comedi_driver_register(&cb_pcimdda_driver);
+       if (retval < 0)
+               return retval;
+
+       cb_pcimdda_driver_pci_driver.name =
+           (char *)cb_pcimdda_driver.driver_name;
+       return pci_register_driver(&cb_pcimdda_driver_pci_driver);
+}
+
+static void __exit cb_pcimdda_driver_cleanup_module(void)
+{
+       pci_unregister_driver(&cb_pcimdda_driver_pci_driver);
+       comedi_driver_unregister(&cb_pcimdda_driver);
+}
+
+module_init(cb_pcimdda_driver_init_module);
+module_exit(cb_pcimdda_driver_cleanup_module);
 
 static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                    struct comedi_insn *insn, unsigned int *data);
@@ -426,13 +464,11 @@ static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
  */
 static int probe(struct comedi_device *dev, const struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
        unsigned long registers;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                /*  is it not a computer boards card? */
                if (pcidev->vendor != PCI_VENDOR_ID_COMPUTERBOARDS)
                        continue;