clk: mmp2: fix build without CONFIG_PM
PATCH 1/1 clk: mmp2: fix build without CONFIG_PM
From: Arnd Bergmann <[email protected]>
pm_clk_suspend()/pm_clk_resume() are defined as NULL pointers rather than empty inline stubs without CONFIG_PM:
drivers/clk/mmp/clk-audio.c:402:16: error: called object type 'void *' is not a function or function pointer
pm_clk_suspend(dev);
drivers/clk/mmp/clk-audio.c:411:15: error: called object type 'void *' is not a function or function pointer
pm_clk_resume(dev);I tried redefining the helper functions, but that caused additional problems. This is the simple solution of replacing the __maybe_unused trick with an #ifdef.
--- drivers/clk/mmp/clk-audio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clk/mmp/clk-audio.c +4 -2
@@ -392,7 +392,8 @@ static int mmp2_audio_clk_remove(struct platform_device *pdev)return 0 ; } -static int __maybe_unused mmp2_audio_clk_suspend (struct device *dev) +#ifdef CONFIG_PM +static int mmp2_audio_clk_suspend (struct device *dev) {struct mmp2_audio_clk *priv =dev_get_drvdata (dev);
@@ -404,7 +405,7 @@ static int __maybe_unused mmp2_audio_clk_suspend(struct device *dev)return 0 ; } -static int __maybe_unused mmp2_audio_clk_resume (struct device *dev) +static int mmp2_audio_clk_resume (struct device *dev) {struct mmp2_audio_clk *priv =dev_get_drvdata (dev);
@@ -415,6 +416,7 @@ static int __maybe_unused mmp2_audio_clk_resume(struct device *dev)return 0 ; } +#endif static const struct dev_pm_ops mmp2_audio_clk_pm_ops = {SET_RUNTIME_PM_OPS (mmp2_audio_clk_suspend, mmp2_audio_clk_resume,NULL )
Signature · 1 line
2.29.2
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
pm_clk_suspend()/pm_clk_resume() are defined as NULL pointers rather than empty inline stubs without
CONFIG_PM:
drivers/clk/mmp/clk-audio.c:402:16: error: called object type 'void *' is not a function or function pointerpm_clk_suspend(dev); drivers/clk/mmp/clk-audio.c:411:15: error: called object type 'void *' is not a function or function pointer pm_clk_resume(dev);
Quoted 6 lines
I tried redefining the helper functions, but that caused additional problems. This is the simple solution of replacing the
__maybe_unusedtrick with an #ifdef.Fixes 725262d29139 ("clk: mmp2: Add audio clock controller driver")Signed-off-by Arnd Bergmann <[email protected]>
Thank you.
Quoted 38 lines
--- drivers/clk/mmp/clk-audio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/clk/mmp/clk-audio.c +4
-2@@ -392,7 +392,8 @@ static int mmp2_audio_clk_remove(struct platform_device *pdev)return 0 ; } -static int __maybe_unused mmp2_audio_clk_suspend (struct device *dev) +#ifdef CONFIG_PM +static int mmp2_audio_clk_suspend (struct device *dev) {struct mmp2_audio_clk *priv =dev_get_drvdata (dev);@@ -404,7 +405,7 @@ static int __maybe_unused mmp2_audio_clk_suspend(struct device *dev)return 0 ; } -static int __maybe_unused mmp2_audio_clk_resume (struct device *dev) +static int mmp2_audio_clk_resume (struct device *dev) {struct mmp2_audio_clk *priv =dev_get_drvdata (dev);@@ -415,6 +416,7 @@ static int __maybe_unused mmp2_audio_clk_resume(struct device *dev)return 0 ; } +#endif static const struct dev_pm_ops mmp2_audio_clk_pm_ops = {SET_RUNTIME_PM_OPS (mmp2_audio_clk_suspend, mmp2_audio_clk_resume,NULL )Signature · 1 line
2.29.2
Quoting Arnd Bergmann (2021-01-03 05:54:53)
Quoted 10 lines
From: Arnd Bergmann <[email protected]>
pm_clk_suspend()/pm_clk_resume() are defined as NULL pointers rather than empty inline stubs without
CONFIG_PM:
drivers/clk/mmp/clk-audio.c:402:16: error: called object type 'void *' is not a function or function pointerpm_clk_suspend(dev); drivers/clk/mmp/clk-audio.c:411:15: error: called object type 'void *' is not a function or function pointer pm_clk_resume(dev);
Quoted 7 lines
I tried redefining the helper functions, but that caused additional problems. This is the simple solution of replacing the
__maybe_unusedtrick with an #ifdef.Fixes 725262d29139 ("clk: mmp2: Add audio clock controller driver")Signed-off-by Arnd Bergmann <[email protected]>---
Applied to clk-fixes