From: Shida Zhang <[email protected]>
In a configuration with CONFIG_SCSI_UFS_MEDIATEK set to 'm' and
CONFIG_PM set to 'n', errors occur at compile time:
====
../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_suspend’:
../drivers/ufs/host/ufs-mediatek.c:1621:8: error: implicit declaration of function ‘ufshcd_runtime_suspend’; did you mean ‘ufs_mtk_runtime_suspend’? [-Werror=implicit-function-declaration]
../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_resume’:
../drivers/ufs/host/ufs-mediatek.c:1636:9: error: implicit declaration of function ‘ufshcd_runtime_resume’; did you mean ‘ufs_mtk_runtime_resume’? [-Werror=implicit-function-declaration]
====
This patch fixes these by guarding these functions with CONFIG_PM.
Reported-by: k2ci <[email protected]>
Signed-off-by: Shida Zhang <[email protected]>
---
Changes in v2:
Guarding these functions with CONFIG_PM instead of selecting the config.
drivers/ufs/host/ufs-mediatek.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index 21d9b047539f..73e217260390 100644
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c
@@ -1613,6 +1613,7 @@ static int ufs_mtk_system_resume(struct device *dev)
}
#endif
+#ifdef CONFIG_PM
static int ufs_mtk_runtime_suspend(struct device *dev)
{
struct ufs_hba *hba = dev_get_drvdata(dev);
@@ -1635,6 +1636,7 @@ static int ufs_mtk_runtime_resume(struct device *dev)
return ufshcd_runtime_resume(dev);
}
+#endif
static const struct dev_pm_ops ufs_mtk_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ufs_mtk_system_suspend,
--
2.27.0
On Tue, Feb 21, 2023 at 10:50:55AM +0800, Stephen Zhang wrote:
> From: Shida Zhang <[email protected]>
>
Subject could be fixed as:
"scsi: ufs: mediatek: Guard runtime PM functions"
> In a configuration with CONFIG_SCSI_UFS_MEDIATEK set to 'm' and
> CONFIG_PM set to 'n', errors occur at compile time:
>
> ====
> ../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_suspend’:
> ../drivers/ufs/host/ufs-mediatek.c:1621:8: error: implicit declaration of function ‘ufshcd_runtime_suspend’; did you mean ‘ufs_mtk_runtime_suspend’? [-Werror=implicit-function-declaration]
> ../drivers/ufs/host/ufs-mediatek.c: In function ‘ufs_mtk_runtime_resume’:
> ../drivers/ufs/host/ufs-mediatek.c:1636:9: error: implicit declaration of function ‘ufshcd_runtime_resume’; did you mean ‘ufs_mtk_runtime_resume’? [-Werror=implicit-function-declaration]
> ====
>
> This patch fixes these by guarding these functions with CONFIG_PM.
>
Remove reference to "patch" in the commit message as it will be meaningless
once merged. The line could be reworded as,
"Fix these errors by guarding the runtime PM functions with CONFIG_PM"
> Reported-by: k2ci <[email protected]>
> Signed-off-by: Shida Zhang <[email protected]>
With the changes,
Reviewed-by: Manivannan Sadhasivam <[email protected]>
Thanks,
Mani
> ---
> Changes in v2:
> Guarding these functions with CONFIG_PM instead of selecting the config.
>
> drivers/ufs/host/ufs-mediatek.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
> index 21d9b047539f..73e217260390 100644
> --- a/drivers/ufs/host/ufs-mediatek.c
> +++ b/drivers/ufs/host/ufs-mediatek.c
> @@ -1613,6 +1613,7 @@ static int ufs_mtk_system_resume(struct device *dev)
> }
> #endif
>
> +#ifdef CONFIG_PM
> static int ufs_mtk_runtime_suspend(struct device *dev)
> {
> struct ufs_hba *hba = dev_get_drvdata(dev);
> @@ -1635,6 +1636,7 @@ static int ufs_mtk_runtime_resume(struct device *dev)
>
> return ufshcd_runtime_resume(dev);
> }
> +#endif
>
> static const struct dev_pm_ops ufs_mtk_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(ufs_mtk_system_suspend,
> --
> 2.27.0
>
--
மணிவண்ணன் சதாசிவம்