From 86476d9f7cdffbe51396a1c0597d621a670d337d Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 16 Aug 2012 19:52:52 -0700 Subject: [PATCH] staging: comedi: cb_pcimdda: remove boardinfo The boardinfo struct and associated code is no longer needed by this driver. Remove it. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/cb_pcimdda.c | 38 +++++---------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c index 82fb5f6ff70e..e9f0a6826cec 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/drivers/staging/comedi/drivers/cb_pcimdda.c @@ -98,22 +98,6 @@ Configuration Options: #define PCIMDDA_DA_CHAN(x) (0x00 + (x) * 2) #define PCIMDDA_8255_BASE_REG 0x0c -/* - * This is straight from skel.c -- I did this in case this source file - * will someday support more than 1 board... - */ -struct cb_pcimdda_board { - const char *name; - unsigned short device_id; -}; - -static const struct cb_pcimdda_board cb_pcimdda_boards[] = { - { - .name = "cb_pcimdda06-16", - .device_id = PCI_ID_PCIM_DDA06_16, - } -}; - /* * this structure is for data unique to this hardware driver. If * several hardware drivers keep similar information in this structure, @@ -197,24 +181,20 @@ static struct pci_dev *cb_pcimdda_probe(struct comedi_device *dev, struct comedi_devconfig *it) { struct pci_dev *pcidev = NULL; - int index; for_each_pci_dev(pcidev) { if (pcidev->vendor != PCI_VENDOR_ID_COMPUTERBOARDS) continue; - for (index = 0; index < ARRAY_SIZE(cb_pcimdda_boards); index++) { - if (cb_pcimdda_boards[index].device_id != pcidev->device) + if (pcidev->device != PCI_ID_PCIM_DDA06_16) + continue; + if (it->options[0] || it->options[1]) { + if (pcidev->bus->number != it->options[0] || + PCI_SLOT(pcidev->devfn) != it->options[1]) { continue; - if (it->options[0] || it->options[1]) { - if (pcidev->bus->number != it->options[0] || - PCI_SLOT(pcidev->devfn) != it->options[1]) { - continue; - } } - - dev->board_ptr = cb_pcimdda_boards + index; - return pcidev; } + + return pcidev; } return NULL; } @@ -222,7 +202,6 @@ static struct pci_dev *cb_pcimdda_probe(struct comedi_device *dev, static int cb_pcimdda_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - const struct cb_pcimdda_board *thisboard; struct cb_pcimdda_private *devpriv; struct pci_dev *pcidev; struct comedi_subdevice *s; @@ -237,8 +216,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev, if (!pcidev) return -EIO; comedi_set_hw_dev(dev, &pcidev->dev); - thisboard = comedi_board(dev); - dev->board_name = thisboard->name; + dev->board_name = dev->driver->driver_name; ret = comedi_pci_enable(pcidev, dev->board_name); if (ret) -- 2.39.5