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/usbvision | |
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/usbvision')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index ea8ea8a48dfe..5a74f5e07d7d 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -45,7 +45,6 @@ | |||
45 | * | 45 | * |
46 | */ | 46 | */ |
47 | 47 | ||
48 | #include <linux/version.h> | ||
49 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
50 | #include <linux/list.h> | 49 | #include <linux/list.h> |
51 | #include <linux/timer.h> | 50 | #include <linux/timer.h> |
@@ -77,15 +76,7 @@ | |||
77 | #define DRIVER_ALIAS "USBVision" | 76 | #define DRIVER_ALIAS "USBVision" |
78 | #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" | 77 | #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" |
79 | #define DRIVER_LICENSE "GPL" | 78 | #define DRIVER_LICENSE "GPL" |
80 | #define USBVISION_DRIVER_VERSION_MAJOR 0 | 79 | #define USBVISION_VERSION_STRING "0.9.11" |
81 | #define USBVISION_DRIVER_VERSION_MINOR 9 | ||
82 | #define USBVISION_DRIVER_VERSION_PATCHLEVEL 10 | ||
83 | #define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,\ | ||
84 | USBVISION_DRIVER_VERSION_MINOR,\ | ||
85 | USBVISION_DRIVER_VERSION_PATCHLEVEL) | ||
86 | #define USBVISION_VERSION_STRING __stringify(USBVISION_DRIVER_VERSION_MAJOR) \ | ||
87 | "." __stringify(USBVISION_DRIVER_VERSION_MINOR) \ | ||
88 | "." __stringify(USBVISION_DRIVER_VERSION_PATCHLEVEL) | ||
89 | 80 | ||
90 | #define ENABLE_HEXDUMP 0 /* Enable if you need it */ | 81 | #define ENABLE_HEXDUMP 0 /* Enable if you need it */ |
91 | 82 | ||
@@ -516,7 +507,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
516 | usbvision_device_data[usbvision->dev_model].model_string, | 507 | usbvision_device_data[usbvision->dev_model].model_string, |
517 | sizeof(vc->card)); | 508 | sizeof(vc->card)); |
518 | usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info)); | 509 | usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info)); |
519 | vc->version = USBVISION_DRIVER_VERSION; | ||
520 | vc->capabilities = V4L2_CAP_VIDEO_CAPTURE | | 510 | vc->capabilities = V4L2_CAP_VIDEO_CAPTURE | |
521 | V4L2_CAP_AUDIO | | 511 | V4L2_CAP_AUDIO | |
522 | V4L2_CAP_READWRITE | | 512 | V4L2_CAP_READWRITE | |