Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / das08_pci.c

diff --git a/drivers/staging/comedi/drivers/das08_pci.c b/drivers/staging/comedi/drivers/das08_pci.c
index c405876ddcf7e21d25d93c6de196592261e099e8..53fa943dd0b7038393c6d58bbe81754c32a892f5 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_pci.c
+++ b/drivers/staging/comedi/drivers/das08_pci.c
@@ -46,7 +46,6 @@
 static const struct das08_board_struct das08_pci_boards[] = {
        {
                .name           = "pci-das08",
-               .id             = PCI_DEVICE_ID_PCIDAS08,
                .ai_nbits       = 12,
                .ai_pg          = das08_bipolar5,
                .ai_encoding    = das08_encode12,
@@ -72,7 +71,7 @@ static int das08_pci_auto_attach(struct comedi_device *dev,
        /* The das08 driver needs the board_ptr */
        dev->board_ptr = &das08_pci_boards[0];
 
-       ret = comedi_pci_enable(pdev, dev->driver->driver_name);
+       ret = comedi_pci_enable(dev);
        if (ret)
                return ret;
        dev->iobase = pci_resource_start(pdev, 2);
@@ -82,11 +81,8 @@ static int das08_pci_auto_attach(struct comedi_device *dev,
 
 static void das08_pci_detach(struct comedi_device *dev)
 {
-       struct pci_dev *pdev = comedi_to_pci_dev(dev);
-
        das08_common_detach(dev);
-       if (dev->iobase)
-               comedi_pci_disable(pdev);
+       comedi_pci_disable(dev);
 }
 
 static struct comedi_driver das08_pci_comedi_driver = {
@@ -97,9 +93,10 @@ static struct comedi_driver das08_pci_comedi_driver = {
 };
 
 static int das08_pci_probe(struct pci_dev *dev,
-                          const struct pci_device_id *ent)
+                          const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &das08_pci_comedi_driver);
+       return comedi_pci_auto_config(dev, &das08_pci_comedi_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {