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/saa7134 | |
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/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 12 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 3 |
4 files changed, 5 insertions, 13 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index f9be737ba6f4..ca65cda3e101 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -39,6 +39,8 @@ | |||
39 | MODULE_DESCRIPTION("v4l2 driver module for saa7130/34 based TV cards"); | 39 | MODULE_DESCRIPTION("v4l2 driver module for saa7130/34 based TV cards"); |
40 | MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); | 40 | MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); |
41 | MODULE_LICENSE("GPL"); | 41 | MODULE_LICENSE("GPL"); |
42 | MODULE_VERSION(SAA7134_VERSION); | ||
43 | |||
42 | 44 | ||
43 | /* ------------------------------------------------------------------ */ | 45 | /* ------------------------------------------------------------------ */ |
44 | 46 | ||
@@ -1332,14 +1334,8 @@ static struct pci_driver saa7134_pci_driver = { | |||
1332 | static int __init saa7134_init(void) | 1334 | static int __init saa7134_init(void) |
1333 | { | 1335 | { |
1334 | INIT_LIST_HEAD(&saa7134_devlist); | 1336 | INIT_LIST_HEAD(&saa7134_devlist); |
1335 | printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", | 1337 | printk(KERN_INFO "saa7130/34: v4l2 driver version %s loaded\n", |
1336 | (SAA7134_VERSION_CODE >> 16) & 0xff, | 1338 | SAA7134_VERSION); |
1337 | (SAA7134_VERSION_CODE >> 8) & 0xff, | ||
1338 | SAA7134_VERSION_CODE & 0xff); | ||
1339 | #ifdef SNAPSHOT | ||
1340 | printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n", | ||
1341 | SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); | ||
1342 | #endif | ||
1343 | return pci_register_driver(&saa7134_pci_driver); | 1339 | return pci_register_driver(&saa7134_pci_driver); |
1344 | } | 1340 | } |
1345 | 1341 | ||
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 18294db38a01..dde361a9194e 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -172,7 +172,6 @@ static int empress_querycap(struct file *file, void *priv, | |||
172 | strlcpy(cap->card, saa7134_boards[dev->board].name, | 172 | strlcpy(cap->card, saa7134_boards[dev->board].name, |
173 | sizeof(cap->card)); | 173 | sizeof(cap->card)); |
174 | sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); | 174 | sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); |
175 | cap->version = SAA7134_VERSION_CODE; | ||
176 | cap->capabilities = | 175 | cap->capabilities = |
177 | V4L2_CAP_VIDEO_CAPTURE | | 176 | V4L2_CAP_VIDEO_CAPTURE | |
178 | V4L2_CAP_READWRITE | | 177 | V4L2_CAP_READWRITE | |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 776ba2dd7f9f..9cf7914f6f90 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -1810,7 +1810,6 @@ static int saa7134_querycap(struct file *file, void *priv, | |||
1810 | strlcpy(cap->card, saa7134_boards[dev->board].name, | 1810 | strlcpy(cap->card, saa7134_boards[dev->board].name, |
1811 | sizeof(cap->card)); | 1811 | sizeof(cap->card)); |
1812 | sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); | 1812 | sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); |
1813 | cap->version = SAA7134_VERSION_CODE; | ||
1814 | cap->capabilities = | 1813 | cap->capabilities = |
1815 | V4L2_CAP_VIDEO_CAPTURE | | 1814 | V4L2_CAP_VIDEO_CAPTURE | |
1816 | V4L2_CAP_VBI_CAPTURE | | 1815 | V4L2_CAP_VBI_CAPTURE | |
@@ -2307,7 +2306,6 @@ static int radio_querycap(struct file *file, void *priv, | |||
2307 | strcpy(cap->driver, "saa7134"); | 2306 | strcpy(cap->driver, "saa7134"); |
2308 | strlcpy(cap->card, saa7134_boards[dev->board].name, sizeof(cap->card)); | 2307 | strlcpy(cap->card, saa7134_boards[dev->board].name, sizeof(cap->card)); |
2309 | sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); | 2308 | sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); |
2310 | cap->version = SAA7134_VERSION_CODE; | ||
2311 | cap->capabilities = V4L2_CAP_TUNER; | 2309 | cap->capabilities = V4L2_CAP_TUNER; |
2312 | return 0; | 2310 | return 0; |
2313 | } | 2311 | } |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 28eb10398323..bc8d6bba8ee5 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -19,8 +19,7 @@ | |||
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/version.h> | 22 | #define SAA7134_VERSION "0, 2, 17" |
23 | #define SAA7134_VERSION_CODE KERNEL_VERSION(0, 2, 16) | ||
24 | 23 | ||
25 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
26 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |