Commit 0a5167e2 authored by Bao D. Nguyen's avatar Bao D. Nguyen Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Remove ufshcd_urgent_bkops() 



ufshcd_urgent_bkops() is a wrapper function. It only calls
ufshcd_bkops_ctrl(). Remove it to simplify the ufs core driver. Replace any
references to ufshcd_urgent_bkops() with ufshcd_bkops_ctrl().

In addition, remove the second parameter in the ufshcd_bkops_ctrl() because
the information can be retrieved from the first parameter.

Signed-off-by: default avatarBao D. Nguyen <quic_nguyenb@quicinc.com>
Link: https://lore.kernel.org/r/0c7f2c8d68408e39c28e3e81addce09cc0ee3969.1724800328.git.quic_nguyenb@quicinc.com


Acked-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3e3ac9c3

drivers/ufs/core/ufshcd.c

+7 −25
Original line number Diff line number Diff line
@@ -5870,12 +5870,11 @@ static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status) 
/**

 * ufshcd_bkops_ctrl - control the auto bkops based on current bkops status

 * @hba: per-adapter instance

 * @status: bkops_status value

 *

 * Read the bkops_status from the UFS device and Enable fBackgroundOpsEn

 * flag in the device to permit background operations if the device

 * bkops_status is greater than or equal to "status" argument passed to

 * this function, disable otherwise.

 * bkops_status is greater than or equal to the "hba->urgent_bkops_lvl",

 * disable otherwise.

 *

 * Return: 0 for success, non-zero in case of failure.

 *
@@ -5883,11 +5882,11 @@ static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status) 
 * to know whether auto bkops is enabled or disabled after this function

 * returns control to it.

 */

static int ufshcd_bkops_ctrl(struct ufs_hba *hba,

			     enum bkops_status status)

static int ufshcd_bkops_ctrl(struct ufs_hba *hba)

{

	int err;

	enum bkops_status status = hba->urgent_bkops_lvl;

	u32 curr_status = 0;

	int err;



	err = ufshcd_get_bkops_status(hba, &curr_status);

	if (err) {
@@ -5909,23 +5908,6 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba, 
	return err;

}



/**

 * ufshcd_urgent_bkops - handle urgent bkops exception event

 * @hba: per-adapter instance

 *

 * Enable fBackgroundOpsEn flag in the device to permit background

 * operations.

 *

 * If BKOPs is enabled, this function returns 0, 1 if the bkops in not enabled

 * and negative error value for any other failure.

 *

 * Return: 0 upon success; < 0 upon failure.

 */

static int ufshcd_urgent_bkops(struct ufs_hba *hba)

{

	return ufshcd_bkops_ctrl(hba, hba->urgent_bkops_lvl);

}



static inline int ufshcd_get_ee_status(struct ufs_hba *hba, u32 *status)

{

	return ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR,
@@ -9682,7 +9664,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) 
			 * allow background operations if bkops status shows

			 * that performance might be impacted.

			 */

			ret = ufshcd_urgent_bkops(hba);

			ret = ufshcd_bkops_ctrl(hba);

			if (ret) {

				/*

				 * If return err in suspend flow, IO will hang.
@@ -9871,7 +9853,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) 
		 * If BKOPs operations are urgently needed at this moment then

		 * keep auto-bkops enabled or else disable it.

		 */

		ufshcd_urgent_bkops(hba);

		ufshcd_bkops_ctrl(hba);



	if (hba->ee_usr_mask)

		ufshcd_write_ee_control(hba);