Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Andy Shevchenko
and committed by
Greg Kroah-Hartman
8e9f8261
19234a5f
+5
-14
+5
-14
drivers/tty/serial/8250/8250_exar.c
+5
-14
drivers/tty/serial/8250/8250_exar.c
···
1737
1737
.exit = pci_xr17v35x_exit,
1738
1738
};
1739
1739
1740
-
// For Connect Tech cards with Exar vendor/device PCI IDs
1741
1740
#define CTI_EXAR_DEVICE(devid, bd) { \
1742
1741
PCI_DEVICE_SUB( \
1743
1742
PCI_VENDOR_ID_EXAR, \
1744
1743
PCI_DEVICE_ID_EXAR_##devid, \
1745
1744
PCI_SUBVENDOR_ID_CONNECT_TECH, \
1746
-
PCI_ANY_ID), 0, 0, \
1747
-
(kernel_ulong_t)&bd \
1748
-
}
1749
-
1750
-
// For Connect Tech cards with Connect Tech vendor/device PCI IDs (FPGA based)
1751
-
#define CTI_PCI_DEVICE(devid, bd) { \
1752
-
PCI_DEVICE_SUB( \
1753
-
PCI_VENDOR_ID_CONNECT_TECH, \
1754
-
PCI_DEVICE_ID_CONNECT_TECH_PCI_##devid, \
1755
-
PCI_ANY_ID, \
1756
1745
PCI_ANY_ID), 0, 0, \
1757
1746
(kernel_ulong_t)&bd \
1758
1747
}
···
1775
1786
EXAR_DEVICE(ACCESSIO, COM_4SM, pbn_exar_XR17C15x),
1776
1787
EXAR_DEVICE(ACCESSIO, COM_8SM, pbn_exar_XR17C15x),
1777
1788
1789
+
/* Connect Tech cards with Exar vendor/device PCI IDs */
1778
1790
CTI_EXAR_DEVICE(XR17C152, pbn_cti_xr17c15x),
1779
1791
CTI_EXAR_DEVICE(XR17C154, pbn_cti_xr17c15x),
1780
1792
CTI_EXAR_DEVICE(XR17C158, pbn_cti_xr17c15x),
···
1788
1798
CTI_EXAR_DEVICE(XR17V354, pbn_cti_xr17v35x),
1789
1799
CTI_EXAR_DEVICE(XR17V358, pbn_cti_xr17v35x),
1790
1800
1791
-
CTI_PCI_DEVICE(XR79X_12_XIG00X, pbn_cti_fpga),
1792
-
CTI_PCI_DEVICE(XR79X_12_XIG01X, pbn_cti_fpga),
1793
-
CTI_PCI_DEVICE(XR79X_16, pbn_cti_fpga),
1801
+
/* Connect Tech cards with Connect Tech vendor/device PCI IDs (FPGA based) */
1802
+
EXAR_DEVICE(CONNECT_TECH, PCI_XR79X_12_XIG00X, pbn_cti_fpga),
1803
+
EXAR_DEVICE(CONNECT_TECH, PCI_XR79X_12_XIG01X, pbn_cti_fpga),
1804
+
EXAR_DEVICE(CONNECT_TECH, PCI_XR79X_16, pbn_cti_fpga),
1794
1805
1795
1806
IBM_DEVICE(XR17C152, SATURN_SERIAL_ONE_PORT, pbn_exar_ibm_saturn),
1796
1807