[media] vsp1: use __maybe_unused for PM handlers
authorArnd Bergmann <arnd@arndb.de>
Thu, 30 Jun 2016 12:23:02 +0000 (09:23 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 13 Jul 2016 16:46:12 +0000 (13:46 -0300)
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>
drivers/media/platform/vsp1/vsp1_drv.c

index e1377ffe3d685e465d02e5c6754d1626506b22fc..cc316d281687d37583b0606a6ad7b75f8379d7b3 100644 (file)
@@ -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;