Commit 140ea3bbf39a ("sd: use __register_blkdev to avoid a modprobe for an
unregistered dev_t") removed blk_register_region(devt, ...) in sd_remove()
and since then, devt is unused in sd_remove().
Hence, make W=1 warns:
drivers/scsi/sd.c:3516:8:
warning: variable 'devt' set but not used [-Wunused-but-set-variable]
Simply remove this obsolete variable.
Signed-off-by: Lukas Bulwahn <[email protected]>
---
applies cleanly on current master and next-20201113
Christoph, Hannes, please ack.
Martin, James, please pick this minor non-urgent clean-up patch.
drivers/scsi/sd.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 106a9cda0eb7..82d0cb97b758 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3513,10 +3513,8 @@ static int sd_probe(struct device *dev)
static int sd_remove(struct device *dev)
{
struct scsi_disk *sdkp;
- dev_t devt;
sdkp = dev_get_drvdata(dev);
- devt = disk_devt(sdkp->disk);
scsi_autopm_get_device(sdkp->device);
async_synchronize_full_domain(&scsi_sd_pm_domain);
--
2.17.1
Looks good,
Reviewed-by: Christoph Hellwig <[email protected]>
On Mon, Nov 16, 2020 at 08:00:35AM +0100, Lukas Bulwahn wrote:
> Commit 140ea3bbf39a ("sd: use __register_blkdev to avoid a modprobe for an
> unregistered dev_t") removed blk_register_region(devt, ...) in sd_remove()
> and since then, devt is unused in sd_remove().
>
> Hence, make W=1 warns:
>
> drivers/scsi/sd.c:3516:8:
> warning: variable 'devt' set but not used [-Wunused-but-set-variable]
>
> Simply remove this obsolete variable.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>
Reviewed-by: Nathan Chancellor <[email protected]>
Lukas,
> Commit 140ea3bbf39a ("sd: use __register_blkdev to avoid a modprobe
> for an unregistered dev_t") removed blk_register_region(devt, ...) in
> sd_remove() and since then, devt is unused in sd_remove().
Applied to 5.11/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
>> Commit 140ea3bbf39a ("sd: use __register_blkdev to avoid a modprobe
>> for an unregistered dev_t") removed blk_register_region(devt, ...) in
>> sd_remove() and since then, devt is unused in sd_remove().
>
> Applied to 5.11/scsi-staging, thanks!
Actually, this should go through block given the dependency on the
commit above.
Acked-by: Martin K. Petersen <[email protected]>
--
Martin K. Petersen Oracle Linux Engineering