scsi: sd: Remove unnecessary condition in sd_read_block_limits()

Lukas Czerner · martinkpetersen · commit 9c95be0163a0 · 2017-09-15T15:14:28.000-04:00
After series of changes around WRITE_SAME and UNMAP setup we ended up
with leftover unnecessary condition. Remove it.

Signed-off-by: Lukas Czerner &lt;lczerner@redhat.com&gt;
Reviewed-by: Bart Van Assche &lt;bart.vanassche@wdc.com&gt;
Signed-off-by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
@@ -2915,8 +2915,6 @@ static void sd_read_block_limits(struct scsi_disk *sdkp)
 				sd_config_discard(sdkp, SD_LBP_WS16);
 			else if (sdkp->lbpws10)
 				sd_config_discard(sdkp, SD_LBP_WS10);
-			else if (sdkp->lbpu && sdkp->max_unmap_blocks)
-				sd_config_discard(sdkp, SD_LBP_UNMAP);
 			else
 				sd_config_discard(sdkp, SD_LBP_DISABLE);
 		}

Original file line number	Diff line number	Diff line change
`@@ -2915,8 +2915,6 @@ static void sd_read_block_limits(struct scsi_disk *sdkp)`
`2915`	`2915`	`sd_config_discard(sdkp, SD_LBP_WS16);`
`2916`	`2916`	`else if (sdkp->lbpws10)`
`2917`	`2917`	`sd_config_discard(sdkp, SD_LBP_WS10);`
`2918`		`- else if (sdkp->lbpu && sdkp->max_unmap_blocks)`
`2919`		`- sd_config_discard(sdkp, SD_LBP_UNMAP);`
`2920`	`2918`	`else`
`2921`	`2919`	`sd_config_discard(sdkp, SD_LBP_DISABLE);`
`2922`	`2920`	`}`