Commit 8c0690ea authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/comedi/adl: 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 71d4c80d

drivers/staging/comedi/drivers/adl_pci7230.c

+1 −9
Original line number Diff line number Diff line
@@ -44,15 +44,7 @@ Configuration Options: 
#define PCI_DEVICE_ID_PCI7230 0x7230



static DEFINE_PCI_DEVICE_TABLE(adl_pci7230_pci_table) = {

	{

		PCI_VENDOR_ID_ADLINK,

		PCI_DEVICE_ID_PCI7230,

		PCI_ANY_ID,

		PCI_ANY_ID,

		0,

		0,

		0

	},

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7230) },

	{0}

};

drivers/staging/comedi/drivers/adl_pci7296.c

+2 −4
Original line number Diff line number Diff line
@@ -49,10 +49,8 @@ Configuration Options: 
#define PCI_DEVICE_ID_PCI7296 0x7296



static DEFINE_PCI_DEVICE_TABLE(adl_pci7296_pci_table) = {

	{

	PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296, PCI_ANY_ID,

		    PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296) },

	{0}

};



MODULE_DEVICE_TABLE(pci, adl_pci7296_pci_table);

drivers/staging/comedi/drivers/adl_pci7432.c

+2 −4
Original line number Diff line number Diff line
@@ -44,10 +44,8 @@ Configuration Options: 
#define PCI_DEVICE_ID_PCI7432 0x7432



static DEFINE_PCI_DEVICE_TABLE(adl_pci7432_pci_table) = {

	{

	PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432, PCI_ANY_ID,

		    PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432) },

	{0}

};



MODULE_DEVICE_TABLE(pci, adl_pci7432_pci_table);

drivers/staging/comedi/drivers/adl_pci8164.c

+2 −4
Original line number Diff line number Diff line
@@ -57,10 +57,8 @@ Configuration Options: 
#define PCI_DEVICE_ID_PCI8164 0x8164



static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = {

	{

	PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164, PCI_ANY_ID,

		    PCI_ANY_ID, 0, 0, 0}, {

	0}

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164) },

	{0}

};



MODULE_DEVICE_TABLE(pci, adl_pci8164_pci_table);

drivers/staging/comedi/drivers/adl_pci9111.c

+2 −4
Original line number Diff line number Diff line
@@ -311,10 +311,8 @@ static const struct comedi_lrange pci9111_hr_ai_range = { 
};



static DEFINE_PCI_DEVICE_TABLE(pci9111_pci_table) = {

	{ PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,

	  0, 0, 0 },

	/* { PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,

	 *   0, 0, 0 }, */

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID) },

	/* { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID) }, */

	{ 0 }

};