block: remove 'q' parameter from kblockd_schedule_*_work()

The queue parameter is never used, just get rid of it.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/blk-core.c b/block/blk-core.c
index 34d7c196338b146e99c7fb31ee93ad8fa5f53f49..f7d2c3335dfab4aa6975371372aacbaf110a4f17 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2904,14 +2904,14 @@ free_and_out:
 }
 EXPORT_SYMBOL_GPL(blk_rq_prep_clone);
 
-int kblockd_schedule_work(struct request_queue *q, struct work_struct *work)
+int kblockd_schedule_work(struct work_struct *work)
 {
        return queue_work(kblockd_workqueue, work);
 }
 EXPORT_SYMBOL(kblockd_schedule_work);
 
-int kblockd_schedule_delayed_work(struct request_queue *q,
-                       struct delayed_work *dwork, unsigned long delay)
+int kblockd_schedule_delayed_work(struct delayed_work *dwork,
+                                 unsigned long delay)
 {
        return queue_delayed_work(kblockd_workqueue, dwork, delay);
 }

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 43e6b4755e9a7e74e05479a83d42fbd88762e9f4..77f20458910c219f322a9f5ad3d4492a7bd99f2d 100644 (file)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -144,7 +144,7 @@ static bool blk_flush_queue_rq(struct request *rq, bool add_front)
 {
        if (rq->q->mq_ops) {
                INIT_WORK(&rq->mq_flush_work, mq_flush_run);
-               kblockd_schedule_work(rq->q, &rq->mq_flush_work);
+               kblockd_schedule_work(&rq->mq_flush_work);
                return false;
        } else {
                if (add_front)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 1d2a9bdbee57f100faacf91ab3a9aef6b7b2a944..9c8f1f4ada7fe059b537251215bb2df1d2ae9ce3 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -608,11 +608,8 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
 
        if (!async)
                __blk_mq_run_hw_queue(hctx);
-       else {
-               struct request_queue *q = hctx->queue;
-
-               kblockd_schedule_delayed_work(q, &hctx->delayed_work, 0);
-       }
+       else
+               kblockd_schedule_delayed_work(&hctx->delayed_work, 0);
 }
 
 void blk_mq_run_queues(struct request_queue *q, bool async)

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index e0985f1955e7e0ea513ddf9cea104d571626a592..5063a0bd831aaaab177f2582fbfc43ca13a6125c 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -908,7 +908,7 @@ static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)
 {
        if (cfqd->busy_queues) {
                cfq_log(cfqd, "schedule dispatch");
-               kblockd_schedule_work(cfqd->queue, &cfqd->unplug_work);
+               kblockd_schedule_work(&cfqd->unplug_work);
        }
 }
 

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 5681c05ac5061bc0050c3926cc3b7f300cef712b..91f99f4ce2e830c4683a93354aea564a55521ac2 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -139,7 +139,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
         */
        spin_lock_irqsave(q->queue_lock, flags);
        blk_requeue_request(q, cmd->request);
-       kblockd_schedule_work(q, &device->requeue_work);
+       kblockd_schedule_work(&device->requeue_work);
        spin_unlock_irqrestore(q->queue_lock, flags);
 }
 

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1e1fa3f93d5fc804627108a32737527e2b44b4d5..2425945d36abbec5350346640a8a6870cb7ccaa2 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1359,8 +1359,8 @@ static inline void put_dev_sector(Sector p)
 }
 
 struct work_struct;
-int kblockd_schedule_work(struct request_queue *q, struct work_struct *work);
-int kblockd_schedule_delayed_work(struct request_queue *q, struct delayed_work *dwork, unsigned long delay);
+int kblockd_schedule_work(struct work_struct *work);
+int kblockd_schedule_delayed_work(struct delayed_work *dwork, unsigned long delay);
 
 #ifdef CONFIG_BLK_CGROUP
 /*