Since this function is now empty, remove it. Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Jianchao Wang <jianchao.w.wang@xxxxxxxxxx> Cc: Ming Lei <ming.lei@xxxxxxxxxx> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> Cc: Johannes Thumshirn <jthumshirn@xxxxxxx> --- block/blk-pm.h | 8 -------- block/elevator.c | 2 -- 2 files changed, 10 deletions(-) diff --git a/block/blk-pm.h b/block/blk-pm.h index 3978a3021958..d9077bd7ba6d 100644 --- a/block/blk-pm.h +++ b/block/blk-pm.h @@ -6,10 +6,6 @@ #include <linux/pm_runtime.h> #ifdef CONFIG_PM -static inline void blk_pm_requeue_request(struct request *rq) -{ -} - static inline void blk_pm_add_request(struct request_queue *q, struct request *rq) { @@ -26,10 +22,6 @@ static inline void blk_pm_put_request(struct request *rq) pm_runtime_mark_last_busy(rq->q->dev); } #else -static inline void blk_pm_requeue_request(struct request *rq) -{ -} - static inline void blk_pm_add_request(struct request_queue *q, struct request *rq) { diff --git a/block/elevator.c b/block/elevator.c index 4c15f0240c99..fd7b12bb32a3 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -572,8 +572,6 @@ void elv_requeue_request(struct request_queue *q, struct request *rq) rq->rq_flags &= ~RQF_STARTED; - blk_pm_requeue_request(rq); - __elv_add_request(q, rq, ELEVATOR_INSERT_REQUEUE); } -- 2.18.0