openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] saa7134: fix warning with !MEDIA_CONTROLLER 

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.

Fixes: ac90aa02d5 ("[media] saa7134: add media controller support")

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Arnd Bergmann 2016-02-26 12:25:17 -03:00 committed by Mauro Carvalho Chehab
parent 0d37ba6250
commit 363bdb1144
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/pci/saa7134/saa7134-core.c
View File

@ -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;
@ -951,8 +951,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,