mirror of
https://github.com/torvalds/linux.git
synced 2024-12-12 06:02:38 +00:00
serial: 8250_pci: Remove serial_rs485 sanitization
Serial core handles serial_rs485 sanitization and copying rs485 struct. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Link: https://lore.kernel.org/r/20220606100433.13793-29-ilpo.jarvinen@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ebc3c2a4cd
commit
61bca7da91
@ -1562,14 +1562,6 @@ static int pci_fintek_rs485_config(struct uart_port *port,
|
|||||||
|
|
||||||
pci_read_config_byte(pci_dev, 0x40 + 8 * *index + 7, &setting);
|
pci_read_config_byte(pci_dev, 0x40 + 8 * *index + 7, &setting);
|
||||||
|
|
||||||
if (rs485->flags & SER_RS485_ENABLED)
|
|
||||||
memset(rs485->padding, 0, sizeof(rs485->padding));
|
|
||||||
else
|
|
||||||
memset(rs485, 0, sizeof(*rs485));
|
|
||||||
|
|
||||||
/* F81504/508/512 not support RTS delay before or after send */
|
|
||||||
rs485->flags &= SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND;
|
|
||||||
|
|
||||||
if (rs485->flags & SER_RS485_ENABLED) {
|
if (rs485->flags & SER_RS485_ENABLED) {
|
||||||
/* Enable RTS H/W control mode */
|
/* Enable RTS H/W control mode */
|
||||||
setting |= FINTEK_RTS_CONTROL_BY_HW;
|
setting |= FINTEK_RTS_CONTROL_BY_HW;
|
||||||
@ -1581,9 +1573,6 @@ static int pci_fintek_rs485_config(struct uart_port *port,
|
|||||||
/* RTS driving low on TX */
|
/* RTS driving low on TX */
|
||||||
setting |= FINTEK_RTS_INVERT;
|
setting |= FINTEK_RTS_INVERT;
|
||||||
}
|
}
|
||||||
|
|
||||||
rs485->delay_rts_after_send = 0;
|
|
||||||
rs485->delay_rts_before_send = 0;
|
|
||||||
} else {
|
} else {
|
||||||
/* Disable RTS H/W control mode */
|
/* Disable RTS H/W control mode */
|
||||||
setting &= ~(FINTEK_RTS_CONTROL_BY_HW | FINTEK_RTS_INVERT);
|
setting &= ~(FINTEK_RTS_CONTROL_BY_HW | FINTEK_RTS_INVERT);
|
||||||
@ -1591,9 +1580,6 @@ static int pci_fintek_rs485_config(struct uart_port *port,
|
|||||||
|
|
||||||
pci_write_config_byte(pci_dev, 0x40 + 8 * *index + 7, setting);
|
pci_write_config_byte(pci_dev, 0x40 + 8 * *index + 7, setting);
|
||||||
|
|
||||||
if (rs485 != &port->rs485)
|
|
||||||
port->rs485 = *rs485;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user