Skip to contentSkip to conversation

tty/serial: atmel: Convert timers to use timer_setup()

PATCH New Kees Cook 2 participants 2 messages Oct 24, 2017

Subsystems (3)
TTY layer and serial drivers Arm/Microchip (AT91) SoC support Microchip AT91 serial driver
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 tty/serial: atmel: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.

Cc Richard Genoud <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/tty/serial/atmel_serial.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/tty/serial/atmel_serial.c +5 -6
index 82d9c8eae04f..68d8685e5a50 100644
@@ -1185,10 +1185,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
 	return -EINVAL;
 }
 
-static void atmel_uart_timer_callback(unsigned long data)
+static void atmel_uart_timer_callback(struct timer_list *t)
 {
-	struct uart_port *port = (void *)data;
-	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+	struct atmel_uart_port *atmel_port = from_timer(atmel_port, t,
+							uart_timer);
+	struct uart_port *port = &atmel_port->uart;
 
 	if (!atomic_read(&atmel_port->tasklet_shutdown)) {
 		tasklet_schedule(&atmel_port->tasklet_rx);

@@ -1852,9 +1853,7 @@ static int atmel_startup(struct uart_port *port)
 	atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
 	atmel_port->tx_stopped = false;
 
-	setup_timer(&atmel_port->uart_timer,
-			atmel_uart_timer_callback,
-			(unsigned long)port);
+	timer_setup(&atmel_port->uart_timer, atmel_uart_timer_callback, 0);
 
 	if (atmel_use_pdc_rx(port)) {
 		/* set UART timeout */
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security
#1 lore raw

PATCH 1/1 tty/serial: atmel: Convert timers to use timer_setup()

Le mardi 24 octobre 2017 à 03:00 -0700, Kees Cook a écrit :

Quoted 11 lines

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc Richard Genoud <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
Acked-by Richard Genoud <[email protected]>

Thanks !

Quoted 45 lines

---
 drivers/tty/serial/atmel_serial.c | 11 +++++------

 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/tty/serial/atmel_serial.c +0 -0
index 82d9c8eae04f..68d8685e5a50 100644
@@ -1185,10 +1185,11 @@ static int atmel_prepare_rx_dma(struct
 uart_port *port)
  	return -EINVAL;
  }

drivers/tty/serial/atmel_serial.c +1 -1
-static void atmel_uart_timer_callback(unsigned long data)
+static void atmel_uart_timer_callback(struct timer_list *t)

 {

drivers/tty/serial/atmel_serial.c +0 -2
-	struct uart_port *port = (void *)data;
-	struct atmel_uart_port *atmel_port =

to_atmel_uart_port(port);

drivers/tty/serial/atmel_serial.c +1 -0
+	struct atmel_uart_port *atmel_port = from_timer(atmel_port,

t,

drivers/tty/serial/atmel_serial.c +2 -0
+							uart_timer);
+	struct uart_port *port = &atmel_port->uart;


  if (!atomic_read(&atmel_port->tasklet_shutdown)) { tasklet_schedule(&atmel_port->tasklet_rx);

drivers/tty/serial/atmel_serial.c +0 -0
@@ -1852,9 +1853,7 @@ static int atmel_startup(struct uart_port
 *port)

  atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
  atmel_port->tx_stopped = false;

drivers/tty/serial/atmel_serial.c +1 -3
-	setup_timer(&atmel_port->uart_timer,
-			atmel_uart_timer_callback,
-			(unsigned long)port);
+	timer_setup(&atmel_port->uart_timer,

atmel_uart_timer_callback, 0);

  if (atmel_use_pdc_rx(port)) {
  /* set UART timeout */
--
2.7.4