media: drop use of MEDIA_API_VERSION

Set media_version to LINUX_VERSION_CODE, just as we did for driver_version. Nobody ever rememebers to update the version number, but LINUX_VERSION_CODE will always be updated. Move the MEDIA_API_VERSION define to the ifndef __KERNEL__ section of the media.h header. That way kernelspace can't accidentally start to use it again.

Hans Verkuil committed 9 years ago

Commit 6c2c1881 parent 2bd86822 files · +5 −4Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

include/uapi/linux/media.h+3−2

@@ -30,8 +30,6 @@ · 29 unmodified lines
30	30	#include <linux/types.h>
31	31	#include <linux/version.h>
32	32
33		−#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0)
34		−
35	33	struct media_device_info {
36	34	char driver[16];
37	35	char model[32];
@@ -187,6 +185,9 @@ struct media_device_info { · 149 unmodified lines
187	185	#define MEDIA_ENT_T_V4L2_SUBDEV_LENS MEDIA_ENT_F_LENS
188	186	#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER MEDIA_ENT_F_ATV_DECODER
189	187	#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER MEDIA_ENT_F_TUNER
	188	+
	189	+/* Obsolete symbol for media_version, no longer used in the kernel */
	190	+#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0)
190	191	#endif
191	192
192	193	/* Entity flags */