diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2024-05-03 20:15:55 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-04 19:09:29 +0300 |
| commit | 8e9f8261d7ce2e35f0e45b9751df4ca8e0079558 (patch) | |
| tree | b932c9b45f4899ffb1efb1698e5a881d407cce4d /drivers/tty | |
| parent | 19234a5f61c5431bd2468ff5b7d65fa99ebb9f02 (diff) | |
| download | linux-8e9f8261d7ce2e35f0e45b9751df4ca8e0079558.tar.xz | |
serial: 8250_exar: Kill CTI_PCI_DEVICE()
The CTI_PCI_DEVICE() duplicates EXAR_DEVICE(). Kill the former.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Parker Newman <pnewman@connecttech.com>
Link: https://lore.kernel.org/r/20240503171917.2921250-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250/8250_exar.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index 150c4abd92fc..ab0abc14ecf8 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -1737,7 +1737,6 @@ static const struct exar8250_board pbn_exar_XR17V8358 = { .exit = pci_xr17v35x_exit, }; -// For Connect Tech cards with Exar vendor/device PCI IDs #define CTI_EXAR_DEVICE(devid, bd) { \ PCI_DEVICE_SUB( \ PCI_VENDOR_ID_EXAR, \ @@ -1747,16 +1746,6 @@ static const struct exar8250_board pbn_exar_XR17V8358 = { (kernel_ulong_t)&bd \ } -// For Connect Tech cards with Connect Tech vendor/device PCI IDs (FPGA based) -#define CTI_PCI_DEVICE(devid, bd) { \ - PCI_DEVICE_SUB( \ - PCI_VENDOR_ID_CONNECT_TECH, \ - PCI_DEVICE_ID_CONNECT_TECH_PCI_##devid, \ - PCI_ANY_ID, \ - PCI_ANY_ID), 0, 0, \ - (kernel_ulong_t)&bd \ - } - #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) } #define IBM_DEVICE(devid, sdevid, bd) { \ @@ -1786,6 +1775,7 @@ static const struct pci_device_id exar_pci_tbl[] = { EXAR_DEVICE(ACCESSIO, COM_4SM, pbn_exar_XR17C15x), EXAR_DEVICE(ACCESSIO, COM_8SM, pbn_exar_XR17C15x), + /* Connect Tech cards with Exar vendor/device PCI IDs */ CTI_EXAR_DEVICE(XR17C152, pbn_cti_xr17c15x), CTI_EXAR_DEVICE(XR17C154, pbn_cti_xr17c15x), CTI_EXAR_DEVICE(XR17C158, pbn_cti_xr17c15x), @@ -1798,9 +1788,10 @@ static const struct pci_device_id exar_pci_tbl[] = { CTI_EXAR_DEVICE(XR17V354, pbn_cti_xr17v35x), CTI_EXAR_DEVICE(XR17V358, pbn_cti_xr17v35x), - CTI_PCI_DEVICE(XR79X_12_XIG00X, pbn_cti_fpga), - CTI_PCI_DEVICE(XR79X_12_XIG01X, pbn_cti_fpga), - CTI_PCI_DEVICE(XR79X_16, pbn_cti_fpga), + /* Connect Tech cards with Connect Tech vendor/device PCI IDs (FPGA based) */ + EXAR_DEVICE(CONNECT_TECH, PCI_XR79X_12_XIG00X, pbn_cti_fpga), + EXAR_DEVICE(CONNECT_TECH, PCI_XR79X_12_XIG01X, pbn_cti_fpga), + EXAR_DEVICE(CONNECT_TECH, PCI_XR79X_16, pbn_cti_fpga), IBM_DEVICE(XR17C152, SATURN_SERIAL_ONE_PORT, pbn_exar_ibm_saturn), |