[PATCH 21/26] n64cart: convert to blk_alloc_disk
flat view
STALE1951d
LANDED
From: Christoph Hellwig <hch@lst.de>
Date: 2021-05-21 05:53:00
Also in:
dm-devel, linux-block, linux-m68k, linux-mmc, linux-raid, linux-s390, linuxppc-dev, nvdimm
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Landed in mainline as f9dc931de806 on 2021-06-01.
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> --- drivers/block/n64cart.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/block/n64cart.c b/drivers/block/n64cart.c
index 3dae4b631dea..7b4dd10af9ec 100644
--- a/drivers/block/n64cart.c
+++ b/drivers/block/n64cart.c@@ -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;
--
2.30.2