From: ChanWoo Lee Date: Fri, 11 Nov 2022 06:23:01 +0000 (+0900) Subject: scsi: ufs: core: Fix unnecessary operation for early return X-Git-Tag: v6.2-rc1~97^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=222d227f375b4cfa517a8f1f0f266ebe0263ad05;p=thirdparty%2Fkernel%2Flinux.git scsi: ufs: core: Fix unnecessary operation for early return Setting bitmap_len is not required when returning early. Defer until it is needed. Signed-off-by: ChanWoo Lee Link: https://lore.kernel.org/r/20221111062301.7423-1-cw9316.lee@samsung.com Signed-off-by: Martin K. Petersen --- diff --git a/drivers/ufs/core/ufshpb.c b/drivers/ufs/core/ufshpb.c index fda3e7b494a61..be3fb24b93d8e 100644 --- a/drivers/ufs/core/ufshpb.c +++ b/drivers/ufs/core/ufshpb.c @@ -233,11 +233,6 @@ next_srgn: rgn = hpb->rgn_tbl + rgn_idx; srgn = rgn->srgn_tbl + srgn_idx; - if (likely(!srgn->is_last)) - bitmap_len = hpb->entries_per_srgn; - else - bitmap_len = hpb->last_srgn_entries; - if (!ufshpb_is_valid_srgn(rgn, srgn)) return true; @@ -253,6 +248,11 @@ next_srgn: return true; } + if (likely(!srgn->is_last)) + bitmap_len = hpb->entries_per_srgn; + else + bitmap_len = hpb->last_srgn_entries; + if ((srgn_offset + cnt) > bitmap_len) bit_len = bitmap_len - srgn_offset; else