From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 26 Feb 2016 07:44:35 +0000 (-0300)
Subject: [media] media-device.h: fix compiler warning
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=697fe725f37aaa5fb15f581bc6e5b588f5fc8f7b;p=linux-beck.git

[media] media-device.h: fix compiler warning

Fix these compiler warnings:

media-git/include/media/media-device.h: In function 'media_device_pci_init':
media-git/include/media/media-device.h:610:9: warning: 'return' with a value, in function returning void
  return NULL;
         ^
media-git/include/media/media-device.h: In function '__media_device_usb_init':
media-git/include/media/media-device.h:618:9: warning: 'return' with a value, in function returning void
  return NULL;
         ^

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/include/media/media-device.h b/include/media/media-device.h
index 0b946a895c3a..32bbba7d8115 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -693,7 +693,6 @@ static inline void media_device_pci_init(struct media_device *mdev,
 					 struct pci_dev *pci_dev,
 					 char *name)
 {
-	return NULL;
 }
 
 static inline void __media_device_usb_init(struct media_device *mdev,
@@ -701,7 +700,6 @@ static inline void __media_device_usb_init(struct media_device *mdev,
 					   char *board_name,
 					   char *driver_name)
 {
-	return NULL;
 }
 
 #endif /* CONFIG_MEDIA_CONTROLLER */