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/c-qcam.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/c-qcam.c')
-rw-r--r-- | drivers/media/video/c-qcam.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index 24fc00965a12..b8d800e60056 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
36 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
37 | #include <linux/jiffies.h> | 37 | #include <linux/jiffies.h> |
38 | #include <linux/version.h> | ||
39 | #include <linux/videodev2.h> | 38 | #include <linux/videodev2.h> |
40 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
41 | #include <media/v4l2-device.h> | 40 | #include <media/v4l2-device.h> |
@@ -517,7 +516,6 @@ static int qcam_querycap(struct file *file, void *priv, | |||
517 | strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver)); | 516 | strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver)); |
518 | strlcpy(vcap->card, "Color Quickcam", sizeof(vcap->card)); | 517 | strlcpy(vcap->card, "Color Quickcam", sizeof(vcap->card)); |
519 | strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); | 518 | strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); |
520 | vcap->version = KERNEL_VERSION(0, 0, 3); | ||
521 | vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; | 519 | vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; |
522 | return 0; | 520 | return 0; |
523 | } | 521 | } |
@@ -886,6 +884,7 @@ static void __exit cqcam_cleanup(void) | |||
886 | MODULE_AUTHOR("Philip Blundell <philb@gnu.org>"); | 884 | MODULE_AUTHOR("Philip Blundell <philb@gnu.org>"); |
887 | MODULE_DESCRIPTION(BANNER); | 885 | MODULE_DESCRIPTION(BANNER); |
888 | MODULE_LICENSE("GPL"); | 886 | MODULE_LICENSE("GPL"); |
887 | MODULE_VERSION("0.0.4"); | ||
889 | 888 | ||
890 | module_init(cqcam_init); | 889 | module_init(cqcam_init); |
891 | module_exit(cqcam_cleanup); | 890 | module_exit(cqcam_cleanup); |