Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[linux-2.6-block.git] / arch / sparc / kernel / viohs.c

diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c
index c858f5f3ce2c13351ac468563b4b0595ddbd9f44..635d67ffc9a39f72f3acd24f94b052e754fcfcb1 100644 (file)
--- a/arch/sparc/kernel/viohs.c
+++ b/arch/sparc/kernel/viohs.c
@@ -798,9 +798,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);
 }
@@ -849,7 +849,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;
 }