Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 380da49d authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

staging/irda/bfin_sir: 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: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a83f4340

drivers/staging/irda/drivers/bfin_sir.c

+7 −5
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ static int max_rate = 57600; 
static int max_rate = 115200;

#endif



static void bfin_sir_rx_dma_timeout(struct timer_list *t);



static void turnaround_delay(int mtt)

{

	long ticks;
@@ -57,7 +59,7 @@ static void bfin_sir_init_ports(struct bfin_sir_port *sp, struct platform_device 
	sp->clk = get_sclk();

#ifdef CONFIG_SIR_BFIN_DMA

	sp->tx_done        = 1;

	init_timer(&(sp->rx_dma_timer));

	timer_setup(&sp->rx_dma_timer, bfin_sir_rx_dma_timeout, 0);

#endif

}
@@ -317,10 +319,12 @@ static void bfin_sir_dma_rx_chars(struct net_device *dev) 
		async_unwrap_char(dev, &self->stats, &self->rx_buff, port->rx_dma_buf.buf[i]);

}



void bfin_sir_rx_dma_timeout(struct net_device *dev)

static void bfin_sir_rx_dma_timeout(struct timer_list *t)

{

	struct bfin_sir_port *port = from_timer(port, t, rx_dma_timer);

	struct net_device *dev = port->dev;

	struct bfin_sir_self *self = netdev_priv(dev);

	struct bfin_sir_port *port = self->sir_port;



	int x_pos, pos;

	unsigned long flags;
@@ -405,8 +409,6 @@ static int bfin_sir_startup(struct bfin_sir_port *port, struct net_device *dev) 
	set_dma_start_addr(port->rx_dma_channel, (unsigned long)port->rx_dma_buf.buf);

	enable_dma(port->rx_dma_channel);



	port->rx_dma_timer.data = (unsigned long)(dev);

	port->rx_dma_timer.function = (void *)bfin_sir_rx_dma_timeout;



#else