From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:56210 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752505AbbLFBBu (ORCPT ); Sat, 5 Dec 2015 20:01:50 -0500 From: Laurent Pinchart To: Mauro Carvalho Chehab Cc: Linux Media Mailing List , linux-api@vger.kernel.org Subject: Re: [PATCH v8 40/55] [media] media.h: don't use legacy entity macros at Kernel Date: Sun, 06 Dec 2015 03:02:03 +0200 Message-ID: <1606474.9FWLZXiWGs@avalon> In-Reply-To: <3f2e554613f0b1286bd72dfd08f02ac6b874c95e.1441540862.git.mchehab@osg.samsung.com> References: <3f2e554613f0b1286bd72dfd08f02ac6b874c95e.1441540862.git.mchehab@osg.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-media-owner@vger.kernel.org List-ID: Hi Mauro, Thank you for the patch. On Sunday 06 September 2015 09:03:00 Mauro Carvalho Chehab wrote: > Put the legacy MEDIA_ENT_* macros under a #ifndef __KERNEL__, > in order to be sure that none of those old symbols are used > inside the Kernel. > > Signed-off-by: Mauro Carvalho Chehab > Acked-by: Hans Verkuil Acked-by: Laurent Pinchart > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index f90147cb9b57..a1bd7afba110 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -105,6 +105,7 @@ struct media_device_info { > #define MEDIA_ENT_T_DVB_CA (MEDIA_ENT_T_DVB_BASE + 4) > #define MEDIA_ENT_T_DVB_NET_DECAP (MEDIA_ENT_T_DVB_BASE + 5) > > +#ifndef __KERNEL__ > /* Legacy symbols used to avoid userspace compilation breakages */ > #define MEDIA_ENT_TYPE_SHIFT 16 > #define MEDIA_ENT_TYPE_MASK 0x00ff0000 > @@ -118,6 +119,7 @@ struct media_device_info { > #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) > #define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3) > #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) > +#endif > > /* Entity types */ -- Regards, Laurent Pinchart