From: Stanley Chu <stanley.chu@mediatek.com>
Date: Thu, 12 Sep 2019 08:35:28 +0000 (+0800)
Subject: scsi: core: remove dummy q->dev check
X-Git-Tag: v5.4-rc1~148^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b804049dce9128a88558bc1594ff96d6632fbc10;p=linux.git

scsi: core: remove dummy q->dev check

Currently blk_set_runtime_active() is checking if q->dev is null by
itself, thus remove the same checking in its user: scsi_dev_type_resume().

Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index 74ded5f3c236..3717eea37ecb 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -94,8 +94,7 @@ static int scsi_dev_type_resume(struct device *dev,
 		if (!err && scsi_is_sdev_device(dev)) {
 			struct scsi_device *sdev = to_scsi_device(dev);
 
-			if (sdev->request_queue->dev)
-				blk_set_runtime_active(sdev->request_queue);
+			blk_set_runtime_active(sdev->request_queue);
 		}
 	}