Skip to content

Commit

Permalink
staging: comedi: dyna_pci10xx: remove PCI_VENDOR_ID_DYNALOG
Browse files Browse the repository at this point in the history
The PCI chip used on this board is from PLX Technologies Inc. As stated
in the comments of this driver, Dynalog does not have a registered PCI
vendor id so this board uses the PLX vendor id. The kernel provides an
id for that vendor in pci_ids.h (PCI_VENDOR_ID_PLX). Use it instead of
creating a duplicate with a different name.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent 2685331 commit 00f5c77
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/dyna_pci10xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
#include "../comedidev.h"
#include <linux/mutex.h>

#define PCI_VENDOR_ID_DYNALOG 0x10b5

#define READ_TIMEOUT 50

static const struct comedi_lrange range_pci1050_ai = { 3, {
Expand Down Expand Up @@ -283,7 +281,7 @@ static void __devexit dyna_pci10xx_pci_remove(struct pci_dev *dev)
}

static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_DYNALOG, 0x1050) },
{ PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);
Expand Down

0 comments on commit 00f5c77

Please sign in to comment.