Re: [PATCH v8 40/55] [media] media.h: don't use legacy entity macros at Kernel
From: Hans Verkuil <hidden>
Date: 2015-08-31 11:45:17
Also in:
linux-media
On 08/30/2015 05:06 AM, 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 <redacted>
Acked-by: Hans Verkuil <redacted>
quoted hunk ↗ jump to hunk
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index cd486fc25f1e..4186891e5e81 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h@@ -107,6 +107,7 @@ struct media_device_info { #define MEDIA_ENT_T_DVB_CA (MEDIA_ENT_T_DVB_BASE + 3) #define MEDIA_ENT_T_DVB_NET_DECAP (MEDIA_ENT_T_DVB_BASE + 4) +#ifndef __KERNEL__ /* Legacy symbols used to avoid userspace compilation breakages */ #define MEDIA_ENT_TYPE_SHIFT 16 #define MEDIA_ENT_TYPE_MASK 0x00ff0000@@ -120,6 +121,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 */