Moving the assignment to nr_zones makes this a little simpler
while also avoiding the warning reliably. I'm removing the
extraneous initialization of 'int ret' in the same patch, as
that is semi-related and could cause an uninitialized use of
that variable to not produce a warning.

Fixes: 6a0cb1bc106f ("block: Implement support for zoned block devices")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 block/blk-zoned.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 667f95d86695..472211fa183a 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c

@@ -80,7 +80,7 @@ int blkdev_report_zones(struct block_device *bdev,
        unsigned int i, n, nz;
        unsigned int ofst;
        void *addr;
-       int ret =3D 0;
+       int ret;

        if (!q)
                return -ENXIO;

@@ -179,14 +179,12 @@ int blkdev_report_zones(struct block_device *bdev,

        }

+       *nr_zones =3D nz;
 out:
        bio_for_each_segment_all(bv, bio, i)
                __free_page(bv->bv_page);
        bio_put(bio);

-       if (ret =3D=3D 0)
-               *nr_zones =3D nz;
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(blkdev_report_zones);
--

2.9.0