Re: [PATCH v5 09/10] scsi: ufs: Inline ufshcd_mcq_vops_get_hba_mac()

[Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>]

On Mon, Jul 08, 2024 at 02:16:04PM -0700, Bart Van Assche wrote:
> Make ufshcd_mcq_decide_queue_depth() easier to read by inlining
> ufshcd_mcq_vops_get_hba_mac().
> 
> Reviewed-by: Peter Wang <peter.wang@mediatek.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

- Mani

> ---
>  drivers/ufs/core/ufs-mcq.c     | 18 +++++++++++-------
>  drivers/ufs/core/ufshcd-priv.h |  8 --------
>  2 files changed, 11 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
> index 0a9597a6d059..ef98c9797d07 100644
> --- a/drivers/ufs/core/ufs-mcq.c
> +++ b/drivers/ufs/core/ufs-mcq.c
> @@ -144,14 +144,14 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_queue_cfg_addr);
>   */
>  int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba)
>  {
> -	int mac;
> +	int mac = -EOPNOTSUPP;
>  
> -	/* Mandatory to implement get_hba_mac() */
> -	mac = ufshcd_mcq_vops_get_hba_mac(hba);
> -	if (mac < 0) {
> -		dev_err(hba->dev, "Failed to get mac, err=%d\n", mac);
> -		return mac;
> -	}
> +	if (!hba->vops || !hba->vops->get_hba_mac)
> +		goto err;
> +
> +	mac = hba->vops->get_hba_mac(hba);
> +	if (mac < 0)
> +		goto err;
>  
>  	WARN_ON_ONCE(!hba->dev_info.bqueuedepth);
>  	/*
> @@ -160,6 +160,10 @@ int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba)
>  	 * shared queuing architecture is enabled.
>  	 */
>  	return min_t(int, mac, hba->dev_info.bqueuedepth);
> +
> +err:
> +	dev_err(hba->dev, "Failed to get mac, err=%d\n", mac);
> +	return mac;
>  }
>  
>  static int ufshcd_mcq_config_nr_queues(struct ufs_hba *hba)
> diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
> index 668748477e6e..88ce93748305 100644
> --- a/drivers/ufs/core/ufshcd-priv.h
> +++ b/drivers/ufs/core/ufshcd-priv.h
> @@ -249,14 +249,6 @@ static inline int ufshcd_vops_mcq_config_resource(struct ufs_hba *hba)
>  	return -EOPNOTSUPP;
>  }
>  
> -static inline int ufshcd_mcq_vops_get_hba_mac(struct ufs_hba *hba)
> -{
> -	if (hba->vops && hba->vops->get_hba_mac)
> -		return hba->vops->get_hba_mac(hba);
> -
> -	return -EOPNOTSUPP;
> -}
> -
>  static inline int ufshcd_mcq_vops_op_runtime_config(struct ufs_hba *hba)
>  {
>  	if (hba->vops && hba->vops->op_runtime_config)

-- 
மணிவண்ணன் சதாசிவம்