summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2016-02-22 17:47:04 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 13:02:44 -0300
commit0629e991a25a9b56a70f9f0c327aad8ae1471dbf (patch)
tree6a611194e57a9052dab71683d237a024511ac304 /drivers/media
parent76485d8e04c337bcab90f62975a3db740c8c2dd4 (diff)
downloadlinux-0629e991a25a9b56a70f9f0c327aad8ae1471dbf.tar.bz2
[media] media: Move media_get_uptr() macro out of the media.h user space header
The media_get_uptr() macro is mostly useful only for the IOCTL handling code in media-device.c so move it there. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/media-device.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index a2353ecab687..c89dfef0c4c5 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -40,6 +40,11 @@
* Userspace API
*/
+static inline void __user *media_get_uptr(__u64 arg)
+{
+ return (void __user *)(uintptr_t)arg;
+}
+
static int media_device_open(struct file *filp)
{
return 0;