thermal: qoriq: Remove __maybe_unused notations
Subsystems (2)
Fabio Estevam
reviewerPATCH v2 1/2 thermal: qoriq: Remove __maybe_unused notations
From: Fabio Estevam <[email protected]>
The combined usage of pm_sleep_ptr() and DEFINE_SIMPLE_DEV_PM_OPS() allows the compiler to evaluate if the suspend/resume() functions are used at build time or are simply dead code.
This allows removing __maybe_unused notations from the suspend/resume() functions.
---
Changes since v1:
- Use DEFINE_SIMPLE_DEV_PM_OPS() to fix build warnings.
drivers/thermal/qoriq_thermal.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/thermal/qoriq_thermal.c +5 -5
@@ -347,7 +347,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev)return 0 ; } -static int __maybe_unused qoriq_tmu_suspend (struct device *dev) +static int qoriq_tmu_suspend (struct device *dev) {struct qoriq_tmu_data *data =dev_get_drvdata (dev);int ret;
@@ -361,7 +361,7 @@ static int __maybe_unused qoriq_tmu_suspend(struct device *dev)return 0 ; } -static int __maybe_unused qoriq_tmu_resume (struct device *dev) +static int qoriq_tmu_resume (struct device *dev) {int ret;struct qoriq_tmu_data *data =dev_get_drvdata (dev);
@@ -374,8 +374,8 @@ static int __maybe_unused qoriq_tmu_resume(struct device *dev)return regmap_update_bits (data->regmap,REGS_TMR ,TMR_ME ,TMR_ME ); } -static SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops, - qoriq_tmu_suspend, qoriq_tmu_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops, + qoriq_tmu_suspend, qoriq_tmu_resume);static const struct of_device_id qoriq_tmu_match[] = { { .compatible ="fsl,qoriq-tmu" , },
@@ -387,7 +387,7 @@ MODULE_DEVICE_TABLE(of, qoriq_tmu_match);static struct platform_driver qoriq_tmu = { .driver = { .name ="qoriq_thermal" , - .pm = &qoriq_tmu_pm_ops, + .pm =pm_sleep_ptr (&qoriq_tmu_pm_ops), .of_match_table = qoriq_tmu_match, }, .probe = qoriq_tmu_probe,
Signature · 1 line
2.34.1
Fabio Estevam
reviewerPATCH v2 2/2 thermal: imx: Remove __maybe_unused notations
From: Fabio Estevam <[email protected]>
Replace SET_RUNTIME_PM_OPS()/SET SYSTEM_SLEEP_PM_OPS() with their modern RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() alternatives.
The combined usage of pm_ptr() and RUNTIME_PM_OPS/SYSTEM_SLEEP_PM_OPS() allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.
This allows removing __maybe_unused notations from the suspend/resume() functions.
---
Changes since v1:
- None.
drivers/thermal/imx_thermal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/thermal/imx_thermal.c +8 -8
@@ -773,7 +773,7 @@ static void imx_thermal_remove(struct platform_device *pdev)imx_thermal_unregister_legacy_cooling (data); } -static int __maybe_unused imx_thermal_suspend (struct device *dev) +static int imx_thermal_suspend (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev);int ret;
@@ -792,7 +792,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev)return pm_runtime_force_suspend (data->dev); } -static int __maybe_unused imx_thermal_resume (struct device *dev) +static int imx_thermal_resume (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev);int ret;
@@ -804,7 +804,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev)return thermal_zone_device_enable (data->tz); } -static int __maybe_unused imx_thermal_runtime_suspend (struct device *dev) +static int imx_thermal_runtime_suspend (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev);const struct thermal_soc_data *socdata = data->socdata;
@@ -826,7 +826,7 @@ static int __maybe_unused imx_thermal_runtime_suspend(struct device *dev)return 0 ; } -static int __maybe_unused imx_thermal_runtime_resume (struct device *dev) +static int imx_thermal_runtime_resume (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev);const struct thermal_soc_data *socdata = data->socdata;
@@ -857,15 +857,15 @@ static int __maybe_unused imx_thermal_runtime_resume(struct device *dev) }static const struct dev_pm_ops imx_thermal_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(imx_thermal_suspend, imx_thermal_resume) -SET_RUNTIME_PM_OPS (imx_thermal_runtime_suspend, - imx_thermal_runtime_resume,NULL ) + SYSTEM_SLEEP_PM_OPS(imx_thermal_suspend, imx_thermal_resume) +RUNTIME_PM_OPS (imx_thermal_runtime_suspend, + imx_thermal_runtime_resume,NULL ) };static struct platform_driver imx_thermal = { .driver = { .name ="imx_thermal" , - .pm = &imx_thermal_pm_ops, + .pm =pm_ptr (&imx_thermal_pm_ops), .of_match_table = of_imx_thermal_match, }, .probe = imx_thermal_probe,
Signature · 1 line
2.34.1
Quoted 11 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
The combined usage of
pm_sleep_ptr()andDEFINE_SIMPLE_DEV_PM_OPS()allows the compiler to evaluate if the suspend/resume() functions are used at build time or are simply dead code.This allows removing
__maybe_unusednotations from the suspend/resume() functions.Signed-off-by Fabio Estevam <[email protected]>---
Patches applied, thanks
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog