UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

pinctrl: s32cc: fix !CONFIG_PM_SLEEP build error 

The declaration of s32_pinctrl_suspend/s32_pinctrl_resume is hidden
in an #ifdef, causing a compilation failure when CONFIG_PM_SLEEP is
disabled:

drivers/pinctrl/nxp/pinctrl-s32g2.c:754:38: error: 's32_pinctrl_suspend' undeclared here (not in a function); did you mean 's32_pinctrl_probe'?
drivers/pinctrl/nxp/pinctrl-s32g2.c:754:9: note: in expansion of macro 'SET_LATE_SYSTEM_SLEEP_PM_OPS'
  754 |         SET_LATE_SYSTEM_SLEEP_PM_OPS(s32_pinctrl_suspend,
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

Remove the bogus #ifdef and __maybe_unused annation on the global
functions, and instead use the proper LATE_SYSTEM_SLEEP_PM_OPS()
macro to pick set the function pointer.

As the function definition is still in the #ifdef block, this leads
to the correct code in all configurations.

Fixes: fd84aaa817 ("pinctrl: add NXP S32 SoC family support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230310140250.359147-1-arnd@kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Arnd Bergmann 2023-03-10 15:02:35 +01:00 committed by Linus Walleij
parent 3f2d456089
commit f7fc5768e5
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pinctrl/nxp/pinctrl-s32.h
View File

@ -68,8 +68,6 @@ struct s32_pinctrl_soc_info {
int s32_pinctrl_probe(struct platform_device *pdev, int s32_pinctrl_probe(struct platform_device *pdev,
struct s32_pinctrl_soc_info *info); struct s32_pinctrl_soc_info *info);
#ifdef CONFIG_PM_SLEEP int s32_pinctrl_resume(struct device *dev);
int __maybe_unused s32_pinctrl_resume(struct device *dev); int s32_pinctrl_suspend(struct device *dev);
int __maybe_unused s32_pinctrl_suspend(struct device *dev);
#endif
#endif /* __DRIVERS_PINCTRL_S32_H */ #endif /* __DRIVERS_PINCTRL_S32_H */

4
drivers/pinctrl/nxp/pinctrl-s32cc.c
View File

@ -658,7 +658,7 @@ static bool s32_pinctrl_should_save(struct s32_pinctrl *ipctl,
return false; return false;
} }
int __maybe_unused s32_pinctrl_suspend(struct device *dev) int s32_pinctrl_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct s32_pinctrl *ipctl = platform_get_drvdata(pdev); struct s32_pinctrl *ipctl = platform_get_drvdata(pdev);
@ -685,7 +685,7 @@ int __maybe_unused s32_pinctrl_suspend(struct device *dev)
return 0; return 0;
} }
int __maybe_unused s32_pinctrl_resume(struct device *dev) int s32_pinctrl_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct s32_pinctrl *ipctl = platform_get_drvdata(pdev); struct s32_pinctrl *ipctl = platform_get_drvdata(pdev);

3
drivers/pinctrl/nxp/pinctrl-s32g2.c
View File

@ -751,8 +751,7 @@ static int s32g_pinctrl_probe(struct platform_device *pdev)
} }
static const struct dev_pm_ops s32g_pinctrl_pm_ops = { static const struct dev_pm_ops s32g_pinctrl_pm_ops = {
SET_LATE_SYSTEM_SLEEP_PM_OPS(s32_pinctrl_suspend, LATE_SYSTEM_SLEEP_PM_OPS(s32_pinctrl_suspend, s32_pinctrl_resume)
s32_pinctrl_resume)
}; };
static struct platform_driver s32g_pinctrl_driver = { static struct platform_driver s32g_pinctrl_driver = {