Skip to content

Commit

Permalink
sparc64: Convert timers to user timer_setup()
Browse files Browse the repository at this point in the history
Switch to using the new timer_setup() and from_timer()
in LDOM Virtual I/O handshake.

Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Allen Pais authored and David S. Miller committed Nov 15, 2017
1 parent cdf5976 commit ff02968
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/sparc/kernel/viohs.c
Original file line number Diff line number Diff line change
Expand Up @@ -797,9 +797,9 @@ void vio_port_up(struct vio_driver_state *vio)
}
EXPORT_SYMBOL(vio_port_up);

static void vio_port_timer(unsigned long _arg)
static void vio_port_timer(struct timer_list *t)
{
struct vio_driver_state *vio = (struct vio_driver_state *) _arg;
struct vio_driver_state *vio = from_timer(vio, t, timer);

vio_port_up(vio);
}
Expand Down Expand Up @@ -848,7 +848,7 @@ int vio_driver_init(struct vio_driver_state *vio, struct vio_dev *vdev,

vio->ops = ops;

setup_timer(&vio->timer, vio_port_timer, (unsigned long) vio);
timer_setup(&vio->timer, vio_port_timer, 0);

return 0;
}
Expand Down

0 comments on commit ff02968

Please sign in to comment.