diff options
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc236.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index 51c22f9a9af1..1aae066f6160 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -85,7 +85,6 @@ enum pc236_bustype { isa_bustype, pci_bustype }; struct pc236_board { const char *name; - unsigned short devid; enum pc236_bustype bustype; }; @@ -96,12 +95,9 @@ static const struct pc236_board pc236_isa_boards[] = { }, }; -static const struct pc236_board pc236_pci_boards[] = { - { - .name = "pci236", - .devid = PCI_DEVICE_ID_AMPLICON_PCI236, - .bustype = pci_bustype, - }, +static const struct pc236_board pc236_pci_board = { + .name = "pci236", + .bustype = pci_bustype, }; struct pc236_private { @@ -122,19 +118,6 @@ static inline bool is_pci_board(const struct pc236_board *board) } /* - * This function looks for a board matching the supplied PCI device. - */ -static const struct pc236_board *pc236_find_pci_board(struct pci_dev *pci_dev) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(pc236_pci_boards); i++) - if (pci_dev->device == pc236_pci_boards[i].devid) - return &pc236_pci_boards[i]; - return NULL; -} - -/* * This function is called to mark the interrupt as disabled (no command * configured on subdevice 1) and to physically disable the interrupt * (not possible on the PC36AT, except by removing the IRQ jumper!). @@ -382,11 +365,7 @@ static int pc236_auto_attach(struct comedi_device *dev, if (!devpriv) return -ENOMEM; - dev->board_ptr = pc236_find_pci_board(pci_dev); - if (dev->board_ptr == NULL) { - dev_err(dev->class_dev, "BUG! cannot determine board type!\n"); - return -EINVAL; - } + dev->board_ptr = &pc236_pci_board; ret = comedi_pci_enable(dev); if (ret) return ret; |