Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / drivers / staging / comedi / drivers / ke_counter.c

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 73b0445e310faf125d956c8b5c9b163bcc0a466b..286093bca3fba6eed4f0c3b2ef775270785090f0 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -96,7 +96,43 @@ static struct comedi_driver cnt_driver = {
        .detach = cnt_detach,
 };
 
-COMEDI_PCI_INITCLEANUP(cnt_driver, cnt_pci_table);
+static int __devinit cnt_driver_pci_probe(struct pci_dev *dev,
+                                         const struct pci_device_id *ent)
+{
+       return comedi_pci_auto_config(dev, cnt_driver.driver_name);
+}
+
+static void __devexit cnt_driver_pci_remove(struct pci_dev *dev)
+{
+       comedi_pci_auto_unconfig(dev);
+}
+
+static struct pci_driver cnt_driver_pci_driver = {
+       .id_table = cnt_pci_table,
+       .probe = &cnt_driver_pci_probe,
+       .remove = __devexit_p(&cnt_driver_pci_remove)
+};
+
+static int __init cnt_driver_init_module(void)
+{
+       int retval;
+
+       retval = comedi_driver_register(&cnt_driver);
+       if (retval < 0)
+               return retval;
+
+       cnt_driver_pci_driver.name = (char *)cnt_driver.driver_name;
+       return pci_register_driver(&cnt_driver_pci_driver);
+}
+
+static void __exit cnt_driver_cleanup_module(void)
+{
+       pci_unregister_driver(&cnt_driver_pci_driver);
+       comedi_driver_unregister(&cnt_driver);
+}
+
+module_init(cnt_driver_init_module);
+module_exit(cnt_driver_cleanup_module);
 
 /*-- counter write ----------------------------------------------------------*/
 
@@ -152,7 +188,7 @@ static int cnt_rinsn(struct comedi_device *dev,
 static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct comedi_subdevice *subdevice;
-       struct pci_dev *pci_device;
+       struct pci_dev *pci_device = NULL;
        struct cnt_board_struct *board;
        unsigned long io_base;
        int error, i;
@@ -163,9 +199,7 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                return error;
 
        /* Probe the device to determine what device in the series it is. */
-       for (pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pci_device != NULL;
-            pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_device)) {
+       for_each_pci_dev(pci_device) {
                if (pci_device->vendor == PCI_VENDOR_ID_KOLTER) {
                        for (i = 0; i < cnt_board_nbr; i++) {
                                if (cnt_boards[i].device_id ==
@@ -259,3 +293,7 @@ static int cnt_detach(struct comedi_device *dev)
               dev->minor);
        return 0;
 }
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");