You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[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>
This commit is contained in:
@@ -27,7 +27,6 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-device.h>
|
||||
@@ -54,7 +53,7 @@
|
||||
*/
|
||||
#define USE_INT 0 /* Don't modify */
|
||||
|
||||
#define VERSION "0.04"
|
||||
#define VERSION "0.0.5"
|
||||
|
||||
#define ar_inl(addr) inl((unsigned long)(addr))
|
||||
#define ar_outl(val, addr) outl((unsigned long)(val), (unsigned long)(addr))
|
||||
@@ -404,7 +403,6 @@ static int ar_querycap(struct file *file, void *priv,
|
||||
strlcpy(vcap->driver, ar->vdev.name, sizeof(vcap->driver));
|
||||
strlcpy(vcap->card, "Colour AR VGA", sizeof(vcap->card));
|
||||
strlcpy(vcap->bus_info, "Platform", sizeof(vcap->bus_info));
|
||||
vcap->version = KERNEL_VERSION(0, 0, 4);
|
||||
vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
|
||||
return 0;
|
||||
}
|
||||
@@ -879,3 +877,4 @@ module_exit(ar_cleanup_module);
|
||||
MODULE_AUTHOR("Takeo Takahashi <takahashi.takeo@renesas.com>");
|
||||
MODULE_DESCRIPTION("Colour AR M64278(VGA) for Video4Linux");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(VERSION);
|
||||
|
||||
@@ -292,3 +292,4 @@ module_exit(au0828_exit);
|
||||
MODULE_DESCRIPTION("Driver for Auvitek AU0828 based products");
|
||||
MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION("0.0.2");
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/suspend.h>
|
||||
#include <linux/version.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-chip-ident.h>
|
||||
@@ -43,8 +42,6 @@
|
||||
|
||||
static DEFINE_MUTEX(au0828_sysfs_lock);
|
||||
|
||||
#define AU0828_VERSION_CODE KERNEL_VERSION(0, 0, 1)
|
||||
|
||||
/* ------------------------------------------------------------------
|
||||
Videobuf operations
|
||||
------------------------------------------------------------------*/
|
||||
@@ -1254,8 +1251,6 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
strlcpy(cap->card, dev->board.name, sizeof(cap->card));
|
||||
strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info));
|
||||
|
||||
cap->version = AU0828_VERSION_CODE;
|
||||
|
||||
/*set the device capabilities */
|
||||
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_VBI_CAPTURE |
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
|
||||
#include <media/saa6588.h>
|
||||
|
||||
#define BTTV_VERSION "0.9.19"
|
||||
|
||||
unsigned int bttv_num; /* number of Bt848s in use */
|
||||
struct bttv *bttvs[BTTV_MAX];
|
||||
@@ -163,6 +164,7 @@ MODULE_PARM_DESC(radio_nr, "radio device numbers");
|
||||
MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards");
|
||||
MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(BTTV_VERSION);
|
||||
|
||||
/* ----------------------------------------------------------------------- */
|
||||
/* sysfs */
|
||||
@@ -2616,7 +2618,6 @@ static int bttv_querycap(struct file *file, void *priv,
|
||||
strlcpy(cap->card, btv->video_dev->name, sizeof(cap->card));
|
||||
snprintf(cap->bus_info, sizeof(cap->bus_info),
|
||||
"PCI:%s", pci_name(btv->c.pci));
|
||||
cap->version = BTTV_VERSION_CODE;
|
||||
cap->capabilities =
|
||||
V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_VBI_CAPTURE |
|
||||
@@ -3416,7 +3417,6 @@ static int radio_querycap(struct file *file, void *priv,
|
||||
strcpy(cap->driver, "bttv");
|
||||
strlcpy(cap->card, btv->radio_dev->name, sizeof(cap->card));
|
||||
sprintf(cap->bus_info, "PCI:%s", pci_name(btv->c.pci));
|
||||
cap->version = BTTV_VERSION_CODE;
|
||||
cap->capabilities = V4L2_CAP_TUNER;
|
||||
|
||||
return 0;
|
||||
@@ -4585,14 +4585,8 @@ static int __init bttv_init_module(void)
|
||||
|
||||
bttv_num = 0;
|
||||
|
||||
printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n",
|
||||
(BTTV_VERSION_CODE >> 16) & 0xff,
|
||||
(BTTV_VERSION_CODE >> 8) & 0xff,
|
||||
BTTV_VERSION_CODE & 0xff);
|
||||
#ifdef SNAPSHOT
|
||||
printk(KERN_INFO "bttv: snapshot date %04d-%02d-%02d\n",
|
||||
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
|
||||
#endif
|
||||
printk(KERN_INFO "bttv: driver version %s loaded\n",
|
||||
BTTV_VERSION);
|
||||
if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME)
|
||||
gbuffers = 2;
|
||||
if (gbufsize > BTTV_MAX_FBUF)
|
||||
|
||||
@@ -25,9 +25,6 @@
|
||||
#ifndef _BTTVP_H_
|
||||
#define _BTTVP_H_
|
||||
|
||||
#include <linux/version.h>
|
||||
#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,18)
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/i2c.h>
|
||||
|
||||
@@ -71,7 +71,6 @@ OTHER DEALINGS IN THE SOFTWARE.
|
||||
#include <linux/mm.h>
|
||||
#include <linux/parport.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <asm/uaccess.h>
|
||||
@@ -647,7 +646,6 @@ static int qcam_querycap(struct file *file, void *priv,
|
||||
strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver));
|
||||
strlcpy(vcap->card, "B&W Quickcam", sizeof(vcap->card));
|
||||
strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info));
|
||||
vcap->version = KERNEL_VERSION(0, 0, 2);
|
||||
vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
|
||||
return 0;
|
||||
}
|
||||
@@ -1092,3 +1090,4 @@ module_init(init_bw_qcams);
|
||||
module_exit(exit_bw_qcams);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION("0.0.3");
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#include <linux/sched.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <media/v4l2-device.h>
|
||||
@@ -517,7 +516,6 @@ static int qcam_querycap(struct file *file, void *priv,
|
||||
strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver));
|
||||
strlcpy(vcap->card, "Color Quickcam", sizeof(vcap->card));
|
||||
strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info));
|
||||
vcap->version = KERNEL_VERSION(0, 0, 3);
|
||||
vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
|
||||
return 0;
|
||||
}
|
||||
@@ -886,6 +884,7 @@ static void __exit cqcam_cleanup(void)
|
||||
MODULE_AUTHOR("Philip Blundell <philb@gnu.org>");
|
||||
MODULE_DESCRIPTION(BANNER);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION("0.0.4");
|
||||
|
||||
module_init(cqcam_init);
|
||||
module_exit(cqcam_cleanup);
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#ifndef __CPIA2_H__
|
||||
#define __CPIA2_H__
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <linux/usb.h>
|
||||
@@ -43,10 +42,6 @@
|
||||
/* define for verbose debug output */
|
||||
//#define _CPIA2_DEBUG_
|
||||
|
||||
#define CPIA2_MAJ_VER 3
|
||||
#define CPIA2_MIN_VER 0
|
||||
#define CPIA2_PATCH_VER 0
|
||||
|
||||
/***
|
||||
* Image defines
|
||||
***/
|
||||
|
||||
@@ -29,8 +29,7 @@
|
||||
* Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
****************************************************************************/
|
||||
|
||||
#include <linux/version.h>
|
||||
|
||||
#define CPIA_VERSION "3.0.1"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/time.h>
|
||||
@@ -80,6 +79,7 @@ MODULE_AUTHOR("Steve Miller (STMicroelectronics) <steve.miller@st.com>");
|
||||
MODULE_DESCRIPTION("V4L-driver for STMicroelectronics CPiA2 based cameras");
|
||||
MODULE_SUPPORTED_DEVICE("video");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(CPIA_VERSION);
|
||||
|
||||
#define ABOUT "V4L-Driver for Vision CPiA2 based cameras"
|
||||
|
||||
@@ -465,9 +465,6 @@ static int cpia2_querycap(struct file *file, void *fh, struct v4l2_capability *v
|
||||
if (usb_make_path(cam->dev, vc->bus_info, sizeof(vc->bus_info)) <0)
|
||||
memset(vc->bus_info,0, sizeof(vc->bus_info));
|
||||
|
||||
vc->version = KERNEL_VERSION(CPIA2_MAJ_VER, CPIA2_MIN_VER,
|
||||
CPIA2_PATCH_VER);
|
||||
|
||||
vc->capabilities = V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_READWRITE |
|
||||
V4L2_CAP_STREAMING;
|
||||
@@ -1558,8 +1555,8 @@ static void __init check_parameters(void)
|
||||
*****************************************************************************/
|
||||
static int __init cpia2_init(void)
|
||||
{
|
||||
LOG("%s v%d.%d.%d\n",
|
||||
ABOUT, CPIA2_MAJ_VER, CPIA2_MIN_VER, CPIA2_PATCH_VER);
|
||||
LOG("%s v%s\n",
|
||||
ABOUT, CPIA_VERSION);
|
||||
check_parameters();
|
||||
cpia2_usb_init();
|
||||
return 0;
|
||||
@@ -1579,4 +1576,3 @@ static void __exit cpia2_exit(void)
|
||||
|
||||
module_init(cpia2_init);
|
||||
module_exit(cpia2_exit);
|
||||
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <linux/bitmap.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/slab.h>
|
||||
@@ -45,7 +44,7 @@
|
||||
#include "cx231xx.h"
|
||||
#include "cx231xx-vbi.h"
|
||||
|
||||
#define CX231XX_VERSION_CODE KERNEL_VERSION(0, 0, 1)
|
||||
#define CX231XX_VERSION "0.0.2"
|
||||
|
||||
#define DRIVER_AUTHOR "Srinivasa Deevi <srinivasa.deevi@conexant.com>"
|
||||
#define DRIVER_DESC "Conexant cx231xx based USB video device driver"
|
||||
@@ -70,6 +69,7 @@ do {\
|
||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(CX231XX_VERSION);
|
||||
|
||||
static unsigned int card[] = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET };
|
||||
static unsigned int video_nr[] = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET };
|
||||
@@ -1869,8 +1869,6 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));
|
||||
usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
|
||||
|
||||
cap->version = CX231XX_VERSION_CODE;
|
||||
|
||||
cap->capabilities = V4L2_CAP_VBI_CAPTURE |
|
||||
#if 0
|
||||
V4L2_CAP_SLICED_VBI_CAPTURE |
|
||||
@@ -2057,7 +2055,6 @@ static int radio_querycap(struct file *file, void *priv,
|
||||
strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));
|
||||
usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
|
||||
|
||||
cap->version = CX231XX_VERSION_CODE;
|
||||
cap->capabilities = V4L2_CAP_TUNER;
|
||||
return 0;
|
||||
}
|
||||
@@ -2570,11 +2567,8 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
cx231xx_info("%s: v4l2 driver version %d.%d.%d\n",
|
||||
dev->name,
|
||||
(CX231XX_VERSION_CODE >> 16) & 0xff,
|
||||
(CX231XX_VERSION_CODE >> 8) & 0xff,
|
||||
CX231XX_VERSION_CODE & 0xff);
|
||||
cx231xx_info("%s: v4l2 driver version %s\n",
|
||||
dev->name, CX231XX_VERSION);
|
||||
|
||||
/* set default norm */
|
||||
/*dev->norm = cx231xx_video_template.current_norm; */
|
||||
|
||||
@@ -114,7 +114,6 @@
|
||||
V4L2_STD_PAL_BG | V4L2_STD_PAL_DK | V4L2_STD_PAL_I | \
|
||||
V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | \
|
||||
V4L2_STD_PAL_60 | V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK)
|
||||
#define CX231xx_VERSION_CODE KERNEL_VERSION(0, 0, 2)
|
||||
|
||||
#define SLEEP_S5H1432 30
|
||||
#define CX23417_OSC_EN 8
|
||||
|
||||
@@ -52,7 +52,6 @@
|
||||
* | DATA7| DATA6| DATA5| DATA4| DATA3| DATA2| DATA1| DATA0|
|
||||
* +-------+-------+-------+-------+-------+-------+-------+-------+
|
||||
*/
|
||||
#include <linux/version.h>
|
||||
#include <media/videobuf-dma-sg.h>
|
||||
#include <media/videobuf-dvb.h>
|
||||
#include "altera-ci.h"
|
||||
|
||||
@@ -1359,7 +1359,6 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
strlcpy(cap->card, cx23885_boards[tsport->dev->board].name,
|
||||
sizeof(cap->card));
|
||||
sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
|
||||
cap->version = CX23885_VERSION_CODE;
|
||||
cap->capabilities =
|
||||
V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_READWRITE |
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
MODULE_DESCRIPTION("Driver for cx23885 based TV cards");
|
||||
MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(CX23885_VERSION);
|
||||
|
||||
static unsigned int debug;
|
||||
module_param(debug, int, 0644);
|
||||
@@ -2147,14 +2148,8 @@ static struct pci_driver cx23885_pci_driver = {
|
||||
|
||||
static int __init cx23885_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n",
|
||||
(CX23885_VERSION_CODE >> 16) & 0xff,
|
||||
(CX23885_VERSION_CODE >> 8) & 0xff,
|
||||
CX23885_VERSION_CODE & 0xff);
|
||||
#ifdef SNAPSHOT
|
||||
printk(KERN_INFO "cx23885: snapshot date %04d-%02d-%02d\n",
|
||||
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
|
||||
#endif
|
||||
printk(KERN_INFO "cx23885 driver version %s loaded\n",
|
||||
CX23885_VERSION);
|
||||
return pci_register_driver(&cx23885_pci_driver);
|
||||
}
|
||||
|
||||
@@ -2165,5 +2160,3 @@ static void __exit cx23885_fini(void)
|
||||
|
||||
module_init(cx23885_init);
|
||||
module_exit(cx23885_fini);
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
|
||||
@@ -1000,7 +1000,6 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
strlcpy(cap->card, cx23885_boards[dev->board].name,
|
||||
sizeof(cap->card));
|
||||
sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci));
|
||||
cap->version = CX23885_VERSION_CODE;
|
||||
cap->capabilities =
|
||||
V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_READWRITE |
|
||||
|
||||
@@ -36,10 +36,9 @@
|
||||
#include "cx23885-reg.h"
|
||||
#include "media/cx2341x.h"
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 2)
|
||||
#define CX23885_VERSION "0.0.3"
|
||||
|
||||
#define UNSET (-1U)
|
||||
|
||||
|
||||
@@ -113,6 +113,8 @@ MODULE_DESCRIPTION("ALSA driver module for cx2388x based TV cards");
|
||||
MODULE_AUTHOR("Ricardo Cerqueira");
|
||||
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(CX88_VERSION);
|
||||
|
||||
MODULE_SUPPORTED_DEVICE("{{Conexant,23881},"
|
||||
"{{Conexant,23882},"
|
||||
"{{Conexant,23883}");
|
||||
@@ -973,14 +975,8 @@ static struct pci_driver cx88_audio_pci_driver = {
|
||||
*/
|
||||
static int __init cx88_audio_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
(CX88_VERSION_CODE >> 8) & 0xff,
|
||||
CX88_VERSION_CODE & 0xff);
|
||||
#ifdef SNAPSHOT
|
||||
printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
|
||||
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
|
||||
#endif
|
||||
printk(KERN_INFO "cx2388x alsa driver version %s loaded\n",
|
||||
CX88_VERSION);
|
||||
return pci_register_driver(&cx88_audio_pci_driver);
|
||||
}
|
||||
|
||||
@@ -994,10 +990,3 @@ static void __exit cx88_audio_fini(void)
|
||||
|
||||
module_init(cx88_audio_init);
|
||||
module_exit(cx88_audio_fini);
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards");
|
||||
MODULE_AUTHOR("Jelle Foks <jelle@foks.us>, Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(CX88_VERSION);
|
||||
|
||||
static unsigned int mpegbufs = 32;
|
||||
module_param(mpegbufs,int,0644);
|
||||
@@ -730,7 +731,6 @@ static int vidioc_querycap (struct file *file, void *priv,
|
||||
strcpy(cap->driver, "cx88_blackbird");
|
||||
strlcpy(cap->card, core->board.name, sizeof(cap->card));
|
||||
sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
|
||||
cap->version = CX88_VERSION_CODE;
|
||||
cap->capabilities =
|
||||
V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_READWRITE |
|
||||
@@ -1368,14 +1368,8 @@ static struct cx8802_driver cx8802_blackbird_driver = {
|
||||
|
||||
static int __init blackbird_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
(CX88_VERSION_CODE >> 8) & 0xff,
|
||||
CX88_VERSION_CODE & 0xff);
|
||||
#ifdef SNAPSHOT
|
||||
printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
|
||||
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
|
||||
#endif
|
||||
printk(KERN_INFO "cx2388x blackbird driver version %s loaded\n",
|
||||
CX88_VERSION);
|
||||
return cx8802_register_driver(&cx8802_blackbird_driver);
|
||||
}
|
||||
|
||||
@@ -1389,11 +1383,3 @@ module_exit(blackbird_fini);
|
||||
|
||||
module_param_named(video_debug,cx8802_mpeg_template.debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug,"enable debug messages [video]");
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
* 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
|
||||
*/
|
||||
|
||||
@@ -64,6 +64,7 @@ MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
|
||||
MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
|
||||
MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(CX88_VERSION);
|
||||
|
||||
static unsigned int debug;
|
||||
module_param(debug, int, 0644);
|
||||
@@ -1749,14 +1750,8 @@ static struct cx8802_driver cx8802_dvb_driver = {
|
||||
|
||||
static int __init dvb_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
(CX88_VERSION_CODE >> 8) & 0xff,
|
||||
CX88_VERSION_CODE & 0xff);
|
||||
#ifdef SNAPSHOT
|
||||
printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
|
||||
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
|
||||
#endif
|
||||
printk(KERN_INFO "cx88/2: cx2388x dvb driver version %s loaded\n",
|
||||
CX88_VERSION);
|
||||
return cx8802_register_driver(&cx8802_dvb_driver);
|
||||
}
|
||||
|
||||
@@ -1767,10 +1762,3 @@ static void __exit dvb_fini(void)
|
||||
|
||||
module_init(dvb_init);
|
||||
module_exit(dvb_fini);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* compile-command: "make DVB=1"
|
||||
* End:
|
||||
*/
|
||||
|
||||
@@ -39,6 +39,7 @@ MODULE_AUTHOR("Jelle Foks <jelle@foks.us>");
|
||||
MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
|
||||
MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(CX88_VERSION);
|
||||
|
||||
static unsigned int debug;
|
||||
module_param(debug,int,0644);
|
||||
@@ -890,14 +891,8 @@ static struct pci_driver cx8802_pci_driver = {
|
||||
|
||||
static int __init cx8802_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
(CX88_VERSION_CODE >> 8) & 0xff,
|
||||
CX88_VERSION_CODE & 0xff);
|
||||
#ifdef SNAPSHOT
|
||||
printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
|
||||
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
|
||||
#endif
|
||||
printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %s loaded\n",
|
||||
CX88_VERSION);
|
||||
return pci_register_driver(&cx8802_pci_driver);
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user