lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] gspca: don't include linux/version.h

Browse Source 
Instead of handling a per-driver driver version, use the
per-subsystem one.

As reviewed by Jean-Francois Moine <moinejf@free.fr>:
	- the 'info' may be simplified:

Reviewed-by: Jean-Francois Moine <moinejf@free.fr>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
2011-06-27 22:28:38 -03:00
parent fd3e582482
commit b0eaab7657
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/video/gspca/gspca.c
View File

@@ -24,7 +24,6 @@
#define MODULE_NAME "gspca" #define MODULE_NAME "gspca"
#include <linux/init.h> #include <linux/init.h>
#include <linux/version.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/sched.h> #include <linux/sched.h>
@@ -51,11 +50,12 @@
#error "DEF_NURBS too big" #error "DEF_NURBS too big"
#endif #endif
#define DRIVER_VERSION_NUMBER "2.13.0"
MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>"); MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
MODULE_DESCRIPTION("GSPCA USB Camera Driver"); MODULE_DESCRIPTION("GSPCA USB Camera Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRIVER_VERSION_NUMBER);
#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 13, 0)
#ifdef GSPCA_DEBUG #ifdef GSPCA_DEBUG
int gspca_debug = D_ERR | D_PROBE; int gspca_debug = D_ERR | D_PROBE;
@@ -1291,7 +1291,6 @@ static int vidioc_querycap(struct file *file, void *priv,
} }
usb_make_path(gspca_dev->dev, (char *) cap->bus_info, usb_make_path(gspca_dev->dev, (char *) cap->bus_info,
sizeof(cap->bus_info)); sizeof(cap->bus_info));
cap->version = DRIVER_VERSION_NUMBER;
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
| V4L2_CAP_STREAMING | V4L2_CAP_STREAMING
| V4L2_CAP_READWRITE; | V4L2_CAP_READWRITE;
@@ -2478,10 +2477,7 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
/* -- module insert / remove -- */ /* -- module insert / remove -- */
static int __init gspca_init(void) static int __init gspca_init(void)
{ {
info("v%d.%d.%d registered", info("v" DRIVER_VERSION_NUMBER " registered");
(DRIVER_VERSION_NUMBER >> 16) & 0xff,
(DRIVER_VERSION_NUMBER >> 8) & 0xff,
DRIVER_VERSION_NUMBER & 0xff);
return 0; return 0;
} }
static void __exit gspca_exit(void) static void __exit gspca_exit(void)