aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-cadet.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-06-25 09:15:42 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:16 -0400
commit29834c1ac7589c72996c5d02349d63fd397ef131 (patch)
tree60d5bfadc2bc4f88938640a6d11ff0983b5f5fd4 /drivers/media/radio/radio-cadet.c
parent64dc3c1a906467d90c24913b0b38dd13d9378f4f (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-cadet.c')
-rw-r--r--drivers/media/radio/radio-cadet.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index bc9ad0897c55..16a089fad909 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -30,7 +30,6 @@
30 * Changed API to V4L2 30 * Changed API to V4L2
31 */ 31 */
32 32
33#include <linux/version.h>
34#include <linux/module.h> /* Modules */ 33#include <linux/module.h> /* Modules */
35#include <linux/init.h> /* Initdata */ 34#include <linux/init.h> /* Initdata */
36#include <linux/ioport.h> /* request_region */ 35#include <linux/ioport.h> /* request_region */
@@ -46,6 +45,7 @@
46MODULE_AUTHOR("Fred Gleason, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath"); 45MODULE_AUTHOR("Fred Gleason, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");
47MODULE_DESCRIPTION("A driver for the ADS Cadet AM/FM/RDS radio card."); 46MODULE_DESCRIPTION("A driver for the ADS Cadet AM/FM/RDS radio card.");
48MODULE_LICENSE("GPL"); 47MODULE_LICENSE("GPL");
48MODULE_VERSION("0.3.4");
49 49
50static int io = -1; /* default to isapnp activation */ 50static int io = -1; /* default to isapnp activation */
51static int radio_nr = -1; 51static int radio_nr = -1;
@@ -54,8 +54,6 @@ module_param(io, int, 0);
54MODULE_PARM_DESC(io, "I/O address of Cadet card (0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e)"); 54MODULE_PARM_DESC(io, "I/O address of Cadet card (0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e)");
55module_param(radio_nr, int, 0); 55module_param(radio_nr, int, 0);
56 56
57#define CADET_VERSION KERNEL_VERSION(0, 3, 3)
58
59#define RDS_BUFFER 256 57#define RDS_BUFFER 256
60#define RDS_RX_FLAG 1 58#define RDS_RX_FLAG 1
61#define MBS_RX_FLAG 2 59#define MBS_RX_FLAG 2
@@ -361,7 +359,6 @@ static int vidioc_querycap(struct file *file, void *priv,
361 strlcpy(v->driver, "ADS Cadet", sizeof(v->driver)); 359 strlcpy(v->driver, "ADS Cadet", sizeof(v->driver));
362 strlcpy(v->card, "ADS Cadet", sizeof(v->card)); 360 strlcpy(v->card, "ADS Cadet", sizeof(v->card));
363 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 361 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
364 v->version = CADET_VERSION;
365 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO | 362 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO |
366 V4L2_CAP_READWRITE | V4L2_CAP_RDS_CAPTURE; 363 V4L2_CAP_READWRITE | V4L2_CAP_RDS_CAPTURE;
367 return 0; 364 return 0;