Commit c668d567 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

mxser: use PCI_DEVICE_DATA 



Now that we have all the PCI device IDs unified, we can use
PCI_DEVICE_DATA() macro to simplify mxser's pci_device_id list, i.e.
mxser_pcibrds.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211118073125.12283-20-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4167bd25

drivers/tty/mxser.c

+26 −26
Original line number Diff line number Diff line
@@ -212,32 +212,32 @@ static const struct { 
/* driver_data correspond to the lines in the structure above

   see also ISA probe function before you change something */

static const struct pci_device_id mxser_pcibrds[] = {

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C168),	.driver_data = 8 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C104),	.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132),	.driver_data = 2 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114),	.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CT114),	.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102),	.driver_data = 2 | MXSER_HIGHBAUD },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104U),	.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168U),	.driver_data = 8 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132U),	.driver_data = 2 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134U),	.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104JU),.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_RC7000),	.driver_data = 8 }, /* RC7000 */

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118U),	.driver_data = 8 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102UL),.driver_data = 2 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102U),	.driver_data = 2 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL),.driver_data = 8 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL),.driver_data = 8 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL),.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CB108),	.driver_data = 8 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CB114),	.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CB134I),	.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP138U),	.driver_data = 8 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_POS104UL),.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114UL),.driver_data = 4 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102UF),.driver_data = 2 },

	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP112UL),.driver_data = 2 },

	{ PCI_DEVICE_DATA(MOXA, C168,		8) },

	{ PCI_DEVICE_DATA(MOXA, C104,		4) },

	{ PCI_DEVICE_DATA(MOXA, CP132,		2) },

	{ PCI_DEVICE_DATA(MOXA, CP114,		4) },

	{ PCI_DEVICE_DATA(MOXA, CT114,		4) },

	{ PCI_DEVICE_DATA(MOXA, CP102,		2 | MXSER_HIGHBAUD) },

	{ PCI_DEVICE_DATA(MOXA, CP104U,		4) },

	{ PCI_DEVICE_DATA(MOXA, CP168U,		8) },

	{ PCI_DEVICE_DATA(MOXA, CP132U,		2) },

	{ PCI_DEVICE_DATA(MOXA, CP134U,		4) },

	{ PCI_DEVICE_DATA(MOXA, CP104JU,	4) },

	{ PCI_DEVICE_DATA(MOXA, RC7000,		8) }, /* RC7000 */

	{ PCI_DEVICE_DATA(MOXA, CP118U,		8) },

	{ PCI_DEVICE_DATA(MOXA, CP102UL,	2) },

	{ PCI_DEVICE_DATA(MOXA, CP102U,		2) },

	{ PCI_DEVICE_DATA(MOXA, CP118EL,	8) },

	{ PCI_DEVICE_DATA(MOXA, CP168EL,	8) },

	{ PCI_DEVICE_DATA(MOXA, CP104EL,	4) },

	{ PCI_DEVICE_DATA(MOXA, CB108,		8) },

	{ PCI_DEVICE_DATA(MOXA, CB114,		4) },

	{ PCI_DEVICE_DATA(MOXA, CB134I,		4) },

	{ PCI_DEVICE_DATA(MOXA, CP138U,		8) },

	{ PCI_DEVICE_DATA(MOXA, POS104UL,	4) },

	{ PCI_DEVICE_DATA(MOXA, CP114UL,	4) },

	{ PCI_DEVICE_DATA(MOXA, CP102UF,	2) },

	{ PCI_DEVICE_DATA(MOXA, CP112UL,	2) },

	{ }

};

MODULE_DEVICE_TABLE(pci, mxser_pcibrds);