Re: [PATCH v8 40/55] [media] media.h: don't use legacy entity macros at Kernel
From: Laurent Pinchart <hidden>
Date: 2015-12-06 01:01:50
Also in:
linux-media
Possibly related (same subject, not in this thread)
- 2015-08-31 · Re: [PATCH v8 40/55] [media] media.h: don't use legacy entity macros at Kernel · Hans Verkuil <hidden>
- 2015-08-30 · [PATCH v8 40/55] [media] media.h: don't use legacy entity macros at Kernel · Mauro Carvalho Chehab <hidden>
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 <redacted> Acked-by: Hans Verkuil <redacted>
Acked-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
quoted hunk ↗ jump to hunk
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