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-terratec.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-terratec.c')
-rw-r--r-- | drivers/media/radio/radio-terratec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c index a32663917059..f2ed9cc3cf3b 100644 --- a/drivers/media/radio/radio-terratec.c +++ b/drivers/media/radio/radio-terratec.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/ioport.h> /* request_region */ | 29 | #include <linux/ioport.h> /* request_region */ |
30 | #include <linux/videodev2.h> /* kernel radio structs */ | 30 | #include <linux/videodev2.h> /* kernel radio structs */ |
31 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
32 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | ||
33 | #include <linux/io.h> /* outb, outb_p */ | 32 | #include <linux/io.h> /* outb, outb_p */ |
34 | #include <media/v4l2-device.h> | 33 | #include <media/v4l2-device.h> |
35 | #include <media/v4l2-ioctl.h> | 34 | #include <media/v4l2-ioctl.h> |
@@ -37,6 +36,7 @@ | |||
37 | MODULE_AUTHOR("R.OFFERMANNS & others"); | 36 | MODULE_AUTHOR("R.OFFERMANNS & others"); |
38 | MODULE_DESCRIPTION("A driver for the TerraTec ActiveRadio Standalone radio card."); | 37 | MODULE_DESCRIPTION("A driver for the TerraTec ActiveRadio Standalone radio card."); |
39 | MODULE_LICENSE("GPL"); | 38 | MODULE_LICENSE("GPL"); |
39 | MODULE_VERSION("0.0.3"); | ||
40 | 40 | ||
41 | #ifndef CONFIG_RADIO_TERRATEC_PORT | 41 | #ifndef CONFIG_RADIO_TERRATEC_PORT |
42 | #define CONFIG_RADIO_TERRATEC_PORT 0x590 | 42 | #define CONFIG_RADIO_TERRATEC_PORT 0x590 |
@@ -49,8 +49,6 @@ module_param(io, int, 0); | |||
49 | MODULE_PARM_DESC(io, "I/O address of the TerraTec ActiveRadio card (0x590 or 0x591)"); | 49 | MODULE_PARM_DESC(io, "I/O address of the TerraTec ActiveRadio card (0x590 or 0x591)"); |
50 | module_param(radio_nr, int, 0); | 50 | module_param(radio_nr, int, 0); |
51 | 51 | ||
52 | #define RADIO_VERSION KERNEL_VERSION(0, 0, 2) | ||
53 | |||
54 | static struct v4l2_queryctrl radio_qctrl[] = { | 52 | static struct v4l2_queryctrl radio_qctrl[] = { |
55 | { | 53 | { |
56 | .id = V4L2_CID_AUDIO_MUTE, | 54 | .id = V4L2_CID_AUDIO_MUTE, |
@@ -205,7 +203,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
205 | strlcpy(v->driver, "radio-terratec", sizeof(v->driver)); | 203 | strlcpy(v->driver, "radio-terratec", sizeof(v->driver)); |
206 | strlcpy(v->card, "ActiveRadio", sizeof(v->card)); | 204 | strlcpy(v->card, "ActiveRadio", sizeof(v->card)); |
207 | strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); | 205 | strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); |
208 | v->version = RADIO_VERSION; | ||
209 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; | 206 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; |
210 | return 0; | 207 | return 0; |
211 | } | 208 | } |