| Message ID | 20211215011336.194089-1-joel@jms.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: core: Fix blk_status_t handling | expand |
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
On Wed, 15 Dec 2021 at 02:13, Joel Stanley <joel@jms.id.au> wrote: > > 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> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/queue.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c > index b15c034b42fb..c69b2d9df6f1 100644 > --- a/drivers/mmc/core/queue.c > +++ b/drivers/mmc/core/queue.c > @@ -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; > -- > 2.34.1 >
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index b15c034b42fb..c69b2d9df6f1 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -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;
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> --- drivers/mmc/core/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)