Merge patch series "UFS Advanced RPMB"

[linux-2.6-microblaze.git] / block / kyber-iosched.c

diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index b05357b..2146969 100644 (file)
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -434,7 +434,7 @@ static void kyber_exit_sched(struct elevator_queue *e)
        struct kyber_queue_data *kqd = e->elevator_data;
        int i;
 
-       del_timer_sync(&kqd->timer);
+       timer_shutdown_sync(&kqd->timer);
        blk_stat_disable_accounting(kqd->q);
 
        for (i = 0; i < KYBER_NUM_DOMAINS; i++)