diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-25 09:15:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:16 -0400 |
commit | 29834c1ac7589c72996c5d02349d63fd397ef131 (patch) | |
tree | 60d5bfadc2bc4f88938640a6d11ff0983b5f5fd4 /drivers/media/radio/radio-zoltrix.c | |
parent | 64dc3c1a906467d90c24913b0b38dd13d9378f4f (diff) |
[media] radio: Use the subsystem version control for VIDIOC_QUERYCAP
Just like the video drivers, the right thing to do is to use
the per-subsystem version control.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/radio-zoltrix.c')
-rw-r--r-- | drivers/media/radio/radio-zoltrix.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c index af99c5bd88c1..f5613b948203 100644 --- a/drivers/media/radio/radio-zoltrix.c +++ b/drivers/media/radio/radio-zoltrix.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/delay.h> /* udelay, msleep */ | 35 | #include <linux/delay.h> /* udelay, msleep */ |
36 | #include <linux/videodev2.h> /* kernel radio structs */ | 36 | #include <linux/videodev2.h> /* kernel radio structs */ |
37 | #include <linux/mutex.h> | 37 | #include <linux/mutex.h> |
38 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | ||
39 | #include <linux/io.h> /* outb, outb_p */ | 38 | #include <linux/io.h> /* outb, outb_p */ |
40 | #include <media/v4l2-device.h> | 39 | #include <media/v4l2-device.h> |
41 | #include <media/v4l2-ioctl.h> | 40 | #include <media/v4l2-ioctl.h> |
@@ -43,6 +42,7 @@ | |||
43 | MODULE_AUTHOR("C.van Schaik"); | 42 | MODULE_AUTHOR("C.van Schaik"); |
44 | MODULE_DESCRIPTION("A driver for the Zoltrix Radio Plus."); | 43 | MODULE_DESCRIPTION("A driver for the Zoltrix Radio Plus."); |
45 | MODULE_LICENSE("GPL"); | 44 | MODULE_LICENSE("GPL"); |
45 | MODULE_VERSION("0.0.3"); | ||
46 | 46 | ||
47 | #ifndef CONFIG_RADIO_ZOLTRIX_PORT | 47 | #ifndef CONFIG_RADIO_ZOLTRIX_PORT |
48 | #define CONFIG_RADIO_ZOLTRIX_PORT -1 | 48 | #define CONFIG_RADIO_ZOLTRIX_PORT -1 |
@@ -55,8 +55,6 @@ module_param(io, int, 0); | |||
55 | MODULE_PARM_DESC(io, "I/O address of the Zoltrix Radio Plus (0x20c or 0x30c)"); | 55 | MODULE_PARM_DESC(io, "I/O address of the Zoltrix Radio Plus (0x20c or 0x30c)"); |
56 | module_param(radio_nr, int, 0); | 56 | module_param(radio_nr, int, 0); |
57 | 57 | ||
58 | #define RADIO_VERSION KERNEL_VERSION(0, 0, 2) | ||
59 | |||
60 | struct zoltrix { | 58 | struct zoltrix { |
61 | struct v4l2_device v4l2_dev; | 59 | struct v4l2_device v4l2_dev; |
62 | struct video_device vdev; | 60 | struct video_device vdev; |
@@ -228,7 +226,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
228 | strlcpy(v->driver, "radio-zoltrix", sizeof(v->driver)); | 226 | strlcpy(v->driver, "radio-zoltrix", sizeof(v->driver)); |
229 | strlcpy(v->card, "Zoltrix Radio", sizeof(v->card)); | 227 | strlcpy(v->card, "Zoltrix Radio", sizeof(v->card)); |
230 | strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); | 228 | strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); |
231 | v->version = RADIO_VERSION; | ||
232 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; | 229 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; |
233 | return 0; | 230 | return 0; |
234 | } | 231 | } |