scsi: ufs: ufshpb: Clean up ufshpb_suspend()/resume()

ufshpb_resume() is only called when the HPB state is HPB_SUSPEND, so the
check statement for "ufshpb_get_state(hpb) != HPB_PRESENT" is useless.

Link: https://lore.kernel.org/r/20220505134707.35929-7-huobean@gmail.com
Reviewed-by: Keoseong Park <keosung.park@samsung.com>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index 859e7ee7bf5789c1338a032a084aa8fad0d72b3e..f1f65383e97de2314f53a6398a188945cd95905e 100644 (file)
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -2349,11 +2349,9 @@ void ufshpb_suspend(struct ufs_hba *hba)
 
        shost_for_each_device(sdev, hba->host) {
                hpb = ufshpb_get_hpb_data(sdev);
-               if (!hpb)
+               if (!hpb || ufshpb_get_state(hpb) != HPB_PRESENT)
                        continue;
 
-               if (ufshpb_get_state(hpb) != HPB_PRESENT)
-                       continue;
                ufshpb_set_state(hpb, HPB_SUSPEND);
                ufshpb_cancel_jobs(hpb);
        }
@@ -2366,20 +2364,15 @@ void ufshpb_resume(struct ufs_hba *hba)
 
        shost_for_each_device(sdev, hba->host) {
                hpb = ufshpb_get_hpb_data(sdev);
-               if (!hpb)
+               if (!hpb || ufshpb_get_state(hpb) != HPB_SUSPEND)
                        continue;
 
-               if ((ufshpb_get_state(hpb) != HPB_PRESENT) &&
-                   (ufshpb_get_state(hpb) != HPB_SUSPEND))
-                       continue;
                ufshpb_set_state(hpb, HPB_PRESENT);
                ufshpb_kick_map_work(hpb);
                if (hpb->is_hcm) {
-                       unsigned int poll =
-                               hpb->params.timeout_polling_interval_ms;
+                       unsigned int poll = hpb->params.timeout_polling_interval_ms;
 
-                       schedule_delayed_work(&hpb->ufshpb_read_to_work,
-                               msecs_to_jiffies(poll));
+                       schedule_delayed_work(&hpb->ufshpb_read_to_work, msecs_to_jiffies(poll));
                }
        }
 }