openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2017-10-24 03:00:10 -07:00 committed by Greg Kroah-Hartman
parent ad0cda7a90
commit 4790b6dc7a
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/tty/vcc.c
View File

@ -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);