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/arv.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/arv.c')
-rw-r--r-- | drivers/media/video/arv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index f989f2820d88..b6ed44aebe30 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
29 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
30 | #include <linux/version.h> | ||
31 | #include <linux/videodev2.h> | 30 | #include <linux/videodev2.h> |
32 | #include <media/v4l2-common.h> | 31 | #include <media/v4l2-common.h> |
33 | #include <media/v4l2-device.h> | 32 | #include <media/v4l2-device.h> |
@@ -54,7 +53,7 @@ | |||
54 | */ | 53 | */ |
55 | #define USE_INT 0 /* Don't modify */ | 54 | #define USE_INT 0 /* Don't modify */ |
56 | 55 | ||
57 | #define VERSION "0.04" | 56 | #define VERSION "0.0.5" |
58 | 57 | ||
59 | #define ar_inl(addr) inl((unsigned long)(addr)) | 58 | #define ar_inl(addr) inl((unsigned long)(addr)) |
60 | #define ar_outl(val, addr) outl((unsigned long)(val), (unsigned long)(addr)) | 59 | #define ar_outl(val, addr) outl((unsigned long)(val), (unsigned long)(addr)) |
@@ -404,7 +403,6 @@ static int ar_querycap(struct file *file, void *priv, | |||
404 | strlcpy(vcap->driver, ar->vdev.name, sizeof(vcap->driver)); | 403 | strlcpy(vcap->driver, ar->vdev.name, sizeof(vcap->driver)); |
405 | strlcpy(vcap->card, "Colour AR VGA", sizeof(vcap->card)); | 404 | strlcpy(vcap->card, "Colour AR VGA", sizeof(vcap->card)); |
406 | strlcpy(vcap->bus_info, "Platform", sizeof(vcap->bus_info)); | 405 | strlcpy(vcap->bus_info, "Platform", sizeof(vcap->bus_info)); |
407 | vcap->version = KERNEL_VERSION(0, 0, 4); | ||
408 | vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; | 406 | vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; |
409 | return 0; | 407 | return 0; |
410 | } | 408 | } |
@@ -879,3 +877,4 @@ module_exit(ar_cleanup_module); | |||
879 | MODULE_AUTHOR("Takeo Takahashi <takahashi.takeo@renesas.com>"); | 877 | MODULE_AUTHOR("Takeo Takahashi <takahashi.takeo@renesas.com>"); |
880 | MODULE_DESCRIPTION("Colour AR M64278(VGA) for Video4Linux"); | 878 | MODULE_DESCRIPTION("Colour AR M64278(VGA) for Video4Linux"); |
881 | MODULE_LICENSE("GPL"); | 879 | MODULE_LICENSE("GPL"); |
880 | MODULE_VERSION(VERSION); | ||