Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1312442 > unrolled thread

[PATCH 0/2] media: au0828 fix compile warns

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/2] media: au0828 fix compile warns Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-19 19:40 +0100
    [PATCH 1/2] media: au0828 fix enable/disable source compile warns Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-19 19:40 +0100

#1312442 — [PATCH 0/2] media: au0828 fix compile warns

Fix compile warns for the MEDIA_CONTROLLER disabled
case introduced in the patch series for Sharing media
resources across ALSA and au0828 drivers:

https://lkml.org/lkml/2016/1/6/668

Shuah Khan (2):
  media: au0828 fix enable/disable source compile warns
  media: au0828 fix au0828_media_device_register warn

 drivers/media/usb/au0828/au0828-core.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

-- 
2.5.0

[toc] | [next] | [standalone]

#1312443 — [PATCH 1/2] media: au0828 fix enable/disable source compile warns

Fix the following compile warns for MEDIA_CONTROLLER
disabled case.

 CC [M]  drivers/media/usb/au0828/au0828-core.o
drivers/media/usb/au0828/au0828-core.c:398:12: warning: ‘au0828_enable_source’ defined but not used [-Wunused-function]
 static int au0828_enable_source(struct media_entity *entity,
            ^
drivers/media/usb/au0828/au0828-core.c:497:13: warning: ‘au0828_disable_source’ defined but not used [-Wunused-function]
 static void au0828_disable_source(struct media_entity *entity)
             ^

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
 drivers/media/usb/au0828/au0828-core.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index de357a2..7dda0dd 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -395,10 +395,10 @@ void au0828_create_media_graph_notify(struct media_entity *new,
 #endif
 }
 
+#ifdef CONFIG_MEDIA_CONTROLLER
 static int au0828_enable_source(struct media_entity *entity,
 				struct media_pipeline *pipe)
 {
-#ifdef CONFIG_MEDIA_CONTROLLER
 	struct media_entity  *source;
 	struct media_entity *sink;
 	struct media_link *link, *found_link = NULL;
@@ -490,13 +490,10 @@ end:
 	pr_debug("au0828_enable_source() end %s %d %d\n",
 		entity->name, entity->function, ret);
 	return ret;
-#endif
-	return 0;
 }
 
 static void au0828_disable_source(struct media_entity *entity)
 {
-#ifdef CONFIG_MEDIA_CONTROLLER
 	struct media_entity *sink;
 	int ret = 0;
 	struct media_device *mdev = entity->graph_obj.mdev;
@@ -536,8 +533,8 @@ static void au0828_disable_source(struct media_entity *entity)
 
 end:
 	mutex_unlock(&mdev->graph_mutex);
-#endif
 }
+#endif
 
 static int au0828_media_device_register(struct au0828_dev *dev,
 					struct usb_device *udev)
-- 
2.5.0

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web