diff options
| author | Ian Abbott <[email protected]> | 2014-07-25 10:04:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-07-27 11:28:38 -0700 |
| commit | 62b5e46322f1655639ae749f7f1dda1a6a5eb932 (patch) | |
| tree | 0f8b84f9eb0555e9157a2adba85ac9d968ef7426 | |
| parent | b4eafd11351d90a652657cc2a12728c51000d5e3 (diff) | |
staging: comedi: amplc_pc236: remove PCI device ID macros
The `PCI_DEVICE_ID_AMPLICON_PCI236` macro is only used once, in the
module device table, so remove it and expand the macro in the table.
`The `PCI_DEVICE_ID_INVALID` macro is no longer used, so remove it.
Signed-off-by: Ian Abbott <[email protected]>
Reviewed-by: H Hartley Sweeten <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc236.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index 1aae066f6160..1a7fa45d3a7a 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -57,10 +57,6 @@ #define DO_ISA IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_ISA) #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI) -/* PCI236 PCI configuration register information */ -#define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009 -#define PCI_DEVICE_ID_INVALID 0xffff - /* PC36AT / PCI236 registers */ /* Disable, and clear, interrupts */ @@ -407,8 +403,8 @@ static struct comedi_driver amplc_pc236_driver = { #if DO_PCI static const struct pci_device_id pc236_pci_table[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236) }, - {0} + { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, 0x0009) }, + { 0 } }; MODULE_DEVICE_TABLE(pci, pc236_pci_table); |