diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-24 13:45:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:12 -0400 |
commit | 1990d50b58bef127a647005fdcada6d07081d3ef (patch) | |
tree | 094d27aa88e25b9f48f505068147eeedf2a6d3df /drivers/media/video/vivi.c | |
parent | d35ebf9558e692299b764163d61420fe5f526c02 (diff) |
[media] Stop using linux/version.h on most video drivers
All the modified drivers didn't have any version increment since
Jan, 1 2011. Several of them didn't have any version increment
for a long time, even having new features and important bug fixes
happening.
As we're now filling the QUERYCAP version with the current Kernel
Release, we don't need to maintain a per-driver version control
anymore. So, let's just use the default.
In order to preserve the Kernel module version history, a
KERNEL_VERSION() macro were added to all modified drivers, and
the extraver number were incremented.
I opted to preserve the per-driver version control to a few
pwc, pvrusb2, s2255, s5p-fimc and sh_vou.
A few drivers are still using the legacy way to handle ioctl's.
So, we can't do such change on them, otherwise, they'll break.
Those are: uvc, et61x251 and sn9c102.
The rationale is that the per-driver version control seems to be
actively maintained on those.
Yet, I think that the better for them would be to just use the
default version numbering, instead of doing that by themselves.
While here, removed a few uneeded include linux/version.h
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r-- | drivers/media/video/vivi.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 2238a613d664..3b9db8cbe41c 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/font.h> | 24 | #include <linux/font.h> |
25 | #include <linux/version.h> | ||
26 | #include <linux/mutex.h> | 25 | #include <linux/mutex.h> |
27 | #include <linux/videodev2.h> | 26 | #include <linux/videodev2.h> |
28 | #include <linux/kthread.h> | 27 | #include <linux/kthread.h> |
@@ -44,15 +43,12 @@ | |||
44 | #define MAX_WIDTH 1920 | 43 | #define MAX_WIDTH 1920 |
45 | #define MAX_HEIGHT 1200 | 44 | #define MAX_HEIGHT 1200 |
46 | 45 | ||
47 | #define VIVI_MAJOR_VERSION 0 | 46 | #define VIVI_VERSION "0.8.1" |
48 | #define VIVI_MINOR_VERSION 8 | ||
49 | #define VIVI_RELEASE 0 | ||
50 | #define VIVI_VERSION \ | ||
51 | KERNEL_VERSION(VIVI_MAJOR_VERSION, VIVI_MINOR_VERSION, VIVI_RELEASE) | ||
52 | 47 | ||
53 | MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board"); | 48 | MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board"); |
54 | MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol"); | 49 | MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol"); |
55 | MODULE_LICENSE("Dual BSD/GPL"); | 50 | MODULE_LICENSE("Dual BSD/GPL"); |
51 | MODULE_VERSION(VIVI_VERSION); | ||
56 | 52 | ||
57 | static unsigned video_nr = -1; | 53 | static unsigned video_nr = -1; |
58 | module_param(video_nr, uint, 0644); | 54 | module_param(video_nr, uint, 0644); |
@@ -812,7 +808,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
812 | strcpy(cap->driver, "vivi"); | 808 | strcpy(cap->driver, "vivi"); |
813 | strcpy(cap->card, "vivi"); | 809 | strcpy(cap->card, "vivi"); |
814 | strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); | 810 | strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); |
815 | cap->version = VIVI_VERSION; | ||
816 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | \ | 811 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | \ |
817 | V4L2_CAP_READWRITE; | 812 | V4L2_CAP_READWRITE; |
818 | return 0; | 813 | return 0; |
@@ -1325,9 +1320,8 @@ static int __init vivi_init(void) | |||
1325 | } | 1320 | } |
1326 | 1321 | ||
1327 | printk(KERN_INFO "Video Technology Magazine Virtual Video " | 1322 | printk(KERN_INFO "Video Technology Magazine Virtual Video " |
1328 | "Capture Board ver %u.%u.%u successfully loaded.\n", | 1323 | "Capture Board ver %s successfully loaded.\n", |
1329 | (VIVI_VERSION >> 16) & 0xFF, (VIVI_VERSION >> 8) & 0xFF, | 1324 | VIVI_VERSION); |
1330 | VIVI_VERSION & 0xFF); | ||
1331 | 1325 | ||
1332 | /* n_devs will reflect the actual number of allocated devices */ | 1326 | /* n_devs will reflect the actual number of allocated devices */ |
1333 | n_devs = i; | 1327 | n_devs = i; |