From 11e6fb38bde51cba411163f95a32db84d5d220a2 Mon Sep 17 00:00:00 2001 From: Abinash Singh Date: Tue, 26 Aug 2025 00:09:40 +0530 Subject: [PATCH] scsi: sd: Make sd_revalidate_disk() return void The sd_revalidate_disk() function currently returns 0 for both success and memory allocation failure. Since none of its callers use the return value, this return code is both unnecessary and potentially misleading. Change the return type of sd_revalidate_disk() from int to void and remove all return value handling. This makes the function semantics clearer and avoids confusion about unused return codes. Reviewed-by: Bart Van Assche Reviewed-by: Damien Le Moal Signed-off-by: Abinash Singh Link: https://lore.kernel.org/r/20250825183940.13211-4-abinashsinghlalotra@gmail.com Signed-off-by: Martin K. Petersen --- drivers/scsi/sd.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 35856685d7fa2..b3926c43e700a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -106,7 +106,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, struct queue_limits *lim, unsigned int mode); static void sd_config_write_same(struct scsi_disk *sdkp, struct queue_limits *lim); -static int sd_revalidate_disk(struct gendisk *); +static void sd_revalidate_disk(struct gendisk *); static void sd_unlock_native_capacity(struct gendisk *disk); static void sd_shutdown(struct device *); static void scsi_disk_release(struct device *cdev); @@ -3691,7 +3691,7 @@ static void sd_read_block_zero(struct scsi_disk *sdkp) * performs disk spin up, read_capacity, etc. * @disk: struct gendisk we care about **/ -static int sd_revalidate_disk(struct gendisk *disk) +static void sd_revalidate_disk(struct gendisk *disk) { struct scsi_disk *sdkp = scsi_disk(disk); struct scsi_device *sdp = sdkp->device; @@ -3699,7 +3699,7 @@ static int sd_revalidate_disk(struct gendisk *disk) struct queue_limits *lim = NULL; unsigned char *buffer = NULL; unsigned int dev_max; - int err = 0; + int err; SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_revalidate_disk\n")); @@ -3709,11 +3709,11 @@ static int sd_revalidate_disk(struct gendisk *disk) * of the other niceties. */ if (!scsi_device_online(sdp)) - goto out; + return; lim = kmalloc(sizeof(*lim), GFP_KERNEL); if (!lim) - goto out; + return; buffer = kmalloc(SD_BUF_SIZE, GFP_KERNEL); if (!buffer) @@ -3823,7 +3823,6 @@ static int sd_revalidate_disk(struct gendisk *disk) kfree(buffer); kfree(lim); - return err; } /** -- 2.47.3