Commit 24637007 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: 8250_exar: Make use of PCI_DEVICE_DATA() macro 



Since PCI core provides a generic PCI_DEVICE_DATA() macro,
replace contents of EXAR_DEVICE() with former one.

No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200512140252.67631-1-andriy.shevchenko@linux.intel.com


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

drivers/tty/serial/8250/8250_exar.c

+31 −34
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 


#include "8250.h"



#define PCI_DEVICE_ID_ACCES_COM_2S		0x1052

#define PCI_DEVICE_ID_ACCES_COM_4S		0x105d

#define PCI_DEVICE_ID_ACCES_COM_8S		0x106c

#define PCI_DEVICE_ID_ACCES_COM232_8		0x10a8

#define PCI_DEVICE_ID_ACCES_COM_2SM		0x10d2

#define PCI_DEVICE_ID_ACCES_COM_4SM		0x10db

#define PCI_DEVICE_ID_ACCES_COM_8SM		0x10ea

#define PCI_DEVICE_ID_ACCESSIO_COM_2S		0x1052

#define PCI_DEVICE_ID_ACCESSIO_COM_4S		0x105d

#define PCI_DEVICE_ID_ACCESSIO_COM_8S		0x106c

#define PCI_DEVICE_ID_ACCESSIO_COM232_8		0x10a8

#define PCI_DEVICE_ID_ACCESSIO_COM_2SM		0x10d2

#define PCI_DEVICE_ID_ACCESSIO_COM_4SM		0x10db

#define PCI_DEVICE_ID_ACCESSIO_COM_8SM		0x10ea



#define PCI_DEVICE_ID_COMMTECH_4224PCI335	0x0002

#define PCI_DEVICE_ID_COMMTECH_4222PCI335	0x0004
@@ -755,9 +755,7 @@ static const struct exar8250_board pbn_exar_XR17V8358 = { 
		(kernel_ulong_t)&bd					\

	}



#define EXAR_DEVICE(vend, devid, bd) {					\

	PCI_VDEVICE(vend, PCI_DEVICE_ID_##devid), (kernel_ulong_t)&bd	\

	}

#define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }



#define IBM_DEVICE(devid, sdevid, bd) {			\

	PCI_DEVICE_SUB(					\
@@ -769,14 +767,13 @@ static const struct exar8250_board pbn_exar_XR17V8358 = { 
	}



static const struct pci_device_id exar_pci_tbl[] = {

	EXAR_DEVICE(ACCESSIO, ACCES_COM_2S, acces_com_2x),

	EXAR_DEVICE(ACCESSIO, ACCES_COM_4S, acces_com_4x),

	EXAR_DEVICE(ACCESSIO, ACCES_COM_8S, acces_com_8x),

	EXAR_DEVICE(ACCESSIO, ACCES_COM232_8, acces_com_8x),

	EXAR_DEVICE(ACCESSIO, ACCES_COM_2SM, acces_com_2x),

	EXAR_DEVICE(ACCESSIO, ACCES_COM_4SM, acces_com_4x),

	EXAR_DEVICE(ACCESSIO, ACCES_COM_8SM, acces_com_8x),



	EXAR_DEVICE(ACCESSIO, COM_2S, acces_com_2x),

	EXAR_DEVICE(ACCESSIO, COM_4S, acces_com_4x),

	EXAR_DEVICE(ACCESSIO, COM_8S, acces_com_8x),

	EXAR_DEVICE(ACCESSIO, COM232_8, acces_com_8x),

	EXAR_DEVICE(ACCESSIO, COM_2SM, acces_com_2x),

	EXAR_DEVICE(ACCESSIO, COM_4SM, acces_com_4x),

	EXAR_DEVICE(ACCESSIO, COM_8SM, acces_com_8x),



	CONNECT_DEVICE(XR17C152, UART_2_232, pbn_connect),

	CONNECT_DEVICE(XR17C154, UART_4_232, pbn_connect),
@@ -794,24 +791,24 @@ static const struct pci_device_id exar_pci_tbl[] = { 
	IBM_DEVICE(XR17C152, SATURN_SERIAL_ONE_PORT, pbn_exar_ibm_saturn),



	/* Exar Corp. XR17C15[248] Dual/Quad/Octal UART */

	EXAR_DEVICE(EXAR, EXAR_XR17C152, pbn_exar_XR17C15x),

	EXAR_DEVICE(EXAR, EXAR_XR17C154, pbn_exar_XR17C15x),

	EXAR_DEVICE(EXAR, EXAR_XR17C158, pbn_exar_XR17C15x),

	EXAR_DEVICE(EXAR, XR17C152, pbn_exar_XR17C15x),

	EXAR_DEVICE(EXAR, XR17C154, pbn_exar_XR17C15x),

	EXAR_DEVICE(EXAR, XR17C158, pbn_exar_XR17C15x),



	/* Exar Corp. XR17V[48]35[248] Dual/Quad/Octal/Hexa PCIe UARTs */

	EXAR_DEVICE(EXAR, EXAR_XR17V352, pbn_exar_XR17V35x),

	EXAR_DEVICE(EXAR, EXAR_XR17V354, pbn_exar_XR17V35x),

	EXAR_DEVICE(EXAR, EXAR_XR17V358, pbn_exar_XR17V35x),

	EXAR_DEVICE(EXAR, EXAR_XR17V4358, pbn_exar_XR17V4358),

	EXAR_DEVICE(EXAR, EXAR_XR17V8358, pbn_exar_XR17V8358),

	EXAR_DEVICE(COMMTECH, COMMTECH_4222PCIE, pbn_exar_XR17V35x),

	EXAR_DEVICE(COMMTECH, COMMTECH_4224PCIE, pbn_exar_XR17V35x),

	EXAR_DEVICE(COMMTECH, COMMTECH_4228PCIE, pbn_exar_XR17V35x),



	EXAR_DEVICE(COMMTECH, COMMTECH_4222PCI335, pbn_fastcom335_2),

	EXAR_DEVICE(COMMTECH, COMMTECH_4224PCI335, pbn_fastcom335_4),

	EXAR_DEVICE(COMMTECH, COMMTECH_2324PCI335, pbn_fastcom335_4),

	EXAR_DEVICE(COMMTECH, COMMTECH_2328PCI335, pbn_fastcom335_8),

	EXAR_DEVICE(EXAR, XR17V352, pbn_exar_XR17V35x),

	EXAR_DEVICE(EXAR, XR17V354, pbn_exar_XR17V35x),

	EXAR_DEVICE(EXAR, XR17V358, pbn_exar_XR17V35x),

	EXAR_DEVICE(EXAR, XR17V4358, pbn_exar_XR17V4358),

	EXAR_DEVICE(EXAR, XR17V8358, pbn_exar_XR17V8358),

	EXAR_DEVICE(COMMTECH, 4222PCIE, pbn_exar_XR17V35x),

	EXAR_DEVICE(COMMTECH, 4224PCIE, pbn_exar_XR17V35x),

	EXAR_DEVICE(COMMTECH, 4228PCIE, pbn_exar_XR17V35x),



	EXAR_DEVICE(COMMTECH, 4222PCI335, pbn_fastcom335_2),

	EXAR_DEVICE(COMMTECH, 4224PCI335, pbn_fastcom335_4),

	EXAR_DEVICE(COMMTECH, 2324PCI335, pbn_fastcom335_4),

	EXAR_DEVICE(COMMTECH, 2328PCI335, pbn_fastcom335_8),

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, exar_pci_tbl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE