scsi: sd: Move the sd_config_discard() function definition

Move the sd_config_discard() 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-3-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 b30c5069337247adaca6a1765327c08669d8071e..28444c81bf821b39a5b6d081c30c2ebeb18475a2 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -102,8 +102,6 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_ZBC);
 
 #define SD_MINORS      16
 
-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 void  sd_revalidate_disk(struct gendisk *);
@@ -120,6 +118,62 @@ static const char *sd_cache_types[] = {
        "write back, no read (daft)"
 };
 
+static void sd_disable_discard(struct scsi_disk *sdkp)
+{
+       sdkp->provisioning_mode = SD_LBP_DISABLE;
+       blk_queue_disable_discard(sdkp->disk->queue);
+}
+
+static void sd_config_discard(struct scsi_disk *sdkp, struct queue_limits *lim,
+               unsigned int mode)
+{
+       unsigned int logical_block_size = sdkp->device->sector_size;
+       unsigned int max_blocks = 0;
+
+       lim->discard_alignment = sdkp->unmap_alignment * logical_block_size;
+       lim->discard_granularity = max(sdkp->physical_block_size,
+                       sdkp->unmap_granularity * logical_block_size);
+       sdkp->provisioning_mode = mode;
+
+       switch (mode) {
+
+       case SD_LBP_FULL:
+       case SD_LBP_DISABLE:
+               break;
+
+       case SD_LBP_UNMAP:
+               max_blocks = min_not_zero(sdkp->max_unmap_blocks,
+                                         (u32)SD_MAX_WS16_BLOCKS);
+               break;
+
+       case SD_LBP_WS16:
+               if (sdkp->device->unmap_limit_for_ws)
+                       max_blocks = sdkp->max_unmap_blocks;
+               else
+                       max_blocks = sdkp->max_ws_blocks;
+
+               max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS16_BLOCKS);
+               break;
+
+       case SD_LBP_WS10:
+               if (sdkp->device->unmap_limit_for_ws)
+                       max_blocks = sdkp->max_unmap_blocks;
+               else
+                       max_blocks = sdkp->max_ws_blocks;
+
+               max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS10_BLOCKS);
+               break;
+
+       case SD_LBP_ZERO:
+               max_blocks = min_not_zero(sdkp->max_ws_blocks,
+                                         (u32)SD_MAX_WS10_BLOCKS);
+               break;
+       }
+
+       lim->max_hw_discard_sectors = max_blocks *
+               (logical_block_size >> SECTOR_SHIFT);
+}
+
 static void sd_set_flush_flag(struct scsi_disk *sdkp,
                struct queue_limits *lim)
 {
@@ -865,62 +919,6 @@ static unsigned char sd_setup_protect_cmnd(struct scsi_cmnd *scmd,
        return protect;
 }
 
-static void sd_disable_discard(struct scsi_disk *sdkp)
-{
-       sdkp->provisioning_mode = SD_LBP_DISABLE;
-       blk_queue_disable_discard(sdkp->disk->queue);
-}
-
-static void sd_config_discard(struct scsi_disk *sdkp, struct queue_limits *lim,
-               unsigned int mode)
-{
-       unsigned int logical_block_size = sdkp->device->sector_size;
-       unsigned int max_blocks = 0;
-
-       lim->discard_alignment = sdkp->unmap_alignment * logical_block_size;
-       lim->discard_granularity = max(sdkp->physical_block_size,
-                       sdkp->unmap_granularity * logical_block_size);
-       sdkp->provisioning_mode = mode;
-
-       switch (mode) {
-
-       case SD_LBP_FULL:
-       case SD_LBP_DISABLE:
-               break;
-
-       case SD_LBP_UNMAP:
-               max_blocks = min_not_zero(sdkp->max_unmap_blocks,
-                                         (u32)SD_MAX_WS16_BLOCKS);
-               break;
-
-       case SD_LBP_WS16:
-               if (sdkp->device->unmap_limit_for_ws)
-                       max_blocks = sdkp->max_unmap_blocks;
-               else
-                       max_blocks = sdkp->max_ws_blocks;
-
-               max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS16_BLOCKS);
-               break;
-
-       case SD_LBP_WS10:
-               if (sdkp->device->unmap_limit_for_ws)
-                       max_blocks = sdkp->max_unmap_blocks;
-               else
-                       max_blocks = sdkp->max_ws_blocks;
-
-               max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS10_BLOCKS);
-               break;
-
-       case SD_LBP_ZERO:
-               max_blocks = min_not_zero(sdkp->max_ws_blocks,
-                                         (u32)SD_MAX_WS10_BLOCKS);
-               break;
-       }
-
-       lim->max_hw_discard_sectors = max_blocks *
-               (logical_block_size >> SECTOR_SHIFT);
-}
-
 static void *sd_set_special_bvec(struct request *rq, unsigned int data_len)
 {
        struct page *page;