From: Ian Abbott Date: Thu, 31 Jul 2014 13:47:53 +0000 (+0100) Subject: staging: comedi: amplc_pci224: remove PCI_DEVICE_ID_... macros X-Git-Tag: firefly_0821_release~176^2~3121^2~1378 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dce75412aa80d0e569d09cc5ef296b52d4c71126;p=firefly-linux-kernel-4.4.55.git 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- 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 @@ -112,13 +112,6 @@ #include "comedi_fc.h" #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. */ @@ -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);