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

Commit 4790b6dc authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

tty: vcc: 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: "David S. Miller" <davem@davemloft.net>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: sparclinux@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ad0cda7a

drivers/tty/vcc.c

+6 −14
Original line number Diff line number Diff line
@@ -361,17 +361,13 @@ static int vcc_ldc_read(struct vcc_port *port) 
	return rv;

}



static void vcc_rx_timer(unsigned long index)

static void vcc_rx_timer(struct timer_list *t)

{

	struct vcc_port *port = from_timer(port, t, rx_timer);

	struct vio_driver_state *vio;

	struct vcc_port *port;

	unsigned long flags;

	int rv;



	port = vcc_get_ne(index);

	if (!port)

		return;



	spin_lock_irqsave(&port->lock, flags);

	port->rx_timer.expires = 0;
@@ -391,18 +387,14 @@ static void vcc_rx_timer(unsigned long index) 
	vcc_put(port, false);

}



static void vcc_tx_timer(unsigned long index)

static void vcc_tx_timer(struct timer_list *t)

{

	struct vcc_port *port;

	struct vcc_port *port = from_timer(port, t, tx_timer);

	struct vio_vcc *pkt;

	unsigned long flags;

	int tosend = 0;

	int rv;



	port = vcc_get_ne(index);

	if (!port)

		return;



	spin_lock_irqsave(&port->lock, flags);

	port->tx_timer.expires = 0;
@@ -645,8 +637,8 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	if (rv)

		goto free_domain;



	setup_timer(&port->rx_timer, vcc_rx_timer, port->index);

	setup_timer(&port->tx_timer, vcc_tx_timer, port->index);

	timer_setup(&port->rx_timer, vcc_rx_timer, 0);

	timer_setup(&port->tx_timer, vcc_tx_timer, 0);



	dev_set_drvdata(&vdev->dev, port);