Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c2c188f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 2bd86823

drivers/media/media-device.c

+2 −2
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ static int media_device_get_info(struct media_device *dev, 
	strlcpy(info->serial, dev->serial, sizeof(info->serial));

	strlcpy(info->bus_info, dev->bus_info, sizeof(info->bus_info));



	info->media_version = MEDIA_API_VERSION;

	info->media_version = LINUX_VERSION_CODE;

	info->driver_version = info->media_version;

	info->hw_revision = dev->hw_revision;

	info->driver_version = LINUX_VERSION_CODE;



	return 0;

}

include/uapi/linux/media.h

+3 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <linux/types.h>

#include <linux/version.h>



#define MEDIA_API_VERSION	KERNEL_VERSION(0, 1, 0)



struct media_device_info {

	char driver[16];

	char model[32];
@@ -187,6 +185,9 @@ struct media_device_info { 
#define MEDIA_ENT_T_V4L2_SUBDEV_LENS	MEDIA_ENT_F_LENS

#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER	MEDIA_ENT_F_ATV_DECODER

#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER	MEDIA_ENT_F_TUNER



/* Obsolete symbol for media_version, no longer used in the kernel */

#define MEDIA_API_VERSION		KERNEL_VERSION(0, 1, 0)

#endif



/* Entity flags */