diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2014-07-31 17:47:53 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 23:23:09 +0400 |
| commit | dce75412aa80d0e569d09cc5ef296b52d4c71126 (patch) | |
| tree | 0bb7ccca12af76ab7169b1a9bbffe7fb1abcffbe | |
| parent | 930771fb905be0e1c09a2fe84c17b578d7a0fdd6 (diff) | |
| download | linux-dce75412aa80d0e569d09cc5ef296b52d4c71126.tar.xz | |
staging: comedi: amplc_pci224: remove PCI_DEVICE_ID_... macros
The macros `PCI_DEVICE_ID_AMPLICON_PCI224` and
`PCI_DEVICE_ID_AMPLICON_PCI234` are only used in the PCI module device
table `amplc_pci224_pci_table[]`. Just expand the macros where they are
used and remove them. The macro `PCI_DEVICE_ID_INVALID` is no longer
used either, so remove it.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci224.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index 675bbe896b18..caca0c92b613 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c @@ -113,13 +113,6 @@ #include "8253.h" /* - * PCI IDs. - */ -#define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007 -#define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008 -#define PCI_DEVICE_ID_INVALID 0xffff - -/* * PCI224/234 i/o space 1 (PCIBAR2) registers. */ #define PCI224_Z2_CT0 0x14 /* 82C54 counter/timer 0 */ @@ -1215,8 +1208,8 @@ static int amplc_pci224_pci_probe(struct pci_dev *dev, } static const struct pci_device_id amplc_pci224_pci_table[] = { - { PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224), pci224_model }, - { PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234), pci234_model }, + { PCI_VDEVICE(AMPLICON, 0x0007), pci224_model }, + { PCI_VDEVICE(AMPLICON, 0x0008), pci234_model }, { 0 } }; MODULE_DEVICE_TABLE(pci, amplc_pci224_pci_table); |