tty: serial: 8250: Cleanup MOXA configurations

To improve clarity, clean up the MOXA configurations within
serial_pci_tbl using PCI_VDEVICE().

Signed-off-by: Crescent CY Hsieh <crescentcy.hsieh@moxa.com>
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20231018091739.10125-3-crescentcy.hsieh@moxa.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 55a788b412bc983e272ee637375a329590065e0d..fd810a6ee38fef5231ce616403ddfb01a2a0003f 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -5349,42 +5349,18 @@ static const struct pci_device_id serial_pci_tbl[] = {
        /*
         * MOXA
         */
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_2 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_2 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_4 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_4 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_8 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_8 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_8 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_8 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_2 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_4 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_8 },
-       {       PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-               pbn_moxa_8 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102E),     pbn_moxa_2 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102EL),    pbn_moxa_2 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A),  pbn_moxa_4 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114EL),    pbn_moxa_4 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A), pbn_moxa_8 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B), pbn_moxa_8 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A),  pbn_moxa_8 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I), pbn_moxa_8 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132EL),    pbn_moxa_2 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A),  pbn_moxa_4 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP138E_A),   pbn_moxa_8 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A),  pbn_moxa_8 },
 
        /*
        * ADDI-DATA GmbH communication cards <info@addi-data.com>