sd: simplify the disable case in sd_config_discard

Fall through to the main call to blk_queue_max_discard_sectors given that
max_blocks has been initialized to zero above instead of duplicating the
call.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d8d3a660458f5bcff95909f9844ec744de9b2684..d7314253917302e0dfee73f645e2052a08467265 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -844,8 +844,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode)
 
        case SD_LBP_FULL:
        case SD_LBP_DISABLE:
-               blk_queue_max_discard_sectors(q, 0);
-               return;
+               break;
 
        case SD_LBP_UNMAP:
                max_blocks = min_not_zero(sdkp->max_unmap_blocks,