Commit 7e3d3c08 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: 8250, cleanup em485 timers 



Initialize the variables directly by initializers in definitions. This
is expected/usual for these kind of callback.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210302062214.29627-12-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60294d86

drivers/tty/serial/8250/8250_port.c

+8 −10
Original line number Diff line number Diff line
@@ -1466,13 +1466,11 @@ EXPORT_SYMBOL_GPL(serial8250_em485_stop_tx); 


static enum hrtimer_restart serial8250_em485_handle_stop_tx(struct hrtimer *t)

{

	struct uart_8250_em485 *em485;

	struct uart_8250_port *p;

	struct uart_8250_em485 *em485 = container_of(t, struct uart_8250_em485,

			stop_tx_timer);

	struct uart_8250_port *p = em485->port;

	unsigned long flags;



	em485 = container_of(t, struct uart_8250_em485, stop_tx_timer);

	p = em485->port;



	serial8250_rpm_get(p);

	spin_lock_irqsave(&p->port.lock, flags);

	if (em485->active_timer == &em485->stop_tx_timer) {
@@ -1482,6 +1480,7 @@ static enum hrtimer_restart serial8250_em485_handle_stop_tx(struct hrtimer *t) 
	}

	spin_unlock_irqrestore(&p->port.lock, flags);

	serial8250_rpm_put(p);



	return HRTIMER_NORESTART;

}
@@ -1629,19 +1628,18 @@ static inline void start_tx_rs485(struct uart_port *port) 


static enum hrtimer_restart serial8250_em485_handle_start_tx(struct hrtimer *t)

{

	struct uart_8250_em485 *em485;

	struct uart_8250_port *p;

	struct uart_8250_em485 *em485 = container_of(t, struct uart_8250_em485,

			start_tx_timer);

	struct uart_8250_port *p = em485->port;

	unsigned long flags;



	em485 = container_of(t, struct uart_8250_em485, start_tx_timer);

	p = em485->port;



	spin_lock_irqsave(&p->port.lock, flags);

	if (em485->active_timer == &em485->start_tx_timer) {

		__start_tx(&p->port);

		em485->active_timer = NULL;

	}

	spin_unlock_irqrestore(&p->port.lock, flags);



	return HRTIMER_NORESTART;

}