@@ -1713,8 +1713,6 @@ void omap3isp_print_status(struct isp_device *isp)
dev_dbg(isp->dev, "--------------------------------------------\n");
}
-#ifdef CONFIG_PM
-
/*
* Power management support.
*
@@ -1785,15 +1783,6 @@ static void isp_pm_complete(struct device *dev)
isp_resume_modules(isp);
}
-#else
-
-#define isp_pm_prepare NULL
-#define isp_pm_suspend NULL
-#define isp_pm_resume NULL
-#define isp_pm_complete NULL
-
-#endif /* CONFIG_PM */
-
static void isp_unregister_entities(struct isp_device *isp)
{
omap3isp_csi2_unregister_entities(&isp->isp_csi2a);
@@ -2611,7 +2600,7 @@ static struct platform_driver omap3isp_driver = {
.id_table = omap3isp_id_table,
.driver = {
.name = "omap3isp",
- .pm = &omap3isp_pm_ops,
+ .pm = IS_ENABLED(CONFIG_PM) ? &omap3isp_pm_ops : NULL,
.of_match_table = omap3isp_of_table,
},
};
The omap3isp driver hides is power management functions using #ifdef but it fails to hide the isp_suspend_modules/isp_resume_modules functions in the same way, which leads to a build warning when CONFIG_PM is disabled: drivers/media/platform/omap3isp/isp.c:1183:12: error: 'isp_suspend_modules' defined but not used [-Werror=unused-function] drivers/media/platform/omap3isp/isp.c:1217:13: error: 'isp_resume_modules' defined but not used [-Werror=unused-function] As the driver manually defines its dev_pm_ops structure and all members are NULL without CONFIG_PM, we can simply avoid referencing the structure using an IS_ENABLED() check, and drop all the #ifdef to avoid all warnings. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/media/platform/omap3isp/isp.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)