[PATCH] [media] saa7134: fix warning with !MEDIA_CONTROLLER

From: Arnd Bergmann
Date: Fri Feb 26 2016 - 10:26:11 EST


When CONFIG_MEDIA_CONTROLLER is disabled, we get a warning
about an unused function:

drivers/media/pci/saa7134/saa7134-core.c:832:13: error: 'saa7134_create_entities' defined but not used [-Werror=unused-function]

This moves the #ifdef outside of the function, as it is
never called here.

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Fixes: ac90aa02d5b9 ("[media] saa7134: add media controller support")
---
drivers/media/pci/saa7134/saa7134-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 42bc4172febd..9c7876bff7c3 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -829,9 +829,9 @@ static void saa7134_media_release(struct saa7134_dev *dev)
#endif
}

+#if defined(CONFIG_MEDIA_CONTROLLER)
static void saa7134_create_entities(struct saa7134_dev *dev)
{
-#if defined(CONFIG_MEDIA_CONTROLLER)
int ret, i;
struct media_entity *entity;
struct media_entity *decoder = NULL;
@@ -950,8 +950,8 @@ static void saa7134_create_entities(struct saa7134_dev *dev)
if (ret < 0)
pr_err("failed to register input entity %d!\n", i);
}
-#endif
}
+#endif

static struct video_device *vdev_init(struct saa7134_dev *dev,
struct video_device *template,
--
2.7.0