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

Commit ff029687 authored by Allen Pais's avatar Allen Pais Committed by David S. Miller
Browse files

sparc64: Convert timers to user timer_setup() 



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: default avatarAllen Pais <allen.pais@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cdf5976f

arch/sparc/kernel/viohs.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

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

}