Skip to content

Commit c69fddf

Browse files
pnewman-ctigregkh
authored andcommitted
serial: exar: remove old Connect Tech setup
Preparatory patch removing existing Connect Tech setup code and CONNECT_DEVICE macro. Subsequent patches in this series will add in new UART family specific setup code and new device definition macros to allow for supporting CTI serial cards with Exar PCI IDs and CTI PCI IDs. Signed-off-by: Parker Newman <[email protected]> Link: https://lore.kernel.org/r/06a04b6c683ca20c50646cc0836be869c2dacd87.1713382717.git.pnewman@connecttech.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8c467f3 commit c69fddf

File tree

1 file changed

+0
-37
lines changed

1 file changed

+0
-37
lines changed

drivers/tty/serial/8250/8250_exar.c

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -358,17 +358,6 @@ pci_fastcom335_setup(struct exar8250 *priv, struct pci_dev *pcidev,
358358
return 0;
359359
}
360360

361-
static int
362-
pci_connect_tech_setup(struct exar8250 *priv, struct pci_dev *pcidev,
363-
struct uart_8250_port *port, int idx)
364-
{
365-
unsigned int offset = idx * 0x200;
366-
unsigned int baud = 1843200;
367-
368-
port->port.uartclk = baud * 16;
369-
return default_setup(priv, pcidev, idx, offset, port);
370-
}
371-
372361
static int
373362
pci_xr17c154_setup(struct exar8250 *priv, struct pci_dev *pcidev,
374363
struct uart_8250_port *port, int idx)
@@ -849,10 +838,6 @@ static const struct exar8250_board pbn_fastcom335_8 = {
849838
.setup = pci_fastcom335_setup,
850839
};
851840

852-
static const struct exar8250_board pbn_connect = {
853-
.setup = pci_connect_tech_setup,
854-
};
855-
856841
static const struct exar8250_board pbn_exar_ibm_saturn = {
857842
.num_ports = 1,
858843
.setup = pci_xr17c154_setup,
@@ -897,15 +882,6 @@ static const struct exar8250_board pbn_exar_XR17V8358 = {
897882
.exit = pci_xr17v35x_exit,
898883
};
899884

900-
#define CONNECT_DEVICE(devid, sdevid, bd) { \
901-
PCI_DEVICE_SUB( \
902-
PCI_VENDOR_ID_EXAR, \
903-
PCI_DEVICE_ID_EXAR_##devid, \
904-
PCI_SUBVENDOR_ID_CONNECT_TECH, \
905-
PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_##sdevid), 0, 0, \
906-
(kernel_ulong_t)&bd \
907-
}
908-
909885
#define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
910886

911887
#define IBM_DEVICE(devid, sdevid, bd) { \
@@ -935,19 +911,6 @@ static const struct pci_device_id exar_pci_tbl[] = {
935911
EXAR_DEVICE(ACCESSIO, COM_4SM, pbn_exar_XR17C15x),
936912
EXAR_DEVICE(ACCESSIO, COM_8SM, pbn_exar_XR17C15x),
937913

938-
CONNECT_DEVICE(XR17C152, UART_2_232, pbn_connect),
939-
CONNECT_DEVICE(XR17C154, UART_4_232, pbn_connect),
940-
CONNECT_DEVICE(XR17C158, UART_8_232, pbn_connect),
941-
CONNECT_DEVICE(XR17C152, UART_1_1, pbn_connect),
942-
CONNECT_DEVICE(XR17C154, UART_2_2, pbn_connect),
943-
CONNECT_DEVICE(XR17C158, UART_4_4, pbn_connect),
944-
CONNECT_DEVICE(XR17C152, UART_2, pbn_connect),
945-
CONNECT_DEVICE(XR17C154, UART_4, pbn_connect),
946-
CONNECT_DEVICE(XR17C158, UART_8, pbn_connect),
947-
CONNECT_DEVICE(XR17C152, UART_2_485, pbn_connect),
948-
CONNECT_DEVICE(XR17C154, UART_4_485, pbn_connect),
949-
CONNECT_DEVICE(XR17C158, UART_8_485, pbn_connect),
950-
951914
IBM_DEVICE(XR17C152, SATURN_SERIAL_ONE_PORT, pbn_exar_ibm_saturn),
952915

953916
/* USRobotics USR298x-OEM PCI Modems */

0 commit comments

Comments
 (0)