summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven2015-09-06 12:08:49 +0200
committerMauro Carvalho Chehab2015-09-25 22:33:21 +0200
commit18baba64580fe78a46d652a638915518b2a1dc40 (patch)
treeb194a71dec5eca29becbcd0da92f17889fcf48ae
parent[media] rcar_vin: call g_std() instead of querystd() (diff)
downloadkernel-qcow2-linux-18baba64580fe78a46d652a638915518b2a1dc40.tar.gz
kernel-qcow2-linux-18baba64580fe78a46d652a638915518b2a1dc40.tar.xz
kernel-qcow2-linux-18baba64580fe78a46d652a638915518b2a1dc40.zip
[media] atmel-isi: Protect PM-only functions to kill warning
If CONFIG_PM=n: drivers/media/platform/soc_camera/atmel-isi.c:1044: warning: 'atmel_isi_runtime_suspend' defined but not used drivers/media/platform/soc_camera/atmel-isi.c:1054: warning: 'atmel_isi_runtime_resume' defined but not used Protect the unused functions by #ifdef CONFIG_PM to fix this. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/platform/soc_camera/atmel-isi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 90701726a06a..ccf30ccbe389 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -1040,6 +1040,7 @@ err_alloc_ctx:
return ret;
}
+#ifdef CONFIG_PM
static int atmel_isi_runtime_suspend(struct device *dev)
{
struct soc_camera_host *soc_host = to_soc_camera_host(dev);
@@ -1058,6 +1059,7 @@ static int atmel_isi_runtime_resume(struct device *dev)
return clk_prepare_enable(isi->pclk);
}
+#endif /* CONFIG_PM */
static const struct dev_pm_ops atmel_isi_dev_pm_ops = {
SET_RUNTIME_PM_OPS(atmel_isi_runtime_suspend,