From 0629e991a25a9b56a70f9f0c327aad8ae1471dbf Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Mon, 22 Feb 2016 17:47:04 -0300
Subject: [PATCH] [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>
---
drivers/media/media-device.c | 5 +++++
include/uapi/linux/media.h | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index a2353ecab68722..c89dfef0c4c5b7 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;
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 79960aefd3565d..71fb8e3dce0670 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -375,11 +375,6 @@ struct media_v2_topology {
__u64 ptr_links;
};
-static inline void __user *media_get_uptr(__u64 arg)
-{
- return (void __user *)(uintptr_t)arg;
-}
-
/* ioctls */
#define MEDIA_IOC_DEVICE_INFO _IOWR('|', 0x00, struct media_device_info)
--
GitLab