Merge tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux into fixes

[firefly-linux-kernel-4.4.55.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 8c09c026508a228930576e58e3eeba4de9ba5d69..e0e64752e3103032e2724c6f9c541a7d1064ab74 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -96,9 +96,7 @@ static int cnt_auto_attach(struct comedi_device *dev,
        struct comedi_subdevice *s;
        int ret;
 
-       dev->board_name = dev->driver->driver_name;
-
-       ret = comedi_pci_enable(pcidev, dev->board_name);
+       ret = comedi_pci_enable(dev);
        if (ret)
                return ret;
        dev->iobase = pci_resource_start(pcidev, 0);
@@ -131,27 +129,18 @@ static int cnt_auto_attach(struct comedi_device *dev,
        return 0;
 }
 
-static void cnt_detach(struct comedi_device *dev)
-{
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-
-       if (pcidev) {
-               if (dev->iobase)
-                       comedi_pci_disable(pcidev);
-       }
-}
-
 static struct comedi_driver ke_counter_driver = {
        .driver_name    = "ke_counter",
        .module         = THIS_MODULE,
        .auto_attach    = cnt_auto_attach,
-       .detach         = cnt_detach,
+       .detach         = comedi_pci_disable,
 };
 
 static int ke_counter_pci_probe(struct pci_dev *dev,
-                                         const struct pci_device_id *ent)
+                               const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ke_counter_driver);
+       return comedi_pci_auto_config(dev, &ke_counter_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ke_counter_pci_table) = {