usb: chipidea: imx: do not use preprocessor conditionals for PM
PATCH 1/1 usb: chipidea: imx: do not use preprocessor conditionals for PM
Use preprocessor conditionals for CONFIG_PM and CONFIG_PM_SLEEP is not necessary since SET_SYSTEM_SLEEP_PM_OPS and SET_RUNTIME_PM_OPS does that internally.
It is also the preferred way according to our coding style guidelines.
Signed-off-by Marcus Folkesson <[email protected]>
--- drivers/usb/chipidea/ci_hdrc_imx.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +6 -11
@@ -364,8 +364,7 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev)ci_hdrc_imx_remove (pdev); } -#ifdef CONFIG_PM -static int imx_controller_suspend (struct device *dev) +static int __maybe_unused imx_controller_suspend (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);
@@ -377,7 +376,7 @@ static int imx_controller_suspend(struct device *dev)return 0 ; } -static int imx_controller_resume (struct device *dev) +static int __maybe_unused imx_controller_resume (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);int ret =0 ;
@@ -408,8 +407,7 @@ static int imx_controller_resume(struct device *dev)return ret; } -#ifdef CONFIG_PM_SLEEP -static int ci_hdrc_imx_suspend (struct device *dev) +static int __maybe_unused ci_hdrc_imx_suspend (struct device *dev) {int ret;
@@ -431,7 +429,7 @@ static int ci_hdrc_imx_suspend(struct device *dev)return imx_controller_suspend (dev); } -static int ci_hdrc_imx_resume (struct device *dev) +static int __maybe_unused ci_hdrc_imx_resume (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);int ret;
@@ -445,9 +443,8 @@ static int ci_hdrc_imx_resume(struct device *dev)return ret; } -#endif /* CONFIG_PM_SLEEP */ -static int ci_hdrc_imx_runtime_suspend (struct device *dev) +static int __maybe_unused ci_hdrc_imx_runtime_suspend (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);int ret;
@@ -466,13 +463,11 @@ static int ci_hdrc_imx_runtime_suspend(struct device *dev)return imx_controller_suspend (dev); } -static int ci_hdrc_imx_runtime_resume (struct device *dev) +static int __maybe_unused ci_hdrc_imx_runtime_resume (struct device *dev) {return imx_controller_resume (dev); } -#endif /* CONFIG_PM */ -static const struct dev_pm_ops ci_hdrc_imx_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) SET_RUNTIME_PM_OPS(ci_hdrc_imx_runtime_suspend,