ASoC: Intel: Skylake: Fix struct definition

[platform/kernel/linux-starfive.git] / block / blk-iocost.c

diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index d1bdc12..6955605 100644 (file)
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -232,7 +232,9 @@ enum {
 
        /* 1/64k is granular enough and can easily be handled w/ u32 */
        WEIGHT_ONE              = 1 << 16,
+};
 
+enum {
        /*
         * As vtime is used to calculate the cost of each IO, it needs to
         * be fairly high precision.  For example, it should be able to
@@ -2818,7 +2820,7 @@ static void ioc_rqos_exit(struct rq_qos *rqos)
        ioc->running = IOC_STOP;
        spin_unlock_irq(&ioc->lock);
 
-       del_timer_sync(&ioc->timer);
+       timer_shutdown_sync(&ioc->timer);
        free_percpu(ioc->pcpu_stat);
        kfree(ioc);
 }