1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index dc43254e05a4..55ab25f79a08 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -744,7 +744,7 @@ count_targets(struct aoedev *d, int *untainted)
 }
 
 static void
-rexmit_timer(ulong vp)
+rexmit_timer(struct timer_list *timer)
 {
         struct aoedev *d;
         struct aoetgt *t;
@@ -758,7 +758,7 @@ rexmit_timer(ulong vp)
         int utgts;      /* number of aoetgt descriptors (not slots) */
         int since;
 
-        d = (struct aoedev *) vp;
+        d = from_timer(d, timer, timer);
 
         spin_lock_irqsave(&d->lock, flags);
 
@@ -1429,7 +1429,7 @@ aoecmd_ata_id(struct aoedev *d)
 
         d->rttavg = RTTAVG_INIT;
         d->rttdev = RTTDEV_INIT;
-        d->timer.function = rexmit_timer;
+        d->timer.function = (TIMER_FUNC_TYPE)rexmit_timer;
 
         skb = skb_clone(skb, GFP_ATOMIC);
         if (skb) {