Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

serial: 8250_lpss: Get rid of custom LPSS_DEVICE() macro 



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

No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20190806094322.64987-8-andriy.shevchenko@linux.intel.com


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

drivers/tty/serial/8250/8250_lpss.c

+8 −10
Original line number Diff line number Diff line
@@ -356,17 +356,15 @@ static const struct lpss8250_board qrk_board = { 
	.exit = qrk_serial_exit,

};



#define LPSS_DEVICE(id, board) { PCI_VDEVICE(INTEL, id), (kernel_ulong_t)&board }



static const struct pci_device_id pci_ids[] = {

	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_QRK_UARTx, qrk_board),

	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BYT_UART1, byt_board),

	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BYT_UART2, byt_board),

	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BSW_UART1, byt_board),

	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BSW_UART2, byt_board),

	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BDW_UART1, byt_board),

	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BDW_UART2, byt_board),

	{ },

	{ PCI_DEVICE_DATA(INTEL, QRK_UARTx, &qrk_board) },

	{ PCI_DEVICE_DATA(INTEL, BYT_UART1, &byt_board) },

	{ PCI_DEVICE_DATA(INTEL, BYT_UART2, &byt_board) },

	{ PCI_DEVICE_DATA(INTEL, BSW_UART1, &byt_board) },

	{ PCI_DEVICE_DATA(INTEL, BSW_UART2, &byt_board) },

	{ PCI_DEVICE_DATA(INTEL, BDW_UART1, &byt_board) },

	{ PCI_DEVICE_DATA(INTEL, BDW_UART2, &byt_board) },

	{ }

};

MODULE_DEVICE_TABLE(pci, pci_ids);