aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-08-16 15:19:07 +0200
committerJens Axboe <axboe@kernel.dk>2021-08-23 12:54:30 -0600
commita58bd7683fcb60ae24c8572f932b48bc65719b7c (patch)
treea8d555d924ba357bc4953be4ed31483b0f08eb9c /drivers/scsi/sd.c
parent9c2b9dbafc067e173db30c4fd0636392d27944e8 (diff)
downloadlinux-a58bd7683fcb60ae24c8572f932b48bc65719b7c.tar.gz
block: remove the minors argument to __alloc_disk_node
This was a leftover from the legacy alloc_disk interface. Switch the scsi ULPs and dasd to set ->minors directly like all other drivers and remove the argument. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Stefan Haberland <sth@linux.ibm.com> [dasd] Link: https://lore.kernel.org/r/20210816131910.615153-7-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a9535c6484de0..1c6b8f0122198 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3409,7 +3409,7 @@ static int sd_probe(struct device *dev)
if (!sdkp)
goto out;
- gd = __alloc_disk_node(SD_MINORS, NUMA_NO_NODE, &sd_bio_compl_lkclass);
+ gd = __alloc_disk_node(NUMA_NO_NODE, &sd_bio_compl_lkclass);
if (!gd)
goto out_free;
@@ -3455,6 +3455,7 @@ static int sd_probe(struct device *dev)
gd->major = sd_major((index & 0xf0) >> 4);
gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
+ gd->minors = SD_MINORS;
gd->fops = &sd_fops;
gd->private_data = &sdkp->driver;