link_startup_again flow in ufshcd_link_startup() is not necessary since currently device can be moved to "active" power mode during resume flow by commit as below,

"scsi: ufs: set device as default active power mode during initialization only"

Fixes: 7caf489b99a4 (scsi: ufs: issue link starup 2 times if device isn't active) Cc: Alim Akhtar alim.akhtar@samsung.com Cc: Avri Altman avri.altman@wdc.com Cc: Bart Van Assche bvanassche@acm.org Cc: Bean Huo beanhuo@micron.com Cc: Can Guo cang@codeaurora.org Cc: Matthias Brugger matthias.bgg@gmail.com Cc: Subhash Jadavani subhashj@codeaurora.org Cc: stable@vger.kernel.org Signed-off-by: Stanley Chu stanley.chu@mediatek.com --- drivers/scsi/ufs/ufshcd.c | 15 --------------- 1 file changed, 15 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 9abb7085a5d0..1900f811394a 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -4365,16 +4365,7 @@ static int ufshcd_link_startup(struct ufs_hba *hba) { int ret; int retries = DME_LINKSTARTUP_RETRIES; - bool link_startup_again = false;

- /* - * If UFS device isn't active then we will have to issue link startup - * 2 times to make sure the device state move to active. - */ - if (!ufshcd_is_ufs_dev_active(hba)) - link_startup_again = true; - -link_startup: do { ufshcd_vops_link_startup_notify(hba, PRE_CHANGE);

@@ -4408,12 +4399,6 @@ static int ufshcd_link_startup(struct ufs_hba *hba) goto out; }

- if (link_startup_again) { - link_startup_again = false; - retries = DME_LINKSTARTUP_RETRIES; - goto link_startup; - } - /* Mark that link is up in PWM-G1, 1-lane, SLOW-AUTO mode */ ufshcd_init_pwr_info(hba); ufshcd_print_pwr_info(hba);