summaryrefslogtreecommitdiffstats
path: root/include/media/media-device.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2016-02-26 08:44:35 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-02 13:52:21 +0100
commit697fe725f37aaa5fb15f581bc6e5b588f5fc8f7b (patch)
tree51afb215a06b51661e177a59107065227c36390b /include/media/media-device.h
parent[media] lirc_dev: avoid double mutex unlock (diff)
downloadlinux-697fe725f37aaa5fb15f581bc6e5b588f5fc8f7b.tar.xz
linux-697fe725f37aaa5fb15f581bc6e5b588f5fc8f7b.zip
[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>
Diffstat (limited to 'include/media/media-device.h')
-rw-r--r--include/media/media-device.h2
1 files changed, 0 insertions, 2 deletions
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 */