From: Abinash Singh <abinashsinghlalotra@gmail.com>
To: bvanassche@acm.org
Cc: James.Bottomley@HansenPartnership.com,
abinashsinghlalotra@gmail.com, dlemoal@kernel.org,
linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
martin.petersen@oracle.com
Subject: [PATCH v9 3/3] scsi: sd: make sd_revalidate_disk() return void
Date: Sun, 24 Aug 2025 23:32:18 +0530 [thread overview]
Message-ID: <20250824180218.39498-4-abinashsinghlalotra@gmail.com> (raw)
In-Reply-To: <20250824180218.39498-1-abinashsinghlalotra@gmail.com>
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.
Signed-off-by: Abinash Singh <abinashsinghlalotra@gmail.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
---
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 35856685d7fa..b3926c43e700 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.43.0
next prev parent reply other threads:[~2025-08-24 18:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-24 18:02 [PATCH v9 0/3] scsi: sd: Cleanups and warning fixes in sd_revalidate_disk() Abinash Singh
2025-08-24 18:02 ` [PATCH v9 1/3] scsi: sd: Remove redundant printk after kmalloc failure Abinash Singh
2025-08-25 1:56 ` Damien Le Moal
2025-08-24 18:02 ` [PATCH v9 2/3] scsi: sd: Fix build warning in sd_revalidate_disk() Abinash Singh
2025-08-25 1:53 ` Damien Le Moal
2025-08-24 18:02 ` Abinash Singh [this message]
2025-08-25 1:58 ` [PATCH v9 3/3] scsi: sd: make sd_revalidate_disk() return void Damien Le Moal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250824180218.39498-4-abinashsinghlalotra@gmail.com \
--to=abinashsinghlalotra@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=bvanassche@acm.org \
--cc=dlemoal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®