Browse Source

[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>
Sakari Ailus 9 years ago
parent
commit
0629e991a2
2 changed files with 5 additions and 5 deletions
  1. 5 0
      drivers/media/media-device.c
  2. 0 5
      include/uapi/linux/media.h

+ 5 - 0
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;

+ 0 - 5
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)