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>

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index fce91b543c14cb0851c9a9efdbba552a665336d2..7ff8e2d5bb07b0471334ad059ebd8548a3f07167 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -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;
 }

diff --git a/include/media/media-device.h b/include/media/media-device.h
index 6896266031b9905ff6ba61eb0706e5550e85f616..7ae200d89a9f740ae75d5d4f67436dfa99ffe604 100644 (file)
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -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.