From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Date: Sun, 29 Mar 2020 16:08:26 +0000 (-0600)
Subject: block: return NULL in blk_alloc_queue() on error
X-Git-Tag: microblaze-v5.10~1194^2
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=654a3667df364f778b9b5bcdfb32e545aceb6a51;p=linux-2.6-microblaze.git

block: return NULL in blk_alloc_queue() on error

This patch fixes follwoing warning:

block/blk-core.c: In function ‘blk_alloc_queue’:
block/blk-core.c:558:10: warning: returning ‘int’ from a function with return type ‘struct request_queue *’ makes pointer from integer without a cast [-Wint-conversion]
   return -EINVAL;

Fixes: 3d745ea5b095a ("block: simplify queue allocation")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-core.c b/block/blk-core.c
index 18b8c09d093e..7e4a1da0715e 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -555,7 +555,7 @@ struct request_queue *blk_alloc_queue(make_request_fn make_request, int node_id)
 	struct request_queue *q;
 
 	if (WARN_ON_ONCE(!make_request))
-		return -EINVAL;
+		return NULL;
 
 	q = __blk_alloc_queue(node_id);
 	if (!q)