linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: mchehab@osg.samsung.com, hverkuil@xs4all.nl,
	shuahkh@osg.samsung.com, laurent.pinchart@ideasonboard.com,
	Sakari Ailus <sakari.ailus@iki.fi>
Subject: [PATCH v2 4/4] media: Move media_get_uptr() macro out of the media.h user space header
Date: Mon, 22 Feb 2016 22:47:04 +0200	[thread overview]
Message-ID: <1456174024-11389-5-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1456174024-11389-1-git-send-email-sakari.ailus@linux.intel.com>

From: Sakari Ailus <sakari.ailus@iki.fi>

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>
---
 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 f001c27..39afba0 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -38,6 +38,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 65991df..b989494 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -353,11 +353,6 @@ struct media_v2_topology {
 	__u32 reserved[18];
 };
 
-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)
-- 
2.1.4


  parent reply	other threads:[~2016-02-22 20:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-22 20:47 [PATCH v2 0/4] MC v2 cleanups Sakari Ailus
2016-02-22 20:47 ` [PATCH v2 1/4] media: Sanitise the reserved fields of the G_TOPOLOGY IOCTL arguments Sakari Ailus
2016-03-01 11:16   ` Mauro Carvalho Chehab
2016-03-03 17:20     ` [PATCH v2.1 " Sakari Ailus
2016-02-22 20:47 ` [PATCH v2 2/4] media: Rearrange the fields in the G_TOPOLOGY IOCTL argument Sakari Ailus
2016-03-01 11:42   ` Mauro Carvalho Chehab
2016-02-22 20:47 ` [PATCH v2 3/4] media: Properly handle user pointers Sakari Ailus
2016-03-01 11:43   ` Mauro Carvalho Chehab
2016-02-22 20:47 ` Sakari Ailus [this message]
2016-02-22 22:43   ` [PATCH v2 4/4] media: Move media_get_uptr() macro out of the media.h user space header Laurent Pinchart
2016-03-01 11:43   ` Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1456174024-11389-5-git-send-email-sakari.ailus@linux.intel.com \
    --to=sakari.ailus@linux.intel.com \
    --cc=hverkuil@xs4all.nl \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@osg.samsung.com \
    --cc=sakari.ailus@iki.fi \
    --cc=shuahkh@osg.samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).