From: H Hartley Sweeten Date: Thu, 29 May 2014 17:35:09 +0000 (-0700) Subject: staging: comedi: adl_pci9111: remove PCI9111_HR_DEVICE_ID define X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d76fdfcc6d774c2465e90bb7aa2e5ad7d1ff08cf;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: adl_pci9111: remove PCI9111_HR_DEVICE_ID define This define is only used in the pci_device_id table and doesn't add any additional clarity to the code. Remove the define and just open code the value. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index d005faadde48..53c61de1d047 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -75,8 +75,6 @@ TODO: #include "plx9052.h" #include "comedi_fc.h" -#define PCI9111_HR_DEVICE_ID 0x9111 - #define PCI9111_FIFO_HALF_SIZE 512 #define PCI9111_AI_ACQUISITION_PERIOD_MIN_NS 10000 @@ -883,7 +881,7 @@ static int pci9111_pci_probe(struct pci_dev *dev, } static const struct pci_device_id pci9111_pci_table[] = { - { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID) }, + { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x9111) }, /* { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID) }, */ { 0 } };