2023-02-21 11:38:41

by Stephen Zhang

[permalink] [raw]
Subject: [PATCH v3] scsi: ufs: mediatek: Guard runtime PM functions

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]
====

Fix these errors by guarding the runtime PM functions with CONFIG_PM.

Reported-by: k2ci <[email protected]>
Signed-off-by: Shida Zhang <[email protected]>
Reviewed-by: Manivannan Sadhasivam <[email protected]>
---
Changes in v3
Reword the subject and the commit message.
Changes in v2:
Guard these functions with CONFIG_PM instead of selecting it.

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.25.1



Subject: Re: [PATCH v3] scsi: ufs: mediatek: Guard runtime PM functions

Il 21/02/23 12:38, Stephen Zhang ha scritto:
> 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]
> ====
>
> Fix these errors by guarding the runtime PM functions with CONFIG_PM.
>
> Reported-by: k2ci <[email protected]>
> Signed-off-by: Shida Zhang <[email protected]>
> Reviewed-by: Manivannan Sadhasivam <[email protected]>

Reviewed-by: AngeloGioacchino Del Regno <[email protected]>