staging: comedi: addi_common: remove 'i_VendorId' and 'i_Device Id'

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

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index ddea64df9180cc6934de9303f91bc24843d64925..8de7b4875b0d5b3107c1a255698ec13cd0e713fa 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -13,8 +13,6 @@
 static const struct addi_board apci1564_boardtypes[] = {
        {
                .pc_DriverName          = "apci1564",
-               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-               .i_DeviceId             = 0x1006,
                .i_IorangeBase0         = 128,
                .i_IorangeBase1         = APCI1564_ADDRESS_RANGE,
                .i_PCIEeprom            = ADDIDATA_EEPROM,
@@ -36,20 +34,25 @@ static const struct addi_board apci1564_boardtypes[] = {
        },
 };
 
+static int apci1564_auto_attach(struct comedi_device *dev,
+                               unsigned long context)
+{
+       dev->board_ptr = &apci1564_boardtypes[0];
+
+       return addi_auto_attach(dev, context);
+}
+
 static struct comedi_driver apci1564_driver = {
        .driver_name    = "addi_apci_1564",
        .module         = THIS_MODULE,
-       .auto_attach    = addi_auto_attach,
+       .auto_attach    = apci1564_auto_attach,
        .detach         = i_ADDI_Detach,
-       .num_names      = ARRAY_SIZE(apci1564_boardtypes),
-       .board_name     = &apci1564_boardtypes[0].pc_DriverName,
-       .offset         = sizeof(struct addi_board),
 };
 
 static int apci1564_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci1564_driver);
+       return comedi_pci_auto_config(dev, &apci1564_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1564_pci_table) = {