blk-mq: remove blk_qc_t_valid

Move the trivial check into the only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Tested-by: Mark Wunderlich <mark.wunderlich@intel.com>
Link: https://lore.kernel.org/r/20211012111226.760968-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 24a10c973f79fcf143a2e3a0f104d2c78de24a0b..7d0d947921a6d61e82375f5cfe79dde74b4b95d3 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -4098,7 +4098,7 @@ static int blk_mq_poll_classic(struct request_queue *q, blk_qc_t cookie,
  */
 int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin)
 {
-       if (!blk_qc_t_valid(cookie) ||
+       if (cookie == BLK_QC_T_NONE ||
            !test_bit(QUEUE_FLAG_POLL, &q->queue_flags))
                return 0;
 

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index fb7c1477617b8dbf7fb8eb3f058d16a2d309db55..5017ba8fc53920714b9d91f157ce69c8a6ce5194 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -500,11 +500,6 @@ typedef unsigned int blk_qc_t;
 #define BLK_QC_T_SHIFT         16
 #define BLK_QC_T_INTERNAL      (1U << 31)
 
-static inline bool blk_qc_t_valid(blk_qc_t cookie)
-{
-       return cookie != BLK_QC_T_NONE;
-}
-
 struct blk_rq_stat {
        u64 mean;
        u64 min;