Commit 472cd3db authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: drivers: remove unnecessary PCI_DEVICE_ID_* defines 



These defines are only used once in the pci_device_id tables. Remove
them and just open code the values.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb3bd743

drivers/staging/comedi/drivers/amplc_dio200_pci.c

+5 −23
Original line number Diff line number Diff line
@@ -228,13 +228,6 @@ 


#include "amplc_dio200.h"



/* PCI IDs */

#define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a

#define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b

#define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011

#define PCI_DEVICE_ID_AMPLICON_PCIE215 0x0012

#define PCI_DEVICE_ID_AMPLICON_PCIE296 0x0014



/*

 * Board descriptions.

 */
@@ -440,22 +433,11 @@ static struct comedi_driver dio200_pci_comedi_driver = { 
};



static const struct pci_device_id dio200_pci_table[] = {

	{

		PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215),

		pci215_model

	}, {

		PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272),

		pci272_model

	}, {

		PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCIE236),

		pcie236_model

	}, {

		PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCIE215),

		pcie215_model

	}, {

		PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCIE296),

		pcie296_model

	},

	{ PCI_VDEVICE(AMPLICON, 0x000b), pci215_model },

	{ PCI_VDEVICE(AMPLICON, 0x000a), pci272_model },

	{ PCI_VDEVICE(AMPLICON, 0x0011), pcie236_model },

	{ PCI_VDEVICE(AMPLICON, 0x0012), pcie215_model },

	{ PCI_VDEVICE(AMPLICON, 0x0014), pcie296_model },

	{0}

};

drivers/staging/comedi/drivers/amplc_pci263.c

+1 −4
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ The state of the outputs can be read. 


#define PCI263_DRIVER_NAME	"amplc_pci263"



/* PCI263 PCI configuration register information */

#define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c



static int pci263_do_insn_bits(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn,
@@ -95,7 +92,7 @@ static struct comedi_driver amplc_pci263_driver = { 
};



static const struct pci_device_id pci263_pci_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, 0x000c) },

	{0}

};

MODULE_DEVICE_TABLE(pci, pci263_pci_table);

drivers/staging/comedi/drivers/contec_pci_dio.c

+1 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ Configuration Options: not applicable, uses comedi PCI auto config 


#include "../comedidev.h"



#define PCI_DEVICE_ID_PIO1616L 0x8172



/*

 * Register map

 */
@@ -110,7 +108,7 @@ static int contec_pci_dio_pci_probe(struct pci_dev *dev, 
}



static const struct pci_device_id contec_pci_dio_pci_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L) },

	{ PCI_DEVICE(PCI_VENDOR_ID_CONTEC, 0x8172) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, contec_pci_dio_pci_table);

drivers/staging/comedi/drivers/das08_pci.c

+1 −3
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 


#include "das08.h"



#define PCI_DEVICE_ID_PCIDAS08		0x0029



static const struct das08_board_struct das08_pci_boards[] = {

	{

		.name		= "pci-das08",
@@ -90,7 +88,7 @@ static int das08_pci_probe(struct pci_dev *dev, 
}



static const struct pci_device_id das08_pci_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_PCIDAS08) },

	{ PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0029) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, das08_pci_table);

drivers/staging/comedi/drivers/icp_multi.c

+1 −3
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ Configuration options: not applicable, uses PCI auto config 


#include "../comedidev.h"



#define PCI_DEVICE_ID_ICP_MULTI	0x8000



#define ICP_MULTI_ADC_CSR	0	/* R/W: ADC command/status register */

#define ICP_MULTI_AI		2	/* R:   Analogue input data */

#define ICP_MULTI_DAC_CSR	4	/* R/W: DAC command/status register */
@@ -594,7 +592,7 @@ static int icp_multi_pci_probe(struct pci_dev *dev, 
}



static const struct pci_device_id icp_multi_pci_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ICP, PCI_DEVICE_ID_ICP_MULTI) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ICP, 0x8000) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, icp_multi_pci_table);