aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
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/cx88
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/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c19
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c20
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c18
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c11
-rw-r--r--drivers/media/video/cx88/cx88-video.c21
-rw-r--r--drivers/media/video/cx88/cx88.h4
6 files changed, 18 insertions, 75 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 423c1af8a782..68d1240f493c 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -113,6 +113,8 @@ MODULE_DESCRIPTION("ALSA driver module for cx2388x based TV cards");
113MODULE_AUTHOR("Ricardo Cerqueira"); 113MODULE_AUTHOR("Ricardo Cerqueira");
114MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>"); 114MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
115MODULE_LICENSE("GPL"); 115MODULE_LICENSE("GPL");
116MODULE_VERSION(CX88_VERSION);
117
116MODULE_SUPPORTED_DEVICE("{{Conexant,23881}," 118MODULE_SUPPORTED_DEVICE("{{Conexant,23881},"
117 "{{Conexant,23882}," 119 "{{Conexant,23882},"
118 "{{Conexant,23883}"); 120 "{{Conexant,23883}");
@@ -973,14 +975,8 @@ static struct pci_driver cx88_audio_pci_driver = {
973 */ 975 */
974static int __init cx88_audio_init(void) 976static int __init cx88_audio_init(void)
975{ 977{
976 printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n", 978 printk(KERN_INFO "cx2388x alsa driver version %s loaded\n",
977 (CX88_VERSION_CODE >> 16) & 0xff, 979 CX88_VERSION);
978 (CX88_VERSION_CODE >> 8) & 0xff,
979 CX88_VERSION_CODE & 0xff);
980#ifdef SNAPSHOT
981 printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
982 SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
983#endif
984 return pci_register_driver(&cx88_audio_pci_driver); 980 return pci_register_driver(&cx88_audio_pci_driver);
985} 981}
986 982
@@ -994,10 +990,3 @@ static void __exit cx88_audio_fini(void)
994 990
995module_init(cx88_audio_init); 991module_init(cx88_audio_init);
996module_exit(cx88_audio_fini); 992module_exit(cx88_audio_fini);
997
998/* ----------------------------------------------------------- */
999/*
1000 * Local variables:
1001 * c-basic-offset: 8
1002 * End:
1003 */
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 11e49bbc4a66..e46446a449c0 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -42,6 +42,7 @@
42MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards"); 42MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards");
43MODULE_AUTHOR("Jelle Foks <jelle@foks.us>, Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 43MODULE_AUTHOR("Jelle Foks <jelle@foks.us>, Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
44MODULE_LICENSE("GPL"); 44MODULE_LICENSE("GPL");
45MODULE_VERSION(CX88_VERSION);
45 46
46static unsigned int mpegbufs = 32; 47static unsigned int mpegbufs = 32;
47module_param(mpegbufs,int,0644); 48module_param(mpegbufs,int,0644);
@@ -730,7 +731,6 @@ static int vidioc_querycap (struct file *file, void *priv,
730 strcpy(cap->driver, "cx88_blackbird"); 731 strcpy(cap->driver, "cx88_blackbird");
731 strlcpy(cap->card, core->board.name, sizeof(cap->card)); 732 strlcpy(cap->card, core->board.name, sizeof(cap->card));
732 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); 733 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
733 cap->version = CX88_VERSION_CODE;
734 cap->capabilities = 734 cap->capabilities =
735 V4L2_CAP_VIDEO_CAPTURE | 735 V4L2_CAP_VIDEO_CAPTURE |
736 V4L2_CAP_READWRITE | 736 V4L2_CAP_READWRITE |
@@ -1368,14 +1368,8 @@ static struct cx8802_driver cx8802_blackbird_driver = {
1368 1368
1369static int __init blackbird_init(void) 1369static int __init blackbird_init(void)
1370{ 1370{
1371 printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n", 1371 printk(KERN_INFO "cx2388x blackbird driver version %s loaded\n",
1372 (CX88_VERSION_CODE >> 16) & 0xff, 1372 CX88_VERSION);
1373 (CX88_VERSION_CODE >> 8) & 0xff,
1374 CX88_VERSION_CODE & 0xff);
1375#ifdef SNAPSHOT
1376 printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
1377 SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
1378#endif
1379 return cx8802_register_driver(&cx8802_blackbird_driver); 1373 return cx8802_register_driver(&cx8802_blackbird_driver);
1380} 1374}
1381 1375
@@ -1389,11 +1383,3 @@ module_exit(blackbird_fini);
1389 1383
1390module_param_named(video_debug,cx8802_mpeg_template.debug, int, 0644); 1384module_param_named(video_debug,cx8802_mpeg_template.debug, int, 0644);
1391MODULE_PARM_DESC(debug,"enable debug messages [video]"); 1385MODULE_PARM_DESC(debug,"enable debug messages [video]");
1392
1393/* ----------------------------------------------------------- */
1394/*
1395 * Local variables:
1396 * c-basic-offset: 8
1397 * End:
1398 * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
1399 */
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 1ed72ce2413c..cf3d33ab541b 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -64,6 +64,7 @@ MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
64MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>"); 64MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
65MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 65MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
66MODULE_LICENSE("GPL"); 66MODULE_LICENSE("GPL");
67MODULE_VERSION(CX88_VERSION);
67 68
68static unsigned int debug; 69static unsigned int debug;
69module_param(debug, int, 0644); 70module_param(debug, int, 0644);
@@ -1749,14 +1750,8 @@ static struct cx8802_driver cx8802_dvb_driver = {
1749 1750
1750static int __init dvb_init(void) 1751static int __init dvb_init(void)
1751{ 1752{
1752 printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n", 1753 printk(KERN_INFO "cx88/2: cx2388x dvb driver version %s loaded\n",
1753 (CX88_VERSION_CODE >> 16) & 0xff, 1754 CX88_VERSION);
1754 (CX88_VERSION_CODE >> 8) & 0xff,
1755 CX88_VERSION_CODE & 0xff);
1756#ifdef SNAPSHOT
1757 printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
1758 SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
1759#endif
1760 return cx8802_register_driver(&cx8802_dvb_driver); 1755 return cx8802_register_driver(&cx8802_dvb_driver);
1761} 1756}
1762 1757
@@ -1767,10 +1762,3 @@ static void __exit dvb_fini(void)
1767 1762
1768module_init(dvb_init); 1763module_init(dvb_init);
1769module_exit(dvb_fini); 1764module_exit(dvb_fini);
1770
1771/*
1772 * Local variables:
1773 * c-basic-offset: 8
1774 * compile-command: "make DVB=1"
1775 * End:
1776 */
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 1a7b983f8297..ccd8797ffc83 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -39,6 +39,7 @@ MODULE_AUTHOR("Jelle Foks <jelle@foks.us>");
39MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>"); 39MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
40MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 40MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
41MODULE_LICENSE("GPL"); 41MODULE_LICENSE("GPL");
42MODULE_VERSION(CX88_VERSION);
42 43
43static unsigned int debug; 44static unsigned int debug;
44module_param(debug,int,0644); 45module_param(debug,int,0644);
@@ -890,14 +891,8 @@ static struct pci_driver cx8802_pci_driver = {
890 891
891static int __init cx8802_init(void) 892static int __init cx8802_init(void)
892{ 893{
893 printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n", 894 printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %s loaded\n",
894 (CX88_VERSION_CODE >> 16) & 0xff, 895 CX88_VERSION);
895 (CX88_VERSION_CODE >> 8) & 0xff,
896 CX88_VERSION_CODE & 0xff);
897#ifdef SNAPSHOT
898 printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
899 SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
900#endif
901 return pci_register_driver(&cx8802_pci_driver); 896 return pci_register_driver(&cx8802_pci_driver);
902} 897}
903 898
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index cef4f282e5aa..1db97f3a1975 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -45,6 +45,7 @@
45MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); 45MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
46MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 46MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
47MODULE_LICENSE("GPL"); 47MODULE_LICENSE("GPL");
48MODULE_VERSION(CX88_VERSION);
48 49
49/* ------------------------------------------------------------------ */ 50/* ------------------------------------------------------------------ */
50 51
@@ -1161,7 +1162,6 @@ static int vidioc_querycap (struct file *file, void *priv,
1161 strcpy(cap->driver, "cx8800"); 1162 strcpy(cap->driver, "cx8800");
1162 strlcpy(cap->card, core->board.name, sizeof(cap->card)); 1163 strlcpy(cap->card, core->board.name, sizeof(cap->card));
1163 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); 1164 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
1164 cap->version = CX88_VERSION_CODE;
1165 cap->capabilities = 1165 cap->capabilities =
1166 V4L2_CAP_VIDEO_CAPTURE | 1166 V4L2_CAP_VIDEO_CAPTURE |
1167 V4L2_CAP_READWRITE | 1167 V4L2_CAP_READWRITE |
@@ -1480,7 +1480,6 @@ static int radio_querycap (struct file *file, void *priv,
1480 strcpy(cap->driver, "cx8800"); 1480 strcpy(cap->driver, "cx8800");
1481 strlcpy(cap->card, core->board.name, sizeof(cap->card)); 1481 strlcpy(cap->card, core->board.name, sizeof(cap->card));
1482 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); 1482 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
1483 cap->version = CX88_VERSION_CODE;
1484 cap->capabilities = V4L2_CAP_TUNER; 1483 cap->capabilities = V4L2_CAP_TUNER;
1485 return 0; 1484 return 0;
1486} 1485}
@@ -2139,14 +2138,8 @@ static struct pci_driver cx8800_pci_driver = {
2139 2138
2140static int __init cx8800_init(void) 2139static int __init cx8800_init(void)
2141{ 2140{
2142 printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n", 2141 printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %s loaded\n",
2143 (CX88_VERSION_CODE >> 16) & 0xff, 2142 CX88_VERSION);
2144 (CX88_VERSION_CODE >> 8) & 0xff,
2145 CX88_VERSION_CODE & 0xff);
2146#ifdef SNAPSHOT
2147 printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
2148 SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
2149#endif
2150 return pci_register_driver(&cx8800_pci_driver); 2143 return pci_register_driver(&cx8800_pci_driver);
2151} 2144}
2152 2145
@@ -2157,11 +2150,3 @@ static void __exit cx8800_fini(void)
2157 2150
2158module_init(cx8800_init); 2151module_init(cx8800_init);
2159module_exit(cx8800_fini); 2152module_exit(cx8800_fini);
2160
2161/* ----------------------------------------------------------- */
2162/*
2163 * Local variables:
2164 * c-basic-offset: 8
2165 * End:
2166 * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
2167 */
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 5719063d2881..425c9fbcc750 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -39,9 +39,9 @@
39#include "cx88-reg.h" 39#include "cx88-reg.h"
40#include "tuner-xc2028.h" 40#include "tuner-xc2028.h"
41 41
42#include <linux/version.h>
43#include <linux/mutex.h> 42#include <linux/mutex.h>
44#define CX88_VERSION_CODE KERNEL_VERSION(0, 0, 8) 43
44#define CX88_VERSION "0.0.9"
45 45
46#define UNSET (-1U) 46#define UNSET (-1U)
47 47