Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

+71 -227
+2 -3
drivers/media/video/arv.c
··· 27 27 #include <linux/slab.h> 28 28 #include <linux/mm.h> 29 29 #include <linux/sched.h> 30 - #include <linux/version.h> 31 30 #include <linux/videodev2.h> 32 31 #include <media/v4l2-common.h> 33 32 #include <media/v4l2-device.h> ··· 53 54 */ 54 55 #define USE_INT 0 /* Don't modify */ 55 56 56 - #define VERSION "0.04" 57 + #define VERSION "0.0.5" 57 58 58 59 #define ar_inl(addr) inl((unsigned long)(addr)) 59 60 #define ar_outl(val, addr) outl((unsigned long)(val), (unsigned long)(addr)) ··· 403 404 strlcpy(vcap->driver, ar->vdev.name, sizeof(vcap->driver)); 404 405 strlcpy(vcap->card, "Colour AR VGA", sizeof(vcap->card)); 405 406 strlcpy(vcap->bus_info, "Platform", sizeof(vcap->bus_info)); 406 - vcap->version = KERNEL_VERSION(0, 0, 4); 407 407 vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; 408 408 return 0; 409 409 } ··· 877 879 MODULE_AUTHOR("Takeo Takahashi <takahashi.takeo@renesas.com>"); 878 880 MODULE_DESCRIPTION("Colour AR M64278(VGA) for Video4Linux"); 879 881 MODULE_LICENSE("GPL"); 882 + MODULE_VERSION(VERSION);
+1
drivers/media/video/au0828/au0828-core.c
··· 292 292 MODULE_DESCRIPTION("Driver for Auvitek AU0828 based products"); 293 293 MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>"); 294 294 MODULE_LICENSE("GPL"); 295 + MODULE_VERSION("0.0.2");
-5
drivers/media/video/au0828/au0828-video.c
··· 33 33 #include <linux/init.h> 34 34 #include <linux/device.h> 35 35 #include <linux/suspend.h> 36 - #include <linux/version.h> 37 36 #include <media/v4l2-common.h> 38 37 #include <media/v4l2-ioctl.h> 39 38 #include <media/v4l2-chip-ident.h> ··· 41 42 #include "au0828-reg.h" 42 43 43 44 static DEFINE_MUTEX(au0828_sysfs_lock); 44 - 45 - #define AU0828_VERSION_CODE KERNEL_VERSION(0, 0, 1) 46 45 47 46 /* ------------------------------------------------------------------ 48 47 Videobuf operations ··· 1250 1253 strlcpy(cap->driver, "au0828", sizeof(cap->driver)); 1251 1254 strlcpy(cap->card, dev->board.name, sizeof(cap->card)); 1252 1255 strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); 1253 - 1254 - cap->version = AU0828_VERSION_CODE; 1255 1256 1256 1257 /*set the device capabilities */ 1257 1258 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
+4 -10
drivers/media/video/bt8xx/bttv-driver.c
··· 57 57 58 58 #include <media/saa6588.h> 59 59 60 + #define BTTV_VERSION "0.9.19" 60 61 61 62 unsigned int bttv_num; /* number of Bt848s in use */ 62 63 struct bttv *bttvs[BTTV_MAX]; ··· 164 163 MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards"); 165 164 MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr"); 166 165 MODULE_LICENSE("GPL"); 166 + MODULE_VERSION(BTTV_VERSION); 167 167 168 168 /* ----------------------------------------------------------------------- */ 169 169 /* sysfs */ ··· 2618 2616 strlcpy(cap->card, btv->video_dev->name, sizeof(cap->card)); 2619 2617 snprintf(cap->bus_info, sizeof(cap->bus_info), 2620 2618 "PCI:%s", pci_name(btv->c.pci)); 2621 - cap->version = BTTV_VERSION_CODE; 2622 2619 cap->capabilities = 2623 2620 V4L2_CAP_VIDEO_CAPTURE | 2624 2621 V4L2_CAP_VBI_CAPTURE | ··· 3417 3416 strcpy(cap->driver, "bttv"); 3418 3417 strlcpy(cap->card, btv->radio_dev->name, sizeof(cap->card)); 3419 3418 sprintf(cap->bus_info, "PCI:%s", pci_name(btv->c.pci)); 3420 - cap->version = BTTV_VERSION_CODE; 3421 3419 cap->capabilities = V4L2_CAP_TUNER; 3422 3420 3423 3421 return 0; ··· 4585 4585 4586 4586 bttv_num = 0; 4587 4587 4588 - printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n", 4589 - (BTTV_VERSION_CODE >> 16) & 0xff, 4590 - (BTTV_VERSION_CODE >> 8) & 0xff, 4591 - BTTV_VERSION_CODE & 0xff); 4592 - #ifdef SNAPSHOT 4593 - printk(KERN_INFO "bttv: snapshot date %04d-%02d-%02d\n", 4594 - SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); 4595 - #endif 4588 + printk(KERN_INFO "bttv: driver version %s loaded\n", 4589 + BTTV_VERSION); 4596 4590 if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME) 4597 4591 gbuffers = 2; 4598 4592 if (gbufsize > BTTV_MAX_FBUF)
-3
drivers/media/video/bt8xx/bttvp.h
··· 25 25 #ifndef _BTTVP_H_ 26 26 #define _BTTVP_H_ 27 27 28 - #include <linux/version.h> 29 - #define BTTV_VERSION_CODE KERNEL_VERSION(0,9,18) 30 - 31 28 #include <linux/types.h> 32 29 #include <linux/wait.h> 33 30 #include <linux/i2c.h>
+1 -2
drivers/media/video/bw-qcam.c
··· 71 71 #include <linux/mm.h> 72 72 #include <linux/parport.h> 73 73 #include <linux/sched.h> 74 - #include <linux/version.h> 75 74 #include <linux/videodev2.h> 76 75 #include <linux/mutex.h> 77 76 #include <asm/uaccess.h> ··· 646 647 strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver)); 647 648 strlcpy(vcap->card, "B&W Quickcam", sizeof(vcap->card)); 648 649 strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); 649 - vcap->version = KERNEL_VERSION(0, 0, 2); 650 650 vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; 651 651 return 0; 652 652 } ··· 1090 1092 module_exit(exit_bw_qcams); 1091 1093 1092 1094 MODULE_LICENSE("GPL"); 1095 + MODULE_VERSION("0.0.3");
+1 -2
drivers/media/video/c-qcam.c
··· 35 35 #include <linux/sched.h> 36 36 #include <linux/mutex.h> 37 37 #include <linux/jiffies.h> 38 - #include <linux/version.h> 39 38 #include <linux/videodev2.h> 40 39 #include <asm/uaccess.h> 41 40 #include <media/v4l2-device.h> ··· 516 517 strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver)); 517 518 strlcpy(vcap->card, "Color Quickcam", sizeof(vcap->card)); 518 519 strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); 519 - vcap->version = KERNEL_VERSION(0, 0, 3); 520 520 vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; 521 521 return 0; 522 522 } ··· 884 886 MODULE_AUTHOR("Philip Blundell <philb@gnu.org>"); 885 887 MODULE_DESCRIPTION(BANNER); 886 888 MODULE_LICENSE("GPL"); 889 + MODULE_VERSION("0.0.4"); 887 890 888 891 module_init(cqcam_init); 889 892 module_exit(cqcam_cleanup);
-5
drivers/media/video/cpia2/cpia2.h
··· 31 31 #ifndef __CPIA2_H__ 32 32 #define __CPIA2_H__ 33 33 34 - #include <linux/version.h> 35 34 #include <linux/videodev2.h> 36 35 #include <media/v4l2-common.h> 37 36 #include <linux/usb.h> ··· 41 42 42 43 /* define for verbose debug output */ 43 44 //#define _CPIA2_DEBUG_ 44 - 45 - #define CPIA2_MAJ_VER 3 46 - #define CPIA2_MIN_VER 0 47 - #define CPIA2_PATCH_VER 0 48 45 49 46 /*** 50 47 * Image defines
+4 -8
drivers/media/video/cpia2/cpia2_v4l.c
··· 29 29 * Alan Cox <alan@lxorguk.ukuu.org.uk> 30 30 ****************************************************************************/ 31 31 32 - #include <linux/version.h> 33 - 32 + #define CPIA_VERSION "3.0.1" 34 33 35 34 #include <linux/module.h> 36 35 #include <linux/time.h> ··· 79 80 MODULE_DESCRIPTION("V4L-driver for STMicroelectronics CPiA2 based cameras"); 80 81 MODULE_SUPPORTED_DEVICE("video"); 81 82 MODULE_LICENSE("GPL"); 83 + MODULE_VERSION(CPIA_VERSION); 82 84 83 85 #define ABOUT "V4L-Driver for Vision CPiA2 based cameras" 84 86 ··· 464 464 465 465 if (usb_make_path(cam->dev, vc->bus_info, sizeof(vc->bus_info)) <0) 466 466 memset(vc->bus_info,0, sizeof(vc->bus_info)); 467 - 468 - vc->version = KERNEL_VERSION(CPIA2_MAJ_VER, CPIA2_MIN_VER, 469 - CPIA2_PATCH_VER); 470 467 471 468 vc->capabilities = V4L2_CAP_VIDEO_CAPTURE | 472 469 V4L2_CAP_READWRITE | ··· 1555 1558 *****************************************************************************/ 1556 1559 static int __init cpia2_init(void) 1557 1560 { 1558 - LOG("%s v%d.%d.%d\n", 1559 - ABOUT, CPIA2_MAJ_VER, CPIA2_MIN_VER, CPIA2_PATCH_VER); 1561 + LOG("%s v%s\n", 1562 + ABOUT, CPIA_VERSION); 1560 1563 check_parameters(); 1561 1564 cpia2_usb_init(); 1562 1565 return 0; ··· 1576 1579 1577 1580 module_init(cpia2_init); 1578 1581 module_exit(cpia2_exit); 1579 -
+4 -10
drivers/media/video/cx231xx/cx231xx-video.c
··· 29 29 #include <linux/bitmap.h> 30 30 #include <linux/usb.h> 31 31 #include <linux/i2c.h> 32 - #include <linux/version.h> 33 32 #include <linux/mm.h> 34 33 #include <linux/mutex.h> 35 34 #include <linux/slab.h> ··· 44 45 #include "cx231xx.h" 45 46 #include "cx231xx-vbi.h" 46 47 47 - #define CX231XX_VERSION_CODE KERNEL_VERSION(0, 0, 1) 48 + #define CX231XX_VERSION "0.0.2" 48 49 49 50 #define DRIVER_AUTHOR "Srinivasa Deevi <srinivasa.deevi@conexant.com>" 50 51 #define DRIVER_DESC "Conexant cx231xx based USB video device driver" ··· 69 70 MODULE_AUTHOR(DRIVER_AUTHOR); 70 71 MODULE_DESCRIPTION(DRIVER_DESC); 71 72 MODULE_LICENSE("GPL"); 73 + MODULE_VERSION(CX231XX_VERSION); 72 74 73 75 static unsigned int card[] = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET }; 74 76 static unsigned int video_nr[] = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET }; ··· 1869 1869 strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card)); 1870 1870 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); 1871 1871 1872 - cap->version = CX231XX_VERSION_CODE; 1873 - 1874 1872 cap->capabilities = V4L2_CAP_VBI_CAPTURE | 1875 1873 #if 0 1876 1874 V4L2_CAP_SLICED_VBI_CAPTURE | ··· 2055 2057 strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card)); 2056 2058 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); 2057 2059 2058 - cap->version = CX231XX_VERSION_CODE; 2059 2060 cap->capabilities = V4L2_CAP_TUNER; 2060 2061 return 0; 2061 2062 } ··· 2567 2570 { 2568 2571 int ret; 2569 2572 2570 - cx231xx_info("%s: v4l2 driver version %d.%d.%d\n", 2571 - dev->name, 2572 - (CX231XX_VERSION_CODE >> 16) & 0xff, 2573 - (CX231XX_VERSION_CODE >> 8) & 0xff, 2574 - CX231XX_VERSION_CODE & 0xff); 2573 + cx231xx_info("%s: v4l2 driver version %s\n", 2574 + dev->name, CX231XX_VERSION); 2575 2575 2576 2576 /* set default norm */ 2577 2577 /*dev->norm = cx231xx_video_template.current_norm; */
-1
drivers/media/video/cx231xx/cx231xx.h
··· 114 114 V4L2_STD_PAL_BG | V4L2_STD_PAL_DK | V4L2_STD_PAL_I | \ 115 115 V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | \ 116 116 V4L2_STD_PAL_60 | V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK) 117 - #define CX231xx_VERSION_CODE KERNEL_VERSION(0, 0, 2) 118 117 119 118 #define SLEEP_S5H1432 30 120 119 #define CX23417_OSC_EN 8
-1
drivers/media/video/cx23885/altera-ci.c
··· 52 52 * | DATA7| DATA6| DATA5| DATA4| DATA3| DATA2| DATA1| DATA0| 53 53 * +-------+-------+-------+-------+-------+-------+-------+-------+ 54 54 */ 55 - #include <linux/version.h> 56 55 #include <media/videobuf-dma-sg.h> 57 56 #include <media/videobuf-dvb.h> 58 57 #include "altera-ci.h"
-1
drivers/media/video/cx23885/cx23885-417.c
··· 1359 1359 strlcpy(cap->card, cx23885_boards[tsport->dev->board].name, 1360 1360 sizeof(cap->card)); 1361 1361 sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); 1362 - cap->version = CX23885_VERSION_CODE; 1363 1362 cap->capabilities = 1364 1363 V4L2_CAP_VIDEO_CAPTURE | 1365 1364 V4L2_CAP_READWRITE |
+3 -10
drivers/media/video/cx23885/cx23885-core.c
··· 42 42 MODULE_DESCRIPTION("Driver for cx23885 based TV cards"); 43 43 MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>"); 44 44 MODULE_LICENSE("GPL"); 45 + MODULE_VERSION(CX23885_VERSION); 45 46 46 47 static unsigned int debug; 47 48 module_param(debug, int, 0644); ··· 2148 2147 2149 2148 static int __init cx23885_init(void) 2150 2149 { 2151 - printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n", 2152 - (CX23885_VERSION_CODE >> 16) & 0xff, 2153 - (CX23885_VERSION_CODE >> 8) & 0xff, 2154 - CX23885_VERSION_CODE & 0xff); 2155 - #ifdef SNAPSHOT 2156 - printk(KERN_INFO "cx23885: snapshot date %04d-%02d-%02d\n", 2157 - SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); 2158 - #endif 2150 + printk(KERN_INFO "cx23885 driver version %s loaded\n", 2151 + CX23885_VERSION); 2159 2152 return pci_register_driver(&cx23885_pci_driver); 2160 2153 } 2161 2154 ··· 2160 2165 2161 2166 module_init(cx23885_init); 2162 2167 module_exit(cx23885_fini); 2163 - 2164 - /* ----------------------------------------------------------- */
-1
drivers/media/video/cx23885/cx23885-video.c
··· 1000 1000 strlcpy(cap->card, cx23885_boards[dev->board].name, 1001 1001 sizeof(cap->card)); 1002 1002 sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci)); 1003 - cap->version = CX23885_VERSION_CODE; 1004 1003 cap->capabilities = 1005 1004 V4L2_CAP_VIDEO_CAPTURE | 1006 1005 V4L2_CAP_READWRITE |
+1 -2
drivers/media/video/cx23885/cx23885.h
··· 36 36 #include "cx23885-reg.h" 37 37 #include "media/cx2341x.h" 38 38 39 - #include <linux/version.h> 40 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 43 #define UNSET (-1U) 45 44
+4 -15
drivers/media/video/cx88/cx88-alsa.c
··· 113 113 MODULE_AUTHOR("Ricardo Cerqueira"); 114 114 MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>"); 115 115 MODULE_LICENSE("GPL"); 116 + MODULE_VERSION(CX88_VERSION); 117 + 116 118 MODULE_SUPPORTED_DEVICE("{{Conexant,23881}," 117 119 "{{Conexant,23882}," 118 120 "{{Conexant,23883}"); ··· 975 973 */ 976 974 static int __init cx88_audio_init(void) 977 975 { 978 - printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n", 979 - (CX88_VERSION_CODE >> 16) & 0xff, 980 - (CX88_VERSION_CODE >> 8) & 0xff, 981 - CX88_VERSION_CODE & 0xff); 982 - #ifdef SNAPSHOT 983 - printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n", 984 - SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); 985 - #endif 976 + printk(KERN_INFO "cx2388x alsa driver version %s loaded\n", 977 + CX88_VERSION); 986 978 return pci_register_driver(&cx88_audio_pci_driver); 987 979 } 988 980 ··· 990 994 991 995 module_init(cx88_audio_init); 992 996 module_exit(cx88_audio_fini); 993 - 994 - /* ----------------------------------------------------------- */ 995 - /* 996 - * Local variables: 997 - * c-basic-offset: 8 998 - * End: 999 - */
+3 -17
drivers/media/video/cx88/cx88-blackbird.c
··· 42 42 MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards"); 43 43 MODULE_AUTHOR("Jelle Foks <jelle@foks.us>, Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 44 44 MODULE_LICENSE("GPL"); 45 + MODULE_VERSION(CX88_VERSION); 45 46 46 47 static unsigned int mpegbufs = 32; 47 48 module_param(mpegbufs,int,0644); ··· 731 730 strcpy(cap->driver, "cx88_blackbird"); 732 731 strlcpy(cap->card, core->board.name, sizeof(cap->card)); 733 732 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); 734 - cap->version = CX88_VERSION_CODE; 735 733 cap->capabilities = 736 734 V4L2_CAP_VIDEO_CAPTURE | 737 735 V4L2_CAP_READWRITE | ··· 1368 1368 1369 1369 static int __init blackbird_init(void) 1370 1370 { 1371 - printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n", 1372 - (CX88_VERSION_CODE >> 16) & 0xff, 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 1371 + printk(KERN_INFO "cx2388x blackbird driver version %s loaded\n", 1372 + CX88_VERSION); 1379 1373 return cx8802_register_driver(&cx8802_blackbird_driver); 1380 1374 } 1381 1375 ··· 1383 1389 1384 1390 module_param_named(video_debug,cx8802_mpeg_template.debug, int, 0644); 1385 1391 MODULE_PARM_DESC(debug,"enable debug messages [video]"); 1386 - 1387 - /* ----------------------------------------------------------- */ 1388 - /* 1389 - * Local variables: 1390 - * c-basic-offset: 8 1391 - * End: 1392 - * 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 1393 - */
+3 -15
drivers/media/video/cx88/cx88-dvb.c
··· 64 64 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>"); 65 65 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 66 66 MODULE_LICENSE("GPL"); 67 + MODULE_VERSION(CX88_VERSION); 67 68 68 69 static unsigned int debug; 69 70 module_param(debug, int, 0644); ··· 1750 1749 1751 1750 static int __init dvb_init(void) 1752 1751 { 1753 - printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n", 1754 - (CX88_VERSION_CODE >> 16) & 0xff, 1755 - (CX88_VERSION_CODE >> 8) & 0xff, 1756 - CX88_VERSION_CODE & 0xff); 1757 - #ifdef SNAPSHOT 1758 - printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n", 1759 - SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); 1760 - #endif 1752 + printk(KERN_INFO "cx88/2: cx2388x dvb driver version %s loaded\n", 1753 + CX88_VERSION); 1761 1754 return cx8802_register_driver(&cx8802_dvb_driver); 1762 1755 } 1763 1756 ··· 1762 1767 1763 1768 module_init(dvb_init); 1764 1769 module_exit(dvb_fini); 1765 - 1766 - /* 1767 - * Local variables: 1768 - * c-basic-offset: 8 1769 - * compile-command: "make DVB=1" 1770 - * End: 1771 - */
+3 -8
drivers/media/video/cx88/cx88-mpeg.c
··· 39 39 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>"); 40 40 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 41 41 MODULE_LICENSE("GPL"); 42 + MODULE_VERSION(CX88_VERSION); 42 43 43 44 static unsigned int debug; 44 45 module_param(debug,int,0644); ··· 891 890 892 891 static int __init cx8802_init(void) 893 892 { 894 - printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n", 895 - (CX88_VERSION_CODE >> 16) & 0xff, 896 - (CX88_VERSION_CODE >> 8) & 0xff, 897 - CX88_VERSION_CODE & 0xff); 898 - #ifdef SNAPSHOT 899 - printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n", 900 - SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); 901 - #endif 893 + printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %s loaded\n", 894 + CX88_VERSION); 902 895 return pci_register_driver(&cx8802_pci_driver); 903 896 } 904 897
+3 -18
drivers/media/video/cx88/cx88-video.c
··· 45 45 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); 46 46 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 47 47 MODULE_LICENSE("GPL"); 48 + MODULE_VERSION(CX88_VERSION); 48 49 49 50 /* ------------------------------------------------------------------ */ 50 51 ··· 1162 1161 strcpy(cap->driver, "cx8800"); 1163 1162 strlcpy(cap->card, core->board.name, sizeof(cap->card)); 1164 1163 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); 1165 - cap->version = CX88_VERSION_CODE; 1166 1164 cap->capabilities = 1167 1165 V4L2_CAP_VIDEO_CAPTURE | 1168 1166 V4L2_CAP_READWRITE | ··· 1480 1480 strcpy(cap->driver, "cx8800"); 1481 1481 strlcpy(cap->card, core->board.name, sizeof(cap->card)); 1482 1482 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); 1483 - cap->version = CX88_VERSION_CODE; 1484 1483 cap->capabilities = V4L2_CAP_TUNER; 1485 1484 return 0; 1486 1485 } ··· 2138 2139 2139 2140 static int __init cx8800_init(void) 2140 2141 { 2141 - printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n", 2142 - (CX88_VERSION_CODE >> 16) & 0xff, 2143 - (CX88_VERSION_CODE >> 8) & 0xff, 2144 - CX88_VERSION_CODE & 0xff); 2145 - #ifdef SNAPSHOT 2146 - printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n", 2147 - SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); 2148 - #endif 2142 + printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %s loaded\n", 2143 + CX88_VERSION); 2149 2144 return pci_register_driver(&cx8800_pci_driver); 2150 2145 } 2151 2146 ··· 2150 2157 2151 2158 module_init(cx8800_init); 2152 2159 module_exit(cx8800_fini); 2153 - 2154 - /* ----------------------------------------------------------- */ 2155 - /* 2156 - * Local variables: 2157 - * c-basic-offset: 8 2158 - * End: 2159 - * 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 2160 - */
+2 -2
drivers/media/video/cx88/cx88.h
··· 39 39 #include "cx88-reg.h" 40 40 #include "tuner-xc2028.h" 41 41 42 - #include <linux/version.h> 43 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 46 #define UNSET (-1U) 47 47
+5 -9
drivers/media/video/em28xx/em28xx-video.c
··· 32 32 #include <linux/bitmap.h> 33 33 #include <linux/usb.h> 34 34 #include <linux/i2c.h> 35 - #include <linux/version.h> 36 35 #include <linux/mm.h> 37 36 #include <linux/mutex.h> 38 37 #include <linux/slab.h> ··· 49 50 "Sascha Sommer <saschasommer@freenet.de>" 50 51 51 52 #define DRIVER_DESC "Empia em28xx based USB video device driver" 52 - #define EM28XX_VERSION_CODE KERNEL_VERSION(0, 1, 2) 53 + 54 + #define EM28XX_VERSION "0.1.3" 53 55 54 56 #define em28xx_videodbg(fmt, arg...) do {\ 55 57 if (video_debug) \ ··· 72 72 MODULE_AUTHOR(DRIVER_AUTHOR); 73 73 MODULE_DESCRIPTION(DRIVER_DESC); 74 74 MODULE_LICENSE("GPL"); 75 + MODULE_VERSION(EM28XX_VERSION); 75 76 76 77 static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET }; 77 78 static unsigned int vbi_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET }; ··· 1758 1757 strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card)); 1759 1758 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); 1760 1759 1761 - cap->version = EM28XX_VERSION_CODE; 1762 - 1763 1760 cap->capabilities = 1764 1761 V4L2_CAP_SLICED_VBI_CAPTURE | 1765 1762 V4L2_CAP_VIDEO_CAPTURE | ··· 1975 1976 strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card)); 1976 1977 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); 1977 1978 1978 - cap->version = EM28XX_VERSION_CODE; 1979 1979 cap->capabilities = V4L2_CAP_TUNER; 1980 1980 return 0; 1981 1981 } ··· 2448 2450 u8 val; 2449 2451 int ret; 2450 2452 2451 - printk(KERN_INFO "%s: v4l2 driver version %d.%d.%d\n", 2452 - dev->name, 2453 - (EM28XX_VERSION_CODE >> 16) & 0xff, 2454 - (EM28XX_VERSION_CODE >> 8) & 0xff, EM28XX_VERSION_CODE & 0xff); 2453 + printk(KERN_INFO "%s: v4l2 driver version %s\n", 2454 + dev->name, EM28XX_VERSION); 2455 2455 2456 2456 /* set default norm */ 2457 2457 dev->norm = em28xx_video_template.current_norm;
-1
drivers/media/video/gspca/gl860/gl860.h
··· 18 18 */ 19 19 #ifndef GL860_DEV_H 20 20 #define GL860_DEV_H 21 - #include <linux/version.h> 22 21 23 22 #include "gspca.h" 24 23
+1
drivers/media/video/hdpvr/hdpvr-core.c
··· 474 474 module_exit(hdpvr_exit); 475 475 476 476 MODULE_LICENSE("GPL"); 477 + MODULE_VERSION("0.2.1"); 477 478 MODULE_AUTHOR("Janne Grunau"); 478 479 MODULE_DESCRIPTION("Hauppauge HD PVR driver");
-2
drivers/media/video/hdpvr/hdpvr-video.c
··· 17 17 #include <linux/uaccess.h> 18 18 #include <linux/usb.h> 19 19 #include <linux/mutex.h> 20 - #include <linux/version.h> 21 20 #include <linux/workqueue.h> 22 21 23 22 #include <linux/videodev2.h> ··· 573 574 strcpy(cap->driver, "hdpvr"); 574 575 strcpy(cap->card, "Hauppauge HD PVR"); 575 576 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); 576 - cap->version = HDPVR_VERSION; 577 577 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 578 578 V4L2_CAP_AUDIO | 579 579 V4L2_CAP_READWRITE;
-6
drivers/media/video/hdpvr/hdpvr.h
··· 18 18 #include <media/v4l2-device.h> 19 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 21 #define HDPVR_MAX 8 28 22 #define HDPVR_I2C_MAX_SIZE 128 29 23
+1 -3
drivers/media/video/mem2mem_testdev.c
··· 19 19 #include <linux/module.h> 20 20 #include <linux/delay.h> 21 21 #include <linux/fs.h> 22 - #include <linux/version.h> 23 22 #include <linux/timer.h> 24 23 #include <linux/sched.h> 25 24 #include <linux/slab.h> ··· 34 35 MODULE_DESCRIPTION("Virtual device for mem2mem framework testing"); 35 36 MODULE_AUTHOR("Pawel Osciak, <pawel@osciak.com>"); 36 37 MODULE_LICENSE("GPL"); 37 - 38 + MODULE_VERSION("0.1.1"); 38 39 39 40 #define MIN_W 32 40 41 #define MIN_H 32 ··· 379 380 strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1); 380 381 strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1); 381 382 cap->bus_info[0] = 0; 382 - cap->version = KERNEL_VERSION(0, 1, 0); 383 383 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT 384 384 | V4L2_CAP_STREAMING; 385 385
+1 -3
drivers/media/video/pms.c
··· 28 28 #include <linux/mm.h> 29 29 #include <linux/ioport.h> 30 30 #include <linux/init.h> 31 - #include <linux/version.h> 32 31 #include <linux/mutex.h> 33 32 #include <linux/uaccess.h> 34 33 #include <asm/io.h> ··· 38 39 #include <media/v4l2-device.h> 39 40 40 41 MODULE_LICENSE("GPL"); 41 - 42 + MODULE_VERSION("0.0.4"); 42 43 43 44 #define MOTOROLA 1 44 45 #define PHILIPS2 2 /* SAA7191 */ ··· 677 678 strlcpy(vcap->driver, dev->v4l2_dev.name, sizeof(vcap->driver)); 678 679 strlcpy(vcap->card, "Mediavision PMS", sizeof(vcap->card)); 679 680 strlcpy(vcap->bus_info, "ISA", sizeof(vcap->bus_info)); 680 - vcap->version = KERNEL_VERSION(0, 0, 3); 681 681 vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; 682 682 return 0; 683 683 }
-1
drivers/media/video/pwc/pwc-ioctl.h
··· 52 52 */ 53 53 54 54 #include <linux/types.h> 55 - #include <linux/version.h> 56 55 57 56 /* Enumeration of image sizes */ 58 57 #define PSZ_SQCIF 0x00
+4 -4
drivers/media/video/pwc/pwc.h
··· 29 29 #include <linux/usb.h> 30 30 #include <linux/spinlock.h> 31 31 #include <linux/wait.h> 32 - #include <linux/version.h> 33 32 #include <linux/mutex.h> 34 33 #include <linux/mm.h> 35 34 #include <linux/slab.h> ··· 46 47 /* Version block */ 47 48 #define PWC_MAJOR 10 48 49 #define PWC_MINOR 0 49 - #define PWC_EXTRAMINOR 12 50 - #define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR) 51 - #define PWC_VERSION "10.0.14" 50 + #define PWC_EXTRAMINOR 15 51 + 52 + #define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR, PWC_MINOR, PWC_EXTRAMINOR) 53 + #define PWC_VERSION __stringify(PWC_MAJOR) "." __stringify(PWC_MINOR) "." __stringify(PWC_EXTRAMINOR) 52 54 #define PWC_NAME "pwc" 53 55 #define PFX PWC_NAME ": " 54 56
+4 -8
drivers/media/video/saa7134/saa7134-core.c
··· 39 39 MODULE_DESCRIPTION("v4l2 driver module for saa7130/34 based TV cards"); 40 40 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 41 41 MODULE_LICENSE("GPL"); 42 + MODULE_VERSION(SAA7134_VERSION); 43 + 42 44 43 45 /* ------------------------------------------------------------------ */ 44 46 ··· 1334 1332 static int __init saa7134_init(void) 1335 1333 { 1336 1334 INIT_LIST_HEAD(&saa7134_devlist); 1337 - printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", 1338 - (SAA7134_VERSION_CODE >> 16) & 0xff, 1339 - (SAA7134_VERSION_CODE >> 8) & 0xff, 1340 - SAA7134_VERSION_CODE & 0xff); 1341 - #ifdef SNAPSHOT 1342 - printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n", 1343 - SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); 1344 - #endif 1335 + printk(KERN_INFO "saa7130/34: v4l2 driver version %s loaded\n", 1336 + SAA7134_VERSION); 1345 1337 return pci_register_driver(&saa7134_pci_driver); 1346 1338 } 1347 1339
-1
drivers/media/video/saa7134/saa7134-empress.c
··· 172 172 strlcpy(cap->card, saa7134_boards[dev->board].name, 173 173 sizeof(cap->card)); 174 174 sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); 175 - cap->version = SAA7134_VERSION_CODE; 176 175 cap->capabilities = 177 176 V4L2_CAP_VIDEO_CAPTURE | 178 177 V4L2_CAP_READWRITE |
-2
drivers/media/video/saa7134/saa7134-video.c
··· 1810 1810 strlcpy(cap->card, saa7134_boards[dev->board].name, 1811 1811 sizeof(cap->card)); 1812 1812 sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); 1813 - cap->version = SAA7134_VERSION_CODE; 1814 1813 cap->capabilities = 1815 1814 V4L2_CAP_VIDEO_CAPTURE | 1816 1815 V4L2_CAP_VBI_CAPTURE | ··· 2306 2307 strcpy(cap->driver, "saa7134"); 2307 2308 strlcpy(cap->card, saa7134_boards[dev->board].name, sizeof(cap->card)); 2308 2309 sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); 2309 - cap->version = SAA7134_VERSION_CODE; 2310 2310 cap->capabilities = V4L2_CAP_TUNER; 2311 2311 return 0; 2312 2312 }
+1 -2
drivers/media/video/saa7134/saa7134.h
··· 19 19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 20 */ 21 21 22 - #include <linux/version.h> 23 - #define SAA7134_VERSION_CODE KERNEL_VERSION(0, 2, 16) 22 + #define SAA7134_VERSION "0, 2, 17" 24 23 25 24 #include <linux/pci.h> 26 25 #include <linux/i2c.h>
-1
drivers/media/video/saa7164/saa7164.h
··· 48 48 #include <linux/i2c.h> 49 49 #include <linux/i2c-algo-bit.h> 50 50 #include <linux/kdev_t.h> 51 - #include <linux/version.h> 52 51 #include <linux/mutex.h> 53 52 #include <linux/crc32.h> 54 53 #include <linux/kthread.h>
-1
drivers/media/video/timblogiw.c
··· 20 20 * Timberdale FPGA LogiWin Video In 21 21 */ 22 22 23 - #include <linux/version.h> 24 23 #include <linux/platform_device.h> 25 24 #include <linux/slab.h> 26 25 #include <linux/dmaengine.h>
-1
drivers/media/video/tlg2300/pd-common.h
··· 1 1 #ifndef PD_COMMON_H 2 2 #define PD_COMMON_H 3 3 4 - #include <linux/version.h> 5 4 #include <linux/fs.h> 6 5 #include <linux/wait.h> 7 6 #include <linux/list.h>
+1
drivers/media/video/tlg2300/pd-main.c
··· 531 531 MODULE_AUTHOR("Telegent Systems"); 532 532 MODULE_DESCRIPTION("For tlg2300-based USB device "); 533 533 MODULE_LICENSE("GPL"); 534 + MODULE_VERSION("0.0.2");
-2
drivers/media/video/tlg2300/pd-radio.c
··· 6 6 #include <linux/usb.h> 7 7 #include <linux/i2c.h> 8 8 #include <media/v4l2-dev.h> 9 - #include <linux/version.h> 10 9 #include <linux/mm.h> 11 10 #include <linux/mutex.h> 12 11 #include <media/v4l2-ioctl.h> ··· 148 149 strlcpy(v->driver, "tele-radio", sizeof(v->driver)); 149 150 strlcpy(v->card, "Telegent Poseidon", sizeof(v->card)); 150 151 usb_make_path(p->udev, v->bus_info, sizeof(v->bus_info)); 151 - v->version = KERNEL_VERSION(0, 0, 1); 152 152 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 153 153 return 0; 154 154 }
+1 -11
drivers/media/video/usbvision/usbvision-video.c
··· 45 45 * 46 46 */ 47 47 48 - #include <linux/version.h> 49 48 #include <linux/kernel.h> 50 49 #include <linux/list.h> 51 50 #include <linux/timer.h> ··· 76 77 #define DRIVER_ALIAS "USBVision" 77 78 #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" 78 79 #define DRIVER_LICENSE "GPL" 79 - #define USBVISION_DRIVER_VERSION_MAJOR 0 80 - #define USBVISION_DRIVER_VERSION_MINOR 9 81 - #define USBVISION_DRIVER_VERSION_PATCHLEVEL 10 82 - #define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,\ 83 - USBVISION_DRIVER_VERSION_MINOR,\ 84 - USBVISION_DRIVER_VERSION_PATCHLEVEL) 85 - #define USBVISION_VERSION_STRING __stringify(USBVISION_DRIVER_VERSION_MAJOR) \ 86 - "." __stringify(USBVISION_DRIVER_VERSION_MINOR) \ 87 - "." __stringify(USBVISION_DRIVER_VERSION_PATCHLEVEL) 80 + #define USBVISION_VERSION_STRING "0.9.11" 88 81 89 82 #define ENABLE_HEXDUMP 0 /* Enable if you need it */ 90 83 ··· 507 516 usbvision_device_data[usbvision->dev_model].model_string, 508 517 sizeof(vc->card)); 509 518 usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info)); 510 - vc->version = USBVISION_DRIVER_VERSION; 511 519 vc->capabilities = V4L2_CAP_VIDEO_CAPTURE | 512 520 V4L2_CAP_AUDIO | 513 521 V4L2_CAP_READWRITE |
+1 -4
drivers/media/video/vino.c
··· 36 36 #include <linux/slab.h> 37 37 #include <linux/mm.h> 38 38 #include <linux/time.h> 39 - #include <linux/version.h> 40 39 #include <linux/kmod.h> 41 40 42 41 #include <linux/i2c.h> ··· 60 61 // #define VINO_DEBUG 61 62 // #define VINO_DEBUG_INT 62 63 63 - #define VINO_MODULE_VERSION "0.0.6" 64 - #define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 6) 64 + #define VINO_MODULE_VERSION "0.0.7" 65 65 66 66 MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver"); 67 67 MODULE_VERSION(VINO_MODULE_VERSION); ··· 2932 2934 strcpy(cap->driver, vino_driver_name); 2933 2935 strcpy(cap->card, vino_driver_description); 2934 2936 strcpy(cap->bus_info, vino_bus_name); 2935 - cap->version = VINO_VERSION_CODE; 2936 2937 cap->capabilities = 2937 2938 V4L2_CAP_VIDEO_CAPTURE | 2938 2939 V4L2_CAP_STREAMING;
+4 -10
drivers/media/video/vivi.c
··· 22 22 #include <linux/sched.h> 23 23 #include <linux/slab.h> 24 24 #include <linux/font.h> 25 - #include <linux/version.h> 26 25 #include <linux/mutex.h> 27 26 #include <linux/videodev2.h> 28 27 #include <linux/kthread.h> ··· 43 44 #define MAX_WIDTH 1920 44 45 #define MAX_HEIGHT 1200 45 46 46 - #define VIVI_MAJOR_VERSION 0 47 - #define VIVI_MINOR_VERSION 8 48 - #define VIVI_RELEASE 0 49 - #define VIVI_VERSION \ 50 - KERNEL_VERSION(VIVI_MAJOR_VERSION, VIVI_MINOR_VERSION, VIVI_RELEASE) 47 + #define VIVI_VERSION "0.8.1" 51 48 52 49 MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board"); 53 50 MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol"); 54 51 MODULE_LICENSE("Dual BSD/GPL"); 52 + MODULE_VERSION(VIVI_VERSION); 55 53 56 54 static unsigned video_nr = -1; 57 55 module_param(video_nr, uint, 0644); ··· 808 812 strcpy(cap->driver, "vivi"); 809 813 strcpy(cap->card, "vivi"); 810 814 strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); 811 - cap->version = VIVI_VERSION; 812 815 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | \ 813 816 V4L2_CAP_READWRITE; 814 817 return 0; ··· 1320 1325 } 1321 1326 1322 1327 printk(KERN_INFO "Video Technology Magazine Virtual Video " 1323 - "Capture Board ver %u.%u.%u successfully loaded.\n", 1324 - (VIVI_VERSION >> 16) & 0xFF, (VIVI_VERSION >> 8) & 0xFF, 1325 - VIVI_VERSION & 0xFF); 1328 + "Capture Board ver %s successfully loaded.\n", 1329 + VIVI_VERSION); 1326 1330 1327 1331 /* n_devs will reflect the actual number of allocated devices */ 1328 1332 n_devs = i;
+1 -3
drivers/media/video/w9966.c
··· 57 57 #include <linux/module.h> 58 58 #include <linux/init.h> 59 59 #include <linux/delay.h> 60 - #include <linux/version.h> 61 60 #include <linux/videodev2.h> 62 61 #include <linux/slab.h> 63 62 #include <media/v4l2-common.h> ··· 126 127 MODULE_AUTHOR("Jakob Kemi <jakob.kemi@post.utfors.se>"); 127 128 MODULE_DESCRIPTION("Winbond w9966cf WebCam driver (0.32)"); 128 129 MODULE_LICENSE("GPL"); 129 - 130 + MODULE_VERSION("0.33.1"); 130 131 131 132 #ifdef MODULE 132 133 static const char *pardev[] = {[0 ... W9966_MAXCAMS] = ""}; ··· 567 568 strlcpy(vcap->driver, cam->v4l2_dev.name, sizeof(vcap->driver)); 568 569 strlcpy(vcap->card, W9966_DRIVERNAME, sizeof(vcap->card)); 569 570 strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); 570 - vcap->version = KERNEL_VERSION(0, 33, 0); 571 571 vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; 572 572 return 0; 573 573 }
-4
drivers/media/video/zoran/zoran.h
··· 41 41 }; 42 42 43 43 44 - #define MAJOR_VERSION 0 /* driver major version */ 45 - #define MINOR_VERSION 10 /* driver minor version */ 46 - #define RELEASE_VERSION 0 /* release version */ 47 - 48 44 #define ZORAN_NAME "ZORAN" /* name of the device */ 49 45 50 46 #define ZR_DEVNAME(zr) ((zr)->name)
+5 -2
drivers/media/video/zoran/zoran_card.c
··· 123 123 module_param_named(debug, zr36067_debug, int, 0644); 124 124 MODULE_PARM_DESC(debug, "Debug level (0-5)"); 125 125 126 + #define ZORAN_VERSION "0.10.1" 127 + 126 128 MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver"); 127 129 MODULE_AUTHOR("Serguei Miridonov"); 128 130 MODULE_LICENSE("GPL"); 131 + MODULE_VERSION(ZORAN_VERSION); 129 132 130 133 #define ZR_DEVICE(subven, subdev, data) { \ 131 134 .vendor = PCI_VENDOR_ID_ZORAN, .device = PCI_DEVICE_ID_ZORAN_36057, \ ··· 1462 1459 { 1463 1460 int res; 1464 1461 1465 - printk(KERN_INFO "Zoran MJPEG board driver version %d.%d.%d\n", 1466 - MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION); 1462 + printk(KERN_INFO "Zoran MJPEG board driver version %s\n", 1463 + ZORAN_VERSION); 1467 1464 1468 1465 /* check the parameters we have been given, adjust if necessary */ 1469 1466 if (v4l_nbufs < 2)
-3
drivers/media/video/zoran/zoran_driver.c
··· 44 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 45 */ 46 46 47 - #include <linux/version.h> 48 47 #include <linux/init.h> 49 48 #include <linux/module.h> 50 49 #include <linux/delay.h> ··· 1537 1538 strncpy(cap->driver, "zoran", sizeof(cap->driver)-1); 1538 1539 snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", 1539 1540 pci_name(zr->pci_dev)); 1540 - cap->version = KERNEL_VERSION(MAJOR_VERSION, MINOR_VERSION, 1541 - RELEASE_VERSION); 1542 1541 cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE | 1543 1542 V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OVERLAY; 1544 1543 return 0;
+2 -4
drivers/media/video/zr364xx.c
··· 29 29 30 30 31 31 #include <linux/module.h> 32 - #include <linux/version.h> 33 32 #include <linux/init.h> 34 33 #include <linux/usb.h> 35 34 #include <linux/vmalloc.h> ··· 41 42 42 43 43 44 /* Version Information */ 44 - #define DRIVER_VERSION "v0.73" 45 - #define ZR364XX_VERSION_CODE KERNEL_VERSION(0, 7, 3) 45 + #define DRIVER_VERSION "0.7.4" 46 46 #define DRIVER_AUTHOR "Antoine Jacquet, http://royale.zerezo.com/" 47 47 #define DRIVER_DESC "Zoran 364xx" 48 48 ··· 742 744 strlcpy(cap->card, cam->udev->product, sizeof(cap->card)); 743 745 strlcpy(cap->bus_info, dev_name(&cam->udev->dev), 744 746 sizeof(cap->bus_info)); 745 - cap->version = ZR364XX_VERSION_CODE; 746 747 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 747 748 V4L2_CAP_READWRITE | 748 749 V4L2_CAP_STREAMING; ··· 1718 1721 MODULE_AUTHOR(DRIVER_AUTHOR); 1719 1722 MODULE_DESCRIPTION(DRIVER_DESC); 1720 1723 MODULE_LICENSE("GPL"); 1724 + MODULE_VERSION(DRIVER_VERSION);