mirror of https://gitee.com/openkylin/linux.git
serial: 8250_port: unify check of em485 variable
Unify the check of em485 variable to be either (em485) or (!em485) instead of the explicit comparison to NULL. While here, remove redundant check in __do_stop_tx_rs485() and __stop_tx_rs485() since the functions ain't called with NULL value of em485 variable. Cc: "Matwey V. Kornilov" <matwey@sai.msu.ru> Tested-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b3965767d8
commit
f3bf26326f
|
@ -585,11 +585,11 @@ EXPORT_SYMBOL_GPL(serial8250_rpm_put);
|
||||||
*/
|
*/
|
||||||
int serial8250_em485_init(struct uart_8250_port *p)
|
int serial8250_em485_init(struct uart_8250_port *p)
|
||||||
{
|
{
|
||||||
if (p->em485 != NULL)
|
if (p->em485)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
p->em485 = kmalloc(sizeof(struct uart_8250_em485), GFP_ATOMIC);
|
p->em485 = kmalloc(sizeof(struct uart_8250_em485), GFP_ATOMIC);
|
||||||
if (p->em485 == NULL)
|
if (!p->em485)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
setup_timer(&p->em485->stop_tx_timer,
|
setup_timer(&p->em485->stop_tx_timer,
|
||||||
|
@ -619,7 +619,7 @@ EXPORT_SYMBOL_GPL(serial8250_em485_init);
|
||||||
*/
|
*/
|
||||||
void serial8250_em485_destroy(struct uart_8250_port *p)
|
void serial8250_em485_destroy(struct uart_8250_port *p)
|
||||||
{
|
{
|
||||||
if (p->em485 == NULL)
|
if (!p->em485)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
del_timer(&p->em485->start_tx_timer);
|
del_timer(&p->em485->start_tx_timer);
|
||||||
|
@ -1402,10 +1402,8 @@ static void serial8250_stop_rx(struct uart_port *port)
|
||||||
|
|
||||||
static void __do_stop_tx_rs485(struct uart_8250_port *p)
|
static void __do_stop_tx_rs485(struct uart_8250_port *p)
|
||||||
{
|
{
|
||||||
if (!p->em485)
|
|
||||||
return;
|
|
||||||
|
|
||||||
serial8250_em485_rts_after_send(p);
|
serial8250_em485_rts_after_send(p);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Empty the RX FIFO, we are not interested in anything
|
* Empty the RX FIFO, we are not interested in anything
|
||||||
* received during the half-duplex transmission.
|
* received during the half-duplex transmission.
|
||||||
|
@ -1440,9 +1438,6 @@ static void __stop_tx_rs485(struct uart_8250_port *p)
|
||||||
{
|
{
|
||||||
struct uart_8250_em485 *em485 = p->em485;
|
struct uart_8250_em485 *em485 = p->em485;
|
||||||
|
|
||||||
if (!em485)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* __do_stop_tx_rs485 is going to set RTS according to config
|
* __do_stop_tx_rs485 is going to set RTS according to config
|
||||||
* AND flush RX FIFO if required.
|
* AND flush RX FIFO if required.
|
||||||
|
|
Loading…
Reference in New Issue