From mboxrd@z Thu Jan 1 00:00:00 1970 From: emilgoode@gmail.com (Emil Goode) Date: Fri, 17 May 2013 16:09:40 +0200 Subject: [PATCH] NVMe: Fix incompatible pointer type warnings Message-ID: <1368799780-2871-1-git-send-email-emilgoode@gmail.com> Commit 6a4d55146334 ("block: prep work for batch completion") added a struct batch_complete * as a third argument to bi_end_io. This patch adds the missing third argument to the nvme_bio_pair_endio function. Sparse output: drivers/block/nvme-core.c: In function ?nvme_bio_split?: drivers/block/nvme-core.c:483:19: warning: assignment from incompatible pointer type [enabled by default] drivers/block/nvme-core.c:484:19: warning: assignment from incompatible pointer type [enabled by default] Signed-off-by: Emil Goode --- drivers/block/nvme-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 8efdfaa..9380133 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -413,7 +413,8 @@ struct nvme_bio_pair { atomic_t cnt; }; -static void nvme_bio_pair_endio(struct bio *bio, int err) +static void nvme_bio_pair_endio(struct bio *bio, int err, + struct batch_complete *batch) { struct nvme_bio_pair *bp = bio->bi_private; -- 1.7.10.4