From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lists.s-osg.org ([54.187.51.154]:52711 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356AbcCALoD (ORCPT ); Tue, 1 Mar 2016 06:44:03 -0500 Date: Tue, 1 Mar 2016 08:43:58 -0300 From: Mauro Carvalho Chehab To: Sakari Ailus Cc: linux-media@vger.kernel.org, hverkuil@xs4all.nl, shuahkh@osg.samsung.com, laurent.pinchart@ideasonboard.com, Sakari Ailus Subject: Re: [PATCH v2 4/4] media: Move media_get_uptr() macro out of the media.h user space header Message-ID: <20160301084358.66cc6164@recife.lan> In-Reply-To: <1456174024-11389-5-git-send-email-sakari.ailus@linux.intel.com> References: <1456174024-11389-1-git-send-email-sakari.ailus@linux.intel.com> <1456174024-11389-5-git-send-email-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Em Mon, 22 Feb 2016 22:47:04 +0200 Sakari Ailus escreveu: > From: Sakari Ailus > > 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 Looks OK to me. > --- > 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) -- Thanks, Mauro