Skip to content

Commit 6ff3f33

Browse files
Crescent CY Hsiehgregkh
authored andcommitted
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 <[email protected]> Reviewed-by: Jiri Slaby <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b43de94 commit 6ff3f33

File tree

1 file changed

+12
-36
lines changed

1 file changed

+12
-36
lines changed

drivers/tty/serial/8250/8250_pci.c

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5349,42 +5349,18 @@ static const struct pci_device_id serial_pci_tbl[] = {
53495349
/*
53505350
* MOXA
53515351
*/
5352-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E,
5353-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5354-
pbn_moxa_2 },
5355-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL,
5356-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5357-
pbn_moxa_2 },
5358-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A,
5359-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5360-
pbn_moxa_4 },
5361-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL,
5362-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5363-
pbn_moxa_4 },
5364-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A,
5365-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5366-
pbn_moxa_8 },
5367-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B,
5368-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5369-
pbn_moxa_8 },
5370-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A,
5371-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5372-
pbn_moxa_8 },
5373-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I,
5374-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5375-
pbn_moxa_8 },
5376-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL,
5377-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5378-
pbn_moxa_2 },
5379-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A,
5380-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5381-
pbn_moxa_4 },
5382-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A,
5383-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5384-
pbn_moxa_8 },
5385-
{ PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A,
5386-
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
5387-
pbn_moxa_8 },
5352+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102E), pbn_moxa_2 },
5353+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102EL), pbn_moxa_2 },
5354+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A), pbn_moxa_4 },
5355+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114EL), pbn_moxa_4 },
5356+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A), pbn_moxa_8 },
5357+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B), pbn_moxa_8 },
5358+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A), pbn_moxa_8 },
5359+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I), pbn_moxa_8 },
5360+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132EL), pbn_moxa_2 },
5361+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A), pbn_moxa_4 },
5362+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP138E_A), pbn_moxa_8 },
5363+
{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A), pbn_moxa_8 },
53885364

53895365
/*
53905366
* ADDI-DATA GmbH communication cards <[email protected]>

0 commit comments

Comments
 (0)