aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/media-device.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2017-07-28 03:25:06 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-08 06:03:15 -0400
commit6c2c188f35c61c8eee71ec6d07524ce122c06539 (patch)
treed4fb1f691a84b24e7d9f4c64f6a42ed920286141 /drivers/media/media-device.c
parent2bd8682375f3a79e463d8840794d2872b02d755b (diff)
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: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/media-device.c')
-rw-r--r--drivers/media/media-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 979e4307d248..e79f72b8b858 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -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;
}

Privacy Policy