firmware: psci: Extend psci_set_osi_mode() to allow reset to PC mode

[linux-2.6-microblaze.git] / block / blk-mq-tag.c

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index ae722f8..32d82e2 100644 (file)
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -56,43 +56,12 @@ void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx)
        blk_mq_tag_wakeup_all(tags, false);
 }
 
-/*
- * For shared tag users, we track the number of currently active users
- * and attempt to provide a fair share of the tag depth for each of them.
- */
-static inline bool hctx_may_queue(struct blk_mq_hw_ctx *hctx,
-                                 struct sbitmap_queue *bt)
-{
-       unsigned int depth, users;
-
-       if (!hctx || !(hctx->flags & BLK_MQ_F_TAG_SHARED))
-               return true;
-       if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
-               return true;
-
-       /*
-        * Don't try dividing an ant
-        */
-       if (bt->sb.depth == 1)
-               return true;
-
-       users = atomic_read(&hctx->tags->active_queues);
-       if (!users)
-               return true;
-
-       /*
-        * Allow at least some tags
-        */
-       depth = max((bt->sb.depth + users - 1) / users, 4U);
-       return atomic_read(&hctx->nr_active) < depth;
-}
-
 static int __blk_mq_get_tag(struct blk_mq_alloc_data *data,
                            struct sbitmap_queue *bt)
 {
-       if (!(data->flags & BLK_MQ_REQ_INTERNAL) &&
-           !hctx_may_queue(data->hctx, bt))
+       if (!data->q->elevator && !hctx_may_queue(data->hctx, bt))
                return BLK_MQ_NO_TAG;
+
        if (data->shallow_depth)
                return __sbitmap_queue_get_shallow(bt, data->shallow_depth);
        else
@@ -191,33 +160,6 @@ found_tag:
        return tag + tag_offset;
 }
 
-bool __blk_mq_get_driver_tag(struct request *rq)
-{
-       struct sbitmap_queue *bt = &rq->mq_hctx->tags->bitmap_tags;
-       unsigned int tag_offset = rq->mq_hctx->tags->nr_reserved_tags;
-       bool shared = blk_mq_tag_busy(rq->mq_hctx);
-       int tag;
-
-       if (blk_mq_tag_is_reserved(rq->mq_hctx->sched_tags, rq->internal_tag)) {
-               bt = &rq->mq_hctx->tags->breserved_tags;
-               tag_offset = 0;
-       }
-
-       if (!hctx_may_queue(rq->mq_hctx, bt))
-               return false;
-       tag = __sbitmap_queue_get(bt);
-       if (tag == BLK_MQ_NO_TAG)
-               return false;
-
-       rq->tag = tag + tag_offset;
-       if (shared) {
-               rq->rq_flags |= RQF_MQ_INFLIGHT;
-               atomic_inc(&rq->mq_hctx->nr_active);
-       }
-       rq->mq_hctx->tags->rqs[rq->tag] = rq;
-       return true;
-}
-
 void blk_mq_put_tag(struct blk_mq_tags *tags, struct blk_mq_ctx *ctx,
                    unsigned int tag)
 {