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/w9966.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/w9966.c')
-rw-r--r-- | drivers/media/video/w9966.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index fa35639d0c15..453dbbd1e6e8 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include <linux/module.h> | 57 | #include <linux/module.h> |
58 | #include <linux/init.h> | 58 | #include <linux/init.h> |
59 | #include <linux/delay.h> | 59 | #include <linux/delay.h> |
60 | #include <linux/version.h> | ||
61 | #include <linux/videodev2.h> | 60 | #include <linux/videodev2.h> |
62 | #include <linux/slab.h> | 61 | #include <linux/slab.h> |
63 | #include <media/v4l2-common.h> | 62 | #include <media/v4l2-common.h> |
@@ -127,7 +126,7 @@ struct w9966 { | |||
127 | MODULE_AUTHOR("Jakob Kemi <jakob.kemi@post.utfors.se>"); | 126 | MODULE_AUTHOR("Jakob Kemi <jakob.kemi@post.utfors.se>"); |
128 | MODULE_DESCRIPTION("Winbond w9966cf WebCam driver (0.32)"); | 127 | MODULE_DESCRIPTION("Winbond w9966cf WebCam driver (0.32)"); |
129 | MODULE_LICENSE("GPL"); | 128 | MODULE_LICENSE("GPL"); |
130 | 129 | MODULE_VERSION("0.33.1"); | |
131 | 130 | ||
132 | #ifdef MODULE | 131 | #ifdef MODULE |
133 | static const char *pardev[] = {[0 ... W9966_MAXCAMS] = ""}; | 132 | static const char *pardev[] = {[0 ... W9966_MAXCAMS] = ""}; |
@@ -568,7 +567,6 @@ static int cam_querycap(struct file *file, void *priv, | |||
568 | strlcpy(vcap->driver, cam->v4l2_dev.name, sizeof(vcap->driver)); | 567 | strlcpy(vcap->driver, cam->v4l2_dev.name, sizeof(vcap->driver)); |
569 | strlcpy(vcap->card, W9966_DRIVERNAME, sizeof(vcap->card)); | 568 | strlcpy(vcap->card, W9966_DRIVERNAME, sizeof(vcap->card)); |
570 | strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); | 569 | strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); |
571 | vcap->version = KERNEL_VERSION(0, 33, 0); | ||
572 | vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; | 570 | vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; |
573 | return 0; | 571 | return 0; |
574 | } | 572 | } |