@@ -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)
{
@@ -28,10 +24,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)
{
@@ -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);
}
Since this function is now empty, remove it. Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Jianchao Wang <jianchao.w.wang@oracle.com> Cc: Ming Lei <ming.lei@redhat.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Johannes Thumshirn <jthumshirn@suse.de> --- block/blk-pm.h | 8 -------- block/elevator.c | 2 -- 2 files changed, 10 deletions(-)