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

Commit 4c7089ee authored Jul 21, 2017 by Hans Verkuil Committed by Mauro Carvalho Chehab Aug 08, 2017

media: media-device: set driver_version directly



Don't use driver_version from struct media_device, just return
LINUX_VERSION_CODE as the other media subsystems do.

The driver_version field in struct media_device will be removed
in the following patches.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent 1d54267b

drivers/media/media-device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ static int media_device_get_info(struct media_device *dev,

		info->media_version = MEDIA_API_VERSION;
		info->hw_revision = dev->hw_revision;
		info->driver_version = dev->driver_version;
		info->driver_version = LINUX_VERSION_CODE;

		return 0;
		}

include/media/media-device.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -249,11 +249,6 @@ void media_device_cleanup(struct media_device *mdev);
		* driver-specific format. When possible the revision should be formatted
		* with the KERNEL_VERSION() macro.
		*
		* - &media_entity.driver_version is formatted with the KERNEL_VERSION()
		* macro. The version minor must be incremented when new features are added
		* to the userspace API without breaking binary compatibility. The version
		* major must be incremented when binary compatibility is broken.
		*
		* .. note::
		*
		* #) Upon successful registration a character device named media[0-9]+ is created. The device major and minor numbers are dynamic. The model name is exported as a sysfs attribute.