mmc: core: Fix blk_status_t handling
authorJoel Stanley <joel@jms.id.au>
Wed, 15 Dec 2021 01:13:36 +0000 (11:43 +1030)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 21 Dec 2021 12:07:25 +0000 (13:07 +0100)
Sparse spits out this following warning:

drivers/mmc/core/queue.c:311:21: warning: incorrect type in assignment (different base types)
drivers/mmc/core/queue.c:311:21:    expected int ret
drivers/mmc/core/queue.c:311:21:    got restricted blk_status_t [usertype]
drivers/mmc/core/queue.c:314:21: warning: incorrect type in assignment (different base types)
drivers/mmc/core/queue.c:314:21:    expected int ret
drivers/mmc/core/queue.c:314:21:    got restricted blk_status_t [usertype]
drivers/mmc/core/queue.c:336:16: warning: incorrect type in return expression (different base types)
drivers/mmc/core/queue.c:336:16:    expected restricted blk_status_t
drivers/mmc/core/queue.c:336:16:    got int [assigned] ret

ret is only used for blk_status_t types, so make it that type.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211215011336.194089-1-joel@jms.id.au
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/queue.c

index b15c034b42fb5957954b2fbf6b27261e43fb243d..c69b2d9df6f16df48f5ded2e9df6a49cf0ff9787 100644 (file)
@@ -234,7 +234,7 @@ static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
        enum mmc_issue_type issue_type;
        enum mmc_issued issued;
        bool get_card, cqe_retune_ok;
-       int ret;
+       blk_status_t ret;
 
        if (mmc_card_removed(mq->card)) {
                req->rq_flags |= RQF_QUIET;