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/hdpvr | |
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/hdpvr')
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr-core.c | 1 | ||||
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr.h | 6 |
3 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c index a27d93b503a5..5442a1732260 100644 --- a/drivers/media/video/hdpvr/hdpvr-core.c +++ b/drivers/media/video/hdpvr/hdpvr-core.c | |||
@@ -474,5 +474,6 @@ module_init(hdpvr_init); | |||
474 | module_exit(hdpvr_exit); | 474 | module_exit(hdpvr_exit); |
475 | 475 | ||
476 | MODULE_LICENSE("GPL"); | 476 | MODULE_LICENSE("GPL"); |
477 | MODULE_VERSION("0.2.1"); | ||
477 | MODULE_AUTHOR("Janne Grunau"); | 478 | MODULE_AUTHOR("Janne Grunau"); |
478 | MODULE_DESCRIPTION("Hauppauge HD PVR driver"); | 479 | MODULE_DESCRIPTION("Hauppauge HD PVR driver"); |
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index 514aea76eaa5..087f7c08cb85 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
18 | #include <linux/usb.h> | 18 | #include <linux/usb.h> |
19 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
20 | #include <linux/version.h> | ||
21 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
22 | 21 | ||
23 | #include <linux/videodev2.h> | 22 | #include <linux/videodev2.h> |
@@ -574,7 +573,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
574 | strcpy(cap->driver, "hdpvr"); | 573 | strcpy(cap->driver, "hdpvr"); |
575 | strcpy(cap->card, "Hauppauge HD PVR"); | 574 | strcpy(cap->card, "Hauppauge HD PVR"); |
576 | usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); | 575 | usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); |
577 | cap->version = HDPVR_VERSION; | ||
578 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | | 576 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | |
579 | V4L2_CAP_AUDIO | | 577 | V4L2_CAP_AUDIO | |
580 | V4L2_CAP_READWRITE; | 578 | V4L2_CAP_READWRITE; |
diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h index 072f23c570f3..d6439db1d18b 100644 --- a/drivers/media/video/hdpvr/hdpvr.h +++ b/drivers/media/video/hdpvr/hdpvr.h | |||
@@ -18,12 +18,6 @@ | |||
18 | #include <media/v4l2-device.h> | 18 | #include <media/v4l2-device.h> |
19 | #include <media/ir-kbd-i2c.h> | 19 | #include <media/ir-kbd-i2c.h> |
20 | 20 | ||
21 | #define HDPVR_MAJOR_VERSION 0 | ||
22 | #define HDPVR_MINOR_VERSION 2 | ||
23 | #define HDPVR_RELEASE 0 | ||
24 | #define HDPVR_VERSION \ | ||
25 | KERNEL_VERSION(HDPVR_MAJOR_VERSION, HDPVR_MINOR_VERSION, HDPVR_RELEASE) | ||
26 | |||
27 | #define HDPVR_MAX 8 | 21 | #define HDPVR_MAX 8 |
28 | #define HDPVR_I2C_MAX_SIZE 128 | 22 | #define HDPVR_I2C_MAX_SIZE 128 |
29 | 23 | ||