diff options
| author | Sakari Ailus <sakari.ailus@iki.fi> | 2016-02-22 23:47:04 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 19:02:44 +0300 |
| commit | 0629e991a25a9b56a70f9f0c327aad8ae1471dbf (patch) | |
| tree | 6a611194e57a9052dab71683d237a024511ac304 | |
| parent | 76485d8e04c337bcab90f62975a3db740c8c2dd4 (diff) | |
| download | linux-0629e991a25a9b56a70f9f0c327aad8ae1471dbf.tar.xz | |
[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>
| -rw-r--r-- | drivers/media/media-device.c | 5 | ||||
| -rw-r--r-- | 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 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; diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 79960aefd356..71fb8e3dce06 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) |