n64cart: convert to blk_alloc_disk
authorChristoph Hellwig <hch@lst.de>
Fri, 21 May 2021 05:51:11 +0000 (07:51 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 1 Jun 2021 13:42:24 +0000 (07:42 -0600)
Convert the n64cart driver to use the blk_alloc_disk helper to simplify
gendisk and request_queue allocation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20210521055116.1053587-22-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/n64cart.c

index 3dae4b631dea600506f7bb85f0cdc0f099a4f1c0..7b4dd10af9ec528021af6781d82fca5b1aecd686 100644 (file)
@@ -132,14 +132,10 @@ static int __init n64cart_probe(struct platform_device *pdev)
        if (!reg_base)
                return -EINVAL;
 
-       disk = alloc_disk(0);
+       disk = blk_alloc_disk(NUMA_NO_NODE);
        if (!disk)
                return -ENOMEM;
 
-       disk->queue = blk_alloc_queue(NUMA_NO_NODE);
-       if (!disk->queue)
-               return -ENOMEM;
-
        disk->first_minor = 0;
        disk->flags = GENHD_FL_NO_PART_SCAN;
        disk->fops = &n64cart_fops;