Skip to content

Commit daf7795

Browse files
bvanasschemartinkpetersen
authored andcommitted
scsi: ufs: core: Simplify power management during async scan
ufshcd_init() calls pm_runtime_get_sync() before it calls async_schedule(). ufshcd_async_scan() calls pm_runtime_put_sync() directly or indirectly from ufshcd_add_lus(). Simplify ufshcd_async_scan() by always calling pm_runtime_put_sync() from ufshcd_async_scan(). Cc: <stable@vger.kernel.org> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20231218225229.2542156-2-bvanassche@acm.org Reviewed-by: Can Guo <quic_cang@quicinc.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 45a2c87 commit daf7795

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/ufs/core/ufshcd.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8711,7 +8711,6 @@ static int ufshcd_add_lus(struct ufs_hba *hba)
87118711

87128712
ufs_bsg_probe(hba);
87138713
scsi_scan_host(hba->host);
8714-
pm_runtime_put_sync(hba->dev);
87158714

87168715
out:
87178716
return ret;
@@ -8980,15 +8979,15 @@ static void ufshcd_async_scan(void *data, async_cookie_t cookie)
89808979

89818980
/* Probe and add UFS logical units */
89828981
ret = ufshcd_add_lus(hba);
8982+
89838983
out:
8984+
pm_runtime_put_sync(hba->dev);
89848985
/*
89858986
* If we failed to initialize the device or the device is not
89868987
* present, turn off the power/clocks etc.
89878988
*/
8988-
if (ret) {
8989-
pm_runtime_put_sync(hba->dev);
8989+
if (ret)
89908990
ufshcd_hba_exit(hba);
8991-
}
89928991
}
89938992

89948993
static enum scsi_timeout_action ufshcd_eh_timed_out(struct scsi_cmnd *scmd)

0 commit comments

Comments
 (0)