[PATCH 07/15] blk-mq: remove blk_qc_t_valid

Christoph Hellwig
2021-05-12T13:16:40Z

Move the trivial check into the only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-mq.c | 2 +-
include/linux/blk_types.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 919712e2b34c..ac0b517c5503 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3919,7 +3919,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 4c28ab22f93d..d0cf835d3b50 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -510,11 +510,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;
--
2.30.2