Message ID | 20191218002329.48593-1-bvanassche@acm.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | block: Fix the type of 'sts' in bsg_queue_rq() | expand |
On 12/17/19 5:23 PM, Bart Van Assche wrote: > This patch fixes the following sparse warnings: > > block/bsg-lib.c:269:19: warning: incorrect type in initializer (different base types) > block/bsg-lib.c:269:19: expected int sts > block/bsg-lib.c:269:19: got restricted blk_status_t [usertype] > block/bsg-lib.c:286:16: warning: incorrect type in return expression (different base types) > block/bsg-lib.c:286:16: expected restricted blk_status_t > block/bsg-lib.c:286:16: got int [assigned] sts Applied, thanks Bart.
diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 347dda16c2f4..6cbb7926534c 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -266,7 +266,7 @@ static blk_status_t bsg_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req = bd->rq; struct bsg_set *bset = container_of(q->tag_set, struct bsg_set, tag_set); - int sts = BLK_STS_IOERR; + blk_status_t sts = BLK_STS_IOERR; int ret; blk_mq_start_request(req);
This patch fixes the following sparse warnings: block/bsg-lib.c:269:19: warning: incorrect type in initializer (different base types) block/bsg-lib.c:269:19: expected int sts block/bsg-lib.c:269:19: got restricted blk_status_t [usertype] block/bsg-lib.c:286:16: warning: incorrect type in return expression (different base types) block/bsg-lib.c:286:16: expected restricted blk_status_t block/bsg-lib.c:286:16: got int [assigned] sts Cc: Martin Wilck <mwilck@suse.com> Fixes: d46fe2cb2dce ("block: drop device references in bsg_queue_rq()") Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- block/bsg-lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)