Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dce75412 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 930771fb

drivers/staging/comedi/drivers/amplc_pci224.c

+2 −9
Original line number Diff line number Diff line
@@ -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);