[PATCH v2 10/10] [media] v4l: Forbid usage of V4L2_MBUS_FMT definitions inside the kernel
From: Boris Brezillon <hidden>
Date: 2014-11-06 09:58:32
Also in:
linux-arm-kernel, linux-media, lkml
Subsystem:
media input infrastructure (v4l/dvb), the rest · Maintainers:
Mauro Carvalho Chehab, Linus Torvalds
Place v4l2_mbus_pixelcode in a #ifndef __KERNEL__ section so that kernel users don't have access to these definitions. We have to keep this definition for user-space users even though they're encouraged to move to the new media_bus_format enum. Signed-off-by: Boris Brezillon <redacted> --- include/uapi/linux/media-bus-format.h | 5 +++++ include/uapi/linux/v4l2-mediabus.h | 2 ++ 2 files changed, 7 insertions(+)
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 251a902..d7f9ea2 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h@@ -31,9 +31,14 @@ * new pixel codes. */ +#ifdef __KERNEL__ +#define MEDIA_BUS_FMT_ENTRY(name, val) MEDIA_BUS_FMT_ ## name = val +#else +/* Keep V4L2_MBUS_FMT for backwards compatibility */ #define MEDIA_BUS_FMT_ENTRY(name, val) \ MEDIA_BUS_FMT_ ## name = val, \ V4L2_MBUS_FMT_ ## name = val +#endif enum media_bus_format { MEDIA_BUS_FMT_ENTRY(FIXED, 0x0001),
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index d30526c..8759002 100644
--- a/include/uapi/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h@@ -15,7 +15,9 @@ #include <linux/videodev2.h> #include <linux/media-bus-format.h> +#ifndef __KERNEL__ #define v4l2_mbus_pixelcode media_bus_format +#endif /** * struct v4l2_mbus_framefmt - frame format on the media bus
--
1.9.1