scsi: sd: Move the scsi_disk_release() function definition

Move the scsi_disk_release() function definition such that its forward
declaration can be removed.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260114175054.4118163-4-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 28444c81bf821b39a5b6d081c30c2ebeb18475a2..0d07f37342577e94f914a7370579c6458e48ef4c 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -106,7 +106,6 @@ static void sd_config_write_same(struct scsi_disk *sdkp,
                struct queue_limits *lim);
 static void  sd_revalidate_disk(struct gendisk *);
 static void sd_unlock_native_capacity(struct gendisk *disk);
-static void scsi_disk_release(struct device *cdev);
 
 static DEFINE_IDA(sd_index_ida);
 
@@ -751,6 +750,17 @@ static struct attribute *sd_disk_attrs[] = {
 };
 ATTRIBUTE_GROUPS(sd_disk);
 
+static void scsi_disk_release(struct device *dev)
+{
+       struct scsi_disk *sdkp = to_scsi_disk(dev);
+
+       ida_free(&sd_index_ida, sdkp->index);
+       put_device(&sdkp->device->sdev_gendev);
+       free_opal_dev(sdkp->opal_dev);
+
+       kfree(sdkp);
+}
+
 static struct class sd_disk_class = {
        .name           = "scsi_disk",
        .dev_release    = scsi_disk_release,
@@ -4084,17 +4094,6 @@ static int sd_probe(struct scsi_device *sdp)
        return error;
 }
 
-static void scsi_disk_release(struct device *dev)
-{
-       struct scsi_disk *sdkp = to_scsi_disk(dev);
-
-       ida_free(&sd_index_ida, sdkp->index);
-       put_device(&sdkp->device->sdev_gendev);
-       free_opal_dev(sdkp->opal_dev);
-
-       kfree(sdkp);
-}
-
 static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
 {
        unsigned char cmd[6] = { START_STOP };  /* START_VALID */