diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-06-30 09:23:02 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-13 13:46:12 -0300 |
| commit | af2e14bb3f6cbe67459f17dd2879bb475a9c4e09 (patch) | |
| tree | dbd744d8b1d834c31cbae1de19ab2e08ef07c5b0 /drivers/media/platform | |
| parent | Merge branch 'topic/vsp1' into patchwork (diff) | |
| download | linux-dev-af2e14bb3f6cbe67459f17dd2879bb475a9c4e09.tar.xz linux-dev-af2e14bb3f6cbe67459f17dd2879bb475a9c4e09.zip | |
[media] vsp1: use __maybe_unused for PM handlers
Building without CONFIG_PM results in a harmless warning from
slightly incorrect #ifdef guards:
drivers/media/platform/vsp1/vsp1_drv.c:525:12: error: 'vsp1_pm_runtime_resume' defined but not used [-Werror=unused-function]
drivers/media/platform/vsp1/vsp1_drv.c:516:12: error: 'vsp1_pm_runtime_suspend' defined but not used [-Werror=unused-function]
This removes the existing #ifdef and instead marks all four
PM functions as __maybe_unused.
Fixes: 1e6af546ee66 ("[media] v4l: vsp1: Implement runtime PM support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_drv.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index e1377ffe3d68..cc316d281687 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c @@ -504,8 +504,7 @@ void vsp1_device_put(struct vsp1_device *vsp1) * Power Management */ -#ifdef CONFIG_PM_SLEEP -static int vsp1_pm_suspend(struct device *dev) +static int __maybe_unused vsp1_pm_suspend(struct device *dev) { struct vsp1_device *vsp1 = dev_get_drvdata(dev); @@ -515,7 +514,7 @@ static int vsp1_pm_suspend(struct device *dev) return 0; } -static int vsp1_pm_resume(struct device *dev) +static int __maybe_unused vsp1_pm_resume(struct device *dev) { struct vsp1_device *vsp1 = dev_get_drvdata(dev); @@ -524,9 +523,8 @@ static int vsp1_pm_resume(struct device *dev) return 0; } -#endif -static int vsp1_pm_runtime_suspend(struct device *dev) +static int __maybe_unused vsp1_pm_runtime_suspend(struct device *dev) { struct vsp1_device *vsp1 = dev_get_drvdata(dev); @@ -535,7 +533,7 @@ static int vsp1_pm_runtime_suspend(struct device *dev) return 0; } -static int vsp1_pm_runtime_resume(struct device *dev) +static int __maybe_unused vsp1_pm_runtime_resume(struct device *dev) { struct vsp1_device *vsp1 = dev_get_drvdata(dev); int ret; |