Staging: comedi: use for_each_pci_dev()

[mirror_ubuntu-zesty-kernel.git] / drivers / staging / comedi / drivers / cb_pcimdas.c

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 2e61727fc9a0f72be8d59412f0da0c13e32f4514..ced346a7cae36550bc93311e7cf4e62142233078 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -52,6 +52,8 @@ See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more
 /* #define CBPCIMDAS_DEBUG */
 #undef CBPCIMDAS_DEBUG
 
+#define PCI_VENDOR_ID_COMPUTERBOARDS   0x1307
+
 /* Registers for the PCIM-DAS1602/16 */
 
 /* sizes of io regions (bytes) */
@@ -208,7 +210,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
                             struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
        /* int i; */
 
@@ -225,9 +227,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
  */
        printk("\n");
 
-       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;
@@ -489,4 +489,46 @@ static int cb_pcimdas_ao_rinsn(struct comedi_device *dev,
  * A convenient macro that defines init_module() and cleanup_module(),
  * as necessary.
  */
-COMEDI_PCI_INITCLEANUP(driver_cb_pcimdas, cb_pcimdas_pci_table);
+static int __devinit driver_cb_pcimdas_pci_probe(struct pci_dev *dev,
+                                                const struct pci_device_id
+                                                *ent)
+{
+       return comedi_pci_auto_config(dev, driver_cb_pcimdas.driver_name);
+}
+
+static void __devexit driver_cb_pcimdas_pci_remove(struct pci_dev *dev)
+{
+       comedi_pci_auto_unconfig(dev);
+}
+
+static struct pci_driver driver_cb_pcimdas_pci_driver = {
+       .id_table = cb_pcimdas_pci_table,
+       .probe = &driver_cb_pcimdas_pci_probe,
+       .remove = __devexit_p(&driver_cb_pcimdas_pci_remove)
+};
+
+static int __init driver_cb_pcimdas_init_module(void)
+{
+       int retval;
+
+       retval = comedi_driver_register(&driver_cb_pcimdas);
+       if (retval < 0)
+               return retval;
+
+       driver_cb_pcimdas_pci_driver.name =
+           (char *)driver_cb_pcimdas.driver_name;
+       return pci_register_driver(&driver_cb_pcimdas_pci_driver);
+}
+
+static void __exit driver_cb_pcimdas_cleanup_module(void)
+{
+       pci_unregister_driver(&driver_cb_pcimdas_pci_driver);
+       comedi_driver_unregister(&driver_cb_pcimdas);
+}
+
+module_init(driver_cb_pcimdas_init_module);
+module_exit(driver_cb_pcimdas_cleanup_module);
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");