Commit 7b0be12b authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/comedi/amplc: Convert pci_table entries to PCI_DEVICE (if PCI_ANY_ID is used) 



This patch converts pci_table entries to use the PCI_DEVICE macro,
if .subvendor and .subdevice are set to PCI_ANY_ID,
and thus improves readablity.

Since the driver_data field isn't used anywhere we can also drop the
assignments for class, class_mask and driver_data.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8c0690ea

drivers/staging/comedi/drivers/amplc_dio200.c

+3 −6
Original line number Diff line number Diff line
@@ -421,12 +421,9 @@ static const struct dio200_layout_struct dio200_layouts[] = { 


#ifdef CONFIG_COMEDI_PCI

static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {

	{

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215,

		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272,

		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272) },

	{0}

};



MODULE_DEVICE_TABLE(pci, dio200_pci_table);

drivers/staging/comedi/drivers/amplc_pc236.c

+2 −4
Original line number Diff line number Diff line
@@ -134,10 +134,8 @@ static const struct pc236_board pc236_boards[] = { 


#ifdef CONFIG_COMEDI_PCI

static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {

	{

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236,

		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236) },

	{0}

};



MODULE_DEVICE_TABLE(pci, pc236_pci_table);

drivers/staging/comedi/drivers/amplc_pc263.c

+2 −4
Original line number Diff line number Diff line
@@ -101,10 +101,8 @@ static const struct pc263_board pc263_boards[] = { 


#ifdef CONFIG_COMEDI_PCI

static DEFINE_PCI_DEVICE_TABLE(pc263_pci_table) = {

	{

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263,

		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263) },

	{0}

};



MODULE_DEVICE_TABLE(pci, pc263_pci_table);

drivers/staging/comedi/drivers/amplc_pci224.c

+3 −6
Original line number Diff line number Diff line
@@ -384,12 +384,9 @@ static const struct pci224_board pci224_boards[] = { 
 */



static DEFINE_PCI_DEVICE_TABLE(pci224_pci_table) = {

	{

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224,

		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234,

		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234) },

	{0}

};



MODULE_DEVICE_TABLE(pci, pci224_pci_table);

drivers/staging/comedi/drivers/amplc_pci230.c

+3 −6
Original line number Diff line number Diff line
@@ -501,12 +501,9 @@ static const struct pci230_board pci230_boards[] = { 
};



static DEFINE_PCI_DEVICE_TABLE(pci230_pci_table) = {

	{

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230, PCI_ANY_ID,

		    PCI_ANY_ID, 0, 0, 0}, {

	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260, PCI_ANY_ID,

		    PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260) },

	{0}

};



MODULE_DEVICE_TABLE(pci, pci230_pci_table);