serial: 8250_mid: Get rid of custom MID_DEVICE() macro

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

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220215104126.7220-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_mid.c b/drivers/tty/serial/8250/8250_mid.c
index efa0515..771453c 100644 (file)
--- a/drivers/tty/serial/8250/8250_mid.c
+++ b/drivers/tty/serial/8250/8250_mid.c
@@ -368,16 +368,14 @@ static const struct mid8250_board dnv_board = {
        .exit = dnv_exit,
 };
 
-#define MID_DEVICE(id, board) { PCI_VDEVICE(INTEL, id), (kernel_ulong_t)&board }
-
 static const struct pci_device_id pci_ids[] = {
-       MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART1, pnw_board),
-       MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART2, pnw_board),
-       MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART3, pnw_board),
-       MID_DEVICE(PCI_DEVICE_ID_INTEL_TNG_UART, tng_board),
-       MID_DEVICE(PCI_DEVICE_ID_INTEL_CDF_UART, dnv_board),
-       MID_DEVICE(PCI_DEVICE_ID_INTEL_DNV_UART, dnv_board),
-       { },
+       { PCI_DEVICE_DATA(INTEL, PNW_UART1, &pnw_board) },
+       { PCI_DEVICE_DATA(INTEL, PNW_UART2, &pnw_board) },
+       { PCI_DEVICE_DATA(INTEL, PNW_UART3, &pnw_board) },
+       { PCI_DEVICE_DATA(INTEL, TNG_UART, &tng_board) },
+       { PCI_DEVICE_DATA(INTEL, CDF_UART, &dnv_board) },
+       { PCI_DEVICE_DATA(INTEL, DNV_UART, &dnv_board) },
+       { }
 };
 MODULE_DEVICE_TABLE(pci, pci_ids);