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

mxser: add MOXA prefix to some PCI device IDs 



Some of the MOXA PCI device IDs contain _MOXA_, some don't. Add it to
the latter, so that they are all unified.

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


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

drivers/tty/mxser.c

+16 −16
Original line number Diff line number Diff line
@@ -159,14 +159,14 @@ 
#define MXSER_BAUD_BASE		921600

#define MXSER_CUSTOM_DIVISOR	(MXSER_BAUD_BASE * 16)



#define PCI_DEVICE_ID_POS104UL	0x1044

#define PCI_DEVICE_ID_CB108	0x1080

#define PCI_DEVICE_ID_CP102UF	0x1023

#define PCI_DEVICE_ID_CP112UL	0x1120

#define PCI_DEVICE_ID_CB114	0x1142

#define PCI_DEVICE_ID_CP114UL	0x1143

#define PCI_DEVICE_ID_CB134I	0x1341

#define PCI_DEVICE_ID_CP138U	0x1380

#define PCI_DEVICE_ID_MOXA_POS104UL	0x1044

#define PCI_DEVICE_ID_MOXA_CB108	0x1080

#define PCI_DEVICE_ID_MOXA_CP102UF	0x1023

#define PCI_DEVICE_ID_MOXA_CP112UL	0x1120

#define PCI_DEVICE_ID_MOXA_CB114	0x1142

#define PCI_DEVICE_ID_MOXA_CP114UL	0x1143

#define PCI_DEVICE_ID_MOXA_CB134I	0x1341

#define PCI_DEVICE_ID_MOXA_CP138U	0x1380



#define MXSER_NPORTS(ddata)		((ddata) & 0xffU)

#define MXSER_HIGHBAUD			0x0100
@@ -212,14 +212,14 @@ static const struct pci_device_id mxser_pcibrds[] = { 
	{ 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_CB108),	.driver_data = 8 },

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

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

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

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

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

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

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

	{ 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 },

	{ }

};

MODULE_DEVICE_TABLE(pci, mxser_pcibrds);