aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-06-24 13:45:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:12 -0400
commit1990d50b58bef127a647005fdcada6d07081d3ef (patch)
tree094d27aa88e25b9f48f505068147eeedf2a6d3df /drivers/media/video/cx23885
parentd35ebf9558e692299b764163d61420fe5f526c02 (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/cx23885')
-rw-r--r--drivers/media/video/cx23885/altera-ci.c1
-rw-r--r--drivers/media/video/cx23885/cx23885-417.c1
-rw-r--r--drivers/media/video/cx23885/cx23885-core.c13
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c1
-rw-r--r--drivers/media/video/cx23885/cx23885.h3
5 files changed, 4 insertions, 15 deletions
diff --git a/drivers/media/video/cx23885/altera-ci.c b/drivers/media/video/cx23885/altera-ci.c
index 678539b2acfa..1fa8927f0d36 100644
--- a/drivers/media/video/cx23885/altera-ci.c
+++ b/drivers/media/video/cx23885/altera-ci.c
@@ -52,7 +52,6 @@
52 * | DATA7| DATA6| DATA5| DATA4| DATA3| DATA2| DATA1| DATA0| 52 * | DATA7| DATA6| DATA5| DATA4| DATA3| DATA2| DATA1| DATA0|
53 * +-------+-------+-------+-------+-------+-------+-------+-------+ 53 * +-------+-------+-------+-------+-------+-------+-------+-------+
54 */ 54 */
55#include <linux/version.h>
56#include <media/videobuf-dma-sg.h> 55#include <media/videobuf-dma-sg.h>
57#include <media/videobuf-dvb.h> 56#include <media/videobuf-dvb.h>
58#include "altera-ci.h" 57#include "altera-ci.h"
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 9a98dc55f657..67c4a59bd882 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1359,7 +1359,6 @@ static int vidioc_querycap(struct file *file, void *priv,
1359 strlcpy(cap->card, cx23885_boards[tsport->dev->board].name, 1359 strlcpy(cap->card, cx23885_boards[tsport->dev->board].name,
1360 sizeof(cap->card)); 1360 sizeof(cap->card));
1361 sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); 1361 sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
1362 cap->version = CX23885_VERSION_CODE;
1363 cap->capabilities = 1362 cap->capabilities =
1364 V4L2_CAP_VIDEO_CAPTURE | 1363 V4L2_CAP_VIDEO_CAPTURE |
1365 V4L2_CAP_READWRITE | 1364 V4L2_CAP_READWRITE |
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 419777a832ee..ee41a8882f58 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -42,6 +42,7 @@
42MODULE_DESCRIPTION("Driver for cx23885 based TV cards"); 42MODULE_DESCRIPTION("Driver for cx23885 based TV cards");
43MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>"); 43MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
44MODULE_LICENSE("GPL"); 44MODULE_LICENSE("GPL");
45MODULE_VERSION(CX23885_VERSION);
45 46
46static unsigned int debug; 47static unsigned int debug;
47module_param(debug, int, 0644); 48module_param(debug, int, 0644);
@@ -2147,14 +2148,8 @@ static struct pci_driver cx23885_pci_driver = {
2147 2148
2148static int __init cx23885_init(void) 2149static int __init cx23885_init(void)
2149{ 2150{
2150 printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n", 2151 printk(KERN_INFO "cx23885 driver version %s loaded\n",
2151 (CX23885_VERSION_CODE >> 16) & 0xff, 2152 CX23885_VERSION);
2152 (CX23885_VERSION_CODE >> 8) & 0xff,
2153 CX23885_VERSION_CODE & 0xff);
2154#ifdef SNAPSHOT
2155 printk(KERN_INFO "cx23885: snapshot date %04d-%02d-%02d\n",
2156 SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
2157#endif
2158 return pci_register_driver(&cx23885_pci_driver); 2153 return pci_register_driver(&cx23885_pci_driver);
2159} 2154}
2160 2155
@@ -2165,5 +2160,3 @@ static void __exit cx23885_fini(void)
2165 2160
2166module_init(cx23885_init); 2161module_init(cx23885_init);
2167module_exit(cx23885_fini); 2162module_exit(cx23885_fini);
2168
2169/* ----------------------------------------------------------- */
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index ee57f6bedbe3..896bb32dbf03 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1000,7 +1000,6 @@ static int vidioc_querycap(struct file *file, void *priv,
1000 strlcpy(cap->card, cx23885_boards[dev->board].name, 1000 strlcpy(cap->card, cx23885_boards[dev->board].name,
1001 sizeof(cap->card)); 1001 sizeof(cap->card));
1002 sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci)); 1002 sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci));
1003 cap->version = CX23885_VERSION_CODE;
1004 cap->capabilities = 1003 cap->capabilities =
1005 V4L2_CAP_VIDEO_CAPTURE | 1004 V4L2_CAP_VIDEO_CAPTURE |
1006 V4L2_CAP_READWRITE | 1005 V4L2_CAP_READWRITE |
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index c186473fc570..01c3b7b8c38e 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -36,10 +36,9 @@
36#include "cx23885-reg.h" 36#include "cx23885-reg.h"
37#include "media/cx2341x.h" 37#include "media/cx2341x.h"
38 38
39#include <linux/version.h>
40#include <linux/mutex.h> 39#include <linux/mutex.h>
41 40
42#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 2) 41#define CX23885_VERSION "0.0.3"
43 42
44#define UNSET (-1U) 43#define UNSET (-1U)
45 44