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-typhoon.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-typhoon.c')
-rw-r--r-- | drivers/media/radio/radio-typhoon.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c index 8dbbf08f2207..398726abc0c8 100644 --- a/drivers/media/radio/radio-typhoon.c +++ b/drivers/media/radio/radio-typhoon.c | |||
@@ -31,15 +31,17 @@ | |||
31 | #include <linux/module.h> /* Modules */ | 31 | #include <linux/module.h> /* Modules */ |
32 | #include <linux/init.h> /* Initdata */ | 32 | #include <linux/init.h> /* Initdata */ |
33 | #include <linux/ioport.h> /* request_region */ | 33 | #include <linux/ioport.h> /* request_region */ |
34 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | ||
35 | #include <linux/videodev2.h> /* kernel radio structs */ | 34 | #include <linux/videodev2.h> /* kernel radio structs */ |
36 | #include <linux/io.h> /* outb, outb_p */ | 35 | #include <linux/io.h> /* outb, outb_p */ |
37 | #include <media/v4l2-device.h> | 36 | #include <media/v4l2-device.h> |
38 | #include <media/v4l2-ioctl.h> | 37 | #include <media/v4l2-ioctl.h> |
39 | 38 | ||
39 | #define DRIVER_VERSION "0.1.2" | ||
40 | |||
40 | MODULE_AUTHOR("Dr. Henrik Seidel"); | 41 | MODULE_AUTHOR("Dr. Henrik Seidel"); |
41 | MODULE_DESCRIPTION("A driver for the Typhoon radio card (a.k.a. EcoRadio)."); | 42 | MODULE_DESCRIPTION("A driver for the Typhoon radio card (a.k.a. EcoRadio)."); |
42 | MODULE_LICENSE("GPL"); | 43 | MODULE_LICENSE("GPL"); |
44 | MODULE_VERSION(DRIVER_VERSION); | ||
43 | 45 | ||
44 | #ifndef CONFIG_RADIO_TYPHOON_PORT | 46 | #ifndef CONFIG_RADIO_TYPHOON_PORT |
45 | #define CONFIG_RADIO_TYPHOON_PORT -1 | 47 | #define CONFIG_RADIO_TYPHOON_PORT -1 |
@@ -61,9 +63,7 @@ static unsigned long mutefreq = CONFIG_RADIO_TYPHOON_MUTEFREQ; | |||
61 | module_param(mutefreq, ulong, 0); | 63 | module_param(mutefreq, ulong, 0); |
62 | MODULE_PARM_DESC(mutefreq, "Frequency used when muting the card (in kHz)"); | 64 | MODULE_PARM_DESC(mutefreq, "Frequency used when muting the card (in kHz)"); |
63 | 65 | ||
64 | #define RADIO_VERSION KERNEL_VERSION(0, 1, 1) | 66 | #define BANNER "Typhoon Radio Card driver v" DRIVER_VERSION "\n" |
65 | |||
66 | #define BANNER "Typhoon Radio Card driver v0.1.1\n" | ||
67 | 67 | ||
68 | struct typhoon { | 68 | struct typhoon { |
69 | struct v4l2_device v4l2_dev; | 69 | struct v4l2_device v4l2_dev; |
@@ -171,7 +171,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
171 | strlcpy(v->driver, "radio-typhoon", sizeof(v->driver)); | 171 | strlcpy(v->driver, "radio-typhoon", sizeof(v->driver)); |
172 | strlcpy(v->card, "Typhoon Radio", sizeof(v->card)); | 172 | strlcpy(v->card, "Typhoon Radio", sizeof(v->card)); |
173 | strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); | 173 | strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); |
174 | v->version = RADIO_VERSION; | ||
175 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; | 174 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; |
176 | return 0; | 175 | return 0; |
177 | } | 176 | } |