summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorArnd Bergmann2017-10-19 11:30:34 +0200
committerMauro Carvalho Chehab2017-10-31 12:21:56 +0100
commit94b28441c9c7168bfdef932703f968a43ba77f97 (patch)
tree8eee0589643be93e5d2b688fa9c304dfc95f614d /drivers/media
parentmedia: cec-pin: use IS_ERR instead of PTR_ERR_OR_ZERO (diff)
downloadkernel-qcow2-linux-94b28441c9c7168bfdef932703f968a43ba77f97.tar.gz
kernel-qcow2-linux-94b28441c9c7168bfdef932703f968a43ba77f97.tar.xz
kernel-qcow2-linux-94b28441c9c7168bfdef932703f968a43ba77f97.zip
media: rockchip/rga: annotate PM functions as __maybe_unused
The newly added driver has incorrect #ifdef annotations on its PM functions, leading to a harmless compile-time warning when CONFIG_PM is disabled: drivers/media/platform/rockchip/rga/rga.c:760:13: error: 'rga_disable_clocks' defined but not used [-Werror=unused-function] static void rga_disable_clocks(struct rockchip_rga *rga) ^~~~~~~~~~~~~~~~~~ drivers/media/platform/rockchip/rga/rga.c:728:12: error: 'rga_enable_clocks' defined but not used [-Werror=unused-function] This removes the #ifdef and marks the functions as __maybe_unused, so gcc can silently drop all the unused code. Fixes: f7e7b48e6d79 ("[media] rockchip/rga: v4l2 m2m support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/rockchip/rga/rga.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index e7d1b34baf1c..89296de9cf4a 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -960,8 +960,7 @@ static int rga_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
-static int rga_runtime_suspend(struct device *dev)
+static int __maybe_unused rga_runtime_suspend(struct device *dev)
{
struct rockchip_rga *rga = dev_get_drvdata(dev);
@@ -970,13 +969,12 @@ static int rga_runtime_suspend(struct device *dev)
return 0;
}
-static int rga_runtime_resume(struct device *dev)
+static int __maybe_unused rga_runtime_resume(struct device *dev)
{
struct rockchip_rga *rga = dev_get_drvdata(dev);
return rga_enable_clocks(rga);
}
-#endif
static const struct dev_pm_ops rga_pm = {
SET_RUNTIME_PM_OPS(rga_runtime_suspend,