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/tlg2300 | |
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/tlg2300')
-rw-r--r-- | drivers/media/video/tlg2300/pd-common.h | 1 | ||||
-rw-r--r-- | drivers/media/video/tlg2300/pd-main.c | 1 | ||||
-rw-r--r-- | drivers/media/video/tlg2300/pd-radio.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/tlg2300/pd-common.h b/drivers/media/video/tlg2300/pd-common.h index 46066bdc73f9..56564e6aaac2 100644 --- a/drivers/media/video/tlg2300/pd-common.h +++ b/drivers/media/video/tlg2300/pd-common.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef PD_COMMON_H | 1 | #ifndef PD_COMMON_H |
2 | #define PD_COMMON_H | 2 | #define PD_COMMON_H |
3 | 3 | ||
4 | #include <linux/version.h> | ||
5 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
6 | #include <linux/wait.h> | 5 | #include <linux/wait.h> |
7 | #include <linux/list.h> | 6 | #include <linux/list.h> |
diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c index 99c81a9a4f46..129f135d5a5f 100644 --- a/drivers/media/video/tlg2300/pd-main.c +++ b/drivers/media/video/tlg2300/pd-main.c | |||
@@ -531,3 +531,4 @@ module_exit(poseidon_exit); | |||
531 | MODULE_AUTHOR("Telegent Systems"); | 531 | MODULE_AUTHOR("Telegent Systems"); |
532 | MODULE_DESCRIPTION("For tlg2300-based USB device "); | 532 | MODULE_DESCRIPTION("For tlg2300-based USB device "); |
533 | MODULE_LICENSE("GPL"); | 533 | MODULE_LICENSE("GPL"); |
534 | MODULE_VERSION("0.0.2"); | ||
diff --git a/drivers/media/video/tlg2300/pd-radio.c b/drivers/media/video/tlg2300/pd-radio.c index fae84c2a0c39..4fad1dfb92cf 100644 --- a/drivers/media/video/tlg2300/pd-radio.c +++ b/drivers/media/video/tlg2300/pd-radio.c | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <linux/usb.h> | 6 | #include <linux/usb.h> |
7 | #include <linux/i2c.h> | 7 | #include <linux/i2c.h> |
8 | #include <media/v4l2-dev.h> | 8 | #include <media/v4l2-dev.h> |
9 | #include <linux/version.h> | ||
10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
11 | #include <linux/mutex.h> | 10 | #include <linux/mutex.h> |
12 | #include <media/v4l2-ioctl.h> | 11 | #include <media/v4l2-ioctl.h> |
@@ -149,7 +148,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
149 | strlcpy(v->driver, "tele-radio", sizeof(v->driver)); | 148 | strlcpy(v->driver, "tele-radio", sizeof(v->driver)); |
150 | strlcpy(v->card, "Telegent Poseidon", sizeof(v->card)); | 149 | strlcpy(v->card, "Telegent Poseidon", sizeof(v->card)); |
151 | usb_make_path(p->udev, v->bus_info, sizeof(v->bus_info)); | 150 | usb_make_path(p->udev, v->bus_info, sizeof(v->bus_info)); |
152 | v->version = KERNEL_VERSION(0, 0, 1); | ||
153 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; | 151 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; |
154 | return 0; | 152 | return 0; |
155 | } | 153 | } |