[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>

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index a2353ecab6872211b91bf1ecda123616def13d26..c89dfef0c4c5b70f0272924c614f02f596e6f114 100644 (file)
--- 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 79960aefd3565d3118171ddf4ee49b9606a5cd15..71fb8e3dce0670e9effc3c3fc8b260879355747b 100644 (file)
--- 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)