Staging: Merge staging-next into Linus's tree

[pandora-kernel.git] / drivers / staging / comedi / drivers / cb_pcidda.c

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index c374bee..2d35143 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -280,7 +280,7 @@ static int cb_pcidda_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
 
        printk("comedi%d: cb_pcidda: ", dev->minor);
@@ -296,9 +296,7 @@ static int cb_pcidda_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) {
                if (pcidev->vendor == PCI_VENDOR_ID_CB) {
                        if (it->options[0] || it->options[1]) {
                                if (pcidev->bus->number != it->options[0] ||
@@ -856,4 +854,44 @@ static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel,
  * A convenient macro that defines init_module() and cleanup_module(),
  * as necessary.
  */
-COMEDI_PCI_INITCLEANUP(driver_cb_pcidda, cb_pcidda_pci_table);
+static int __devinit driver_cb_pcidda_pci_probe(struct pci_dev *dev,
+                                               const struct pci_device_id *ent)
+{
+       return comedi_pci_auto_config(dev, driver_cb_pcidda.driver_name);
+}
+
+static void __devexit driver_cb_pcidda_pci_remove(struct pci_dev *dev)
+{
+       comedi_pci_auto_unconfig(dev);
+}
+
+static struct pci_driver driver_cb_pcidda_pci_driver = {
+       .id_table = cb_pcidda_pci_table,
+       .probe = &driver_cb_pcidda_pci_probe,
+       .remove = __devexit_p(&driver_cb_pcidda_pci_remove)
+};
+
+static int __init driver_cb_pcidda_init_module(void)
+{
+       int retval;
+
+       retval = comedi_driver_register(&driver_cb_pcidda);
+       if (retval < 0)
+               return retval;
+
+       driver_cb_pcidda_pci_driver.name = (char *)driver_cb_pcidda.driver_name;
+       return pci_register_driver(&driver_cb_pcidda_pci_driver);
+}
+
+static void __exit driver_cb_pcidda_cleanup_module(void)
+{
+       pci_unregister_driver(&driver_cb_pcidda_pci_driver);
+       comedi_driver_unregister(&driver_cb_pcidda);
+}
+
+module_init(driver_cb_pcidda_init_module);
+module_exit(driver_cb_pcidda_cleanup_module);
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");