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 / addi_apci_035.c

diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index 5a53e58258a08616aafc1962aa9519f22be06752..43c2c10a7c3264fa044fbc468adeb6affdd48207 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -15,9 +15,6 @@
 static const struct addi_board apci035_boardtypes[] = {
        {
                .pc_DriverName          = "apci035",
-               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-               .i_DeviceId             = 0x0300,
-               .i_IorangeBase0         = 127,
                .i_IorangeBase1         = APCI035_ADDRESS_RANGE,
                .i_PCIEeprom            = 1,
                .pc_EepromChip          = ADDIDATA_S5920,
@@ -39,20 +36,25 @@ static const struct addi_board apci035_boardtypes[] = {
        },
 };
 
+static int apci035_auto_attach(struct comedi_device *dev,
+                              unsigned long context)
+{
+       dev->board_ptr = &apci035_boardtypes[0];
+
+       return addi_auto_attach(dev, context);
+}
+
 static struct comedi_driver apci035_driver = {
        .driver_name    = "addi_apci_035",
        .module         = THIS_MODULE,
-       .auto_attach    = addi_auto_attach,
+       .auto_attach    = apci035_auto_attach,
        .detach         = i_ADDI_Detach,
-       .num_names      = ARRAY_SIZE(apci035_boardtypes),
-       .board_name     = &apci035_boardtypes[0].pc_DriverName,
-       .offset         = sizeof(struct addi_board),
 };
 
 static int apci035_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *ent)
+                            const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci035_driver);
+       return comedi_pci_auto_config(dev, &apci035_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = {