block: get rid of MQ scheduler ops union

This is a remnant of when we had ops for both SQ and MQ
schedulers. Now it's just MQ, so get rid of the union.

Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 10 insertions, 10 deletions

diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index 8a9544203173..947f236b273d 100644
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -43,8 +43,8 @@ blk_mq_sched_allow_merge(struct request_queue *q, struct request *rq,
 {
         struct elevator_queue *e = q->elevator;
 
-        if (e && e->type->ops.mq.allow_merge)
-                return e->type->ops.mq.allow_merge(q, rq, bio);
+        if (e && e->type->ops.allow_merge)
+                return e->type->ops.allow_merge(q, rq, bio);
 
         return true;
 }
@@ -53,8 +53,8 @@ static inline void blk_mq_sched_completed_request(struct request *rq, u64 now)
 {
         struct elevator_queue *e = rq->q->elevator;
 
-        if (e && e->type->ops.mq.completed_request)
-                e->type->ops.mq.completed_request(rq, now);
+        if (e && e->type->ops.completed_request)
+                e->type->ops.completed_request(rq, now);
 }
 
 static inline void blk_mq_sched_started_request(struct request *rq)
@@ -62,8 +62,8 @@ static inline void blk_mq_sched_started_request(struct request *rq)
         struct request_queue *q = rq->q;
         struct elevator_queue *e = q->elevator;
 
-        if (e && e->type->ops.mq.started_request)
-                e->type->ops.mq.started_request(rq);
+        if (e && e->type->ops.started_request)
+                e->type->ops.started_request(rq);
 }
 
 static inline void blk_mq_sched_requeue_request(struct request *rq)
@@ -71,16 +71,16 @@ static inline void blk_mq_sched_requeue_request(struct request *rq)
         struct request_queue *q = rq->q;
         struct elevator_queue *e = q->elevator;
 
-        if (e && e->type->ops.mq.requeue_request)
-                e->type->ops.mq.requeue_request(rq);
+        if (e && e->type->ops.requeue_request)
+                e->type->ops.requeue_request(rq);
 }
 
 static inline bool blk_mq_sched_has_work(struct blk_mq_hw_ctx *hctx)
 {
         struct elevator_queue *e = hctx->queue->elevator;
 
-        if (e && e->type->ops.mq.has_work)
-                return e->type->ops.mq.has_work(hctx);
+        if (e && e->type->ops.has_work)
+                return e->type->ops.has_work(hctx);
 
         return false;
 }