diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-25 10:28:37 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:16 -0400 |
commit | 64dc3c1a906467d90c24913b0b38dd13d9378f4f (patch) | |
tree | 64153b6da4909a9612e95735f8f21267c594e4d0 /drivers/media/video/davinci/vpif_display.c | |
parent | b0eaab765794bf4fdf060c74b21c9851ba3c6907 (diff) |
[media] Stop using linux/version.h on the remaining video drivers
Standardize the remaining video drivers to return the API version
for the VIDIOC_QUERYCAP version, instead of a per-driver version.
Those drivers had the version updated more recently or are SoC
drivers. Even so, it doesn't sound a good idea to keep a per-driver
version control, so, let's use the per-subsystem version control
instead.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci/vpif_display.c')
-rw-r--r-- | drivers/media/video/davinci/vpif_display.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c index cdf659abdc2a..286f02910044 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/video/davinci/vpif_display.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
32 | #include <linux/version.h> | ||
33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
34 | 33 | ||
35 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
@@ -47,6 +46,7 @@ | |||
47 | 46 | ||
48 | MODULE_DESCRIPTION("TI DaVinci VPIF Display driver"); | 47 | MODULE_DESCRIPTION("TI DaVinci VPIF Display driver"); |
49 | MODULE_LICENSE("GPL"); | 48 | MODULE_LICENSE("GPL"); |
49 | MODULE_VERSION(VPIF_DISPLAY_VERSION); | ||
50 | 50 | ||
51 | #define DM646X_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50) | 51 | #define DM646X_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50) |
52 | 52 | ||
@@ -701,7 +701,6 @@ static int vpif_querycap(struct file *file, void *priv, | |||
701 | { | 701 | { |
702 | struct vpif_display_config *config = vpif_dev->platform_data; | 702 | struct vpif_display_config *config = vpif_dev->platform_data; |
703 | 703 | ||
704 | cap->version = VPIF_DISPLAY_VERSION_CODE; | ||
705 | cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; | 704 | cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; |
706 | strlcpy(cap->driver, "vpif display", sizeof(cap->driver)); | 705 | strlcpy(cap->driver, "vpif display", sizeof(cap->driver)); |
707 | strlcpy(cap->bus_info, "Platform", sizeof(cap->bus_info)); | 706 | strlcpy(cap->bus_info, "Platform", sizeof(cap->bus_info)); |
@@ -1740,10 +1739,8 @@ static __init int vpif_probe(struct platform_device *pdev) | |||
1740 | vfd->v4l2_dev = &vpif_obj.v4l2_dev; | 1739 | vfd->v4l2_dev = &vpif_obj.v4l2_dev; |
1741 | vfd->release = video_device_release; | 1740 | vfd->release = video_device_release; |
1742 | snprintf(vfd->name, sizeof(vfd->name), | 1741 | snprintf(vfd->name, sizeof(vfd->name), |
1743 | "DM646x_VPIFDisplay_DRIVER_V%d.%d.%d", | 1742 | "DM646x_VPIFDisplay_DRIVER_V%s", |
1744 | (VPIF_DISPLAY_VERSION_CODE >> 16) & 0xff, | 1743 | VPIF_DISPLAY_VERSION); |
1745 | (VPIF_DISPLAY_VERSION_CODE >> 8) & 0xff, | ||
1746 | (VPIF_DISPLAY_VERSION_CODE) & 0xff); | ||
1747 | 1744 | ||
1748 | /* Set video_dev to the video device */ | 1745 | /* Set video_dev to the video device */ |
1749 | ch->video_dev = vfd; | 1746 | ch->video_dev = vfd; |