leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: adl_pci9118: remove 'device_id' from boardinfo

Browse Source 
This member of the boardinfo is the same for all entries. Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-09-04 10:39:35 -07:00 committed by Greg Kroah-Hartman
parent 83defe8333
commit 8bd1e1dfca
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/adl_pci9118.c
View File

@ -236,7 +236,6 @@ enum pci9118_boardid {
struct boardtype { struct boardtype {
const char *name; /* board name */ const char *name; /* board name */
int device_id; /* PCI device ID of card */
unsigned int ai_is_16bit:1; unsigned int ai_is_16bit:1;
unsigned int is_hg:1; unsigned int is_hg:1;
}; };
@ -244,16 +243,13 @@ struct boardtype {
static const struct boardtype boardtypes[] = { static const struct boardtype boardtypes[] = {
[BOARD_PCI9118DG] = { [BOARD_PCI9118DG] = {
.name = "pci9118dg", .name = "pci9118dg",
.device_id = 0x80d9,
}, },
[BOARD_PCI9118HG] = { [BOARD_PCI9118HG] = {
.name = "pci9118hg", .name = "pci9118hg",
.device_id = 0x80d9,
.is_hg = 1, .is_hg = 1,
}, },
[BOARD_PCI9118HR] = { [BOARD_PCI9118HR] = {
.name = "pci9118hr", .name = "pci9118hr",
.device_id = 0x80d9,
.ai_is_16bit = 1, .ai_is_16bit = 1,
}, },
}; };
@ -1743,7 +1739,6 @@ static int pci9118_reset(struct comedi_device *dev)
static struct pci_dev *pci9118_find_pci(struct comedi_device *dev, static struct pci_dev *pci9118_find_pci(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
const struct boardtype *this_board = comedi_board(dev);
struct pci_dev *pcidev = NULL; struct pci_dev *pcidev = NULL;
int bus = it->options[0]; int bus = it->options[0];
int slot = it->options[1]; int slot = it->options[1];
@ -1751,7 +1746,7 @@ static struct pci_dev *pci9118_find_pci(struct comedi_device *dev,
for_each_pci_dev(pcidev) { for_each_pci_dev(pcidev) {
if (pcidev->vendor != PCI_VENDOR_ID_AMCC) if (pcidev->vendor != PCI_VENDOR_ID_AMCC)
continue; continue;
if (pcidev->device != this_board->device_id) if (pcidev->device != 0x80d9)
continue; continue;
if (bus || slot) { if (bus || slot) {
/* requested particular bus/slot */ /* requested particular bus/slot */