diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 12:25:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 14:12:46 -0300 |
| commit | 363bdb114434d021360c770871c2410df3965308 (patch) | |
| tree | 3d3900b5f81fa16f839721278eb836d11f7c9ceb /drivers | |
| parent | 0d37ba6250d3b412796ee69169655f0eb2ada279 (diff) | |
| download | linux-stable-363bdb114434d021360c770871c2410df3965308.tar.gz linux-stable-363bdb114434d021360c770871c2410df3965308.tar.bz2 linux-stable-363bdb114434d021360c770871c2410df3965308.zip | |
[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: ac90aa02d5b9 ("[media] saa7134: add media controller support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c index 2e77a5a80119..c0e1780ec831 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; @@ -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, |