diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-23 03:49:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:53 -0400 |
commit | 3ca685aae04960eaa8b2c97baf384996c20cf9ac (patch) | |
tree | a4d99449643380c62b11a05d93f81b6b8a2f82d7 /drivers/media/radio/radio-maxiradio.c | |
parent | 3b5df8ea40ac533c62b8e5f9f173d985665fc752 (diff) |
V4L/DVB (8776): radio: replace video_exclusive_open/release
Move the video_exclusive_open/release functionality into the driver itself.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/radio-maxiradio.c')
-rw-r--r-- | drivers/media/radio/radio-maxiradio.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index 0cc6fcb041fd..263ef8b02fd8 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c | |||
@@ -85,6 +85,7 @@ static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16 ; | |||
85 | static int radio_nr = -1; | 85 | static int radio_nr = -1; |
86 | module_param(radio_nr, int, 0); | 86 | module_param(radio_nr, int, 0); |
87 | 87 | ||
88 | static unsigned long in_use; | ||
88 | 89 | ||
89 | #define FREQ_LO 50*16000 | 90 | #define FREQ_LO 50*16000 |
90 | #define FREQ_HI 150*16000 | 91 | #define FREQ_HI 150*16000 |
@@ -99,10 +100,21 @@ module_param(radio_nr, int, 0); | |||
99 | #define BITS2FREQ(x) ((x) * FREQ_STEP - FREQ_IF) | 100 | #define BITS2FREQ(x) ((x) * FREQ_STEP - FREQ_IF) |
100 | 101 | ||
101 | 102 | ||
103 | static int maxiradio_exclusive_open(struct inode *inode, struct file *file) | ||
104 | { | ||
105 | return test_and_set_bit(0, &in_use) ? -EBUSY : 0; | ||
106 | } | ||
107 | |||
108 | static int maxiradio_exclusive_release(struct inode *inode, struct file *file) | ||
109 | { | ||
110 | clear_bit(0, &in_use); | ||
111 | return 0; | ||
112 | } | ||
113 | |||
102 | static const struct file_operations maxiradio_fops = { | 114 | static const struct file_operations maxiradio_fops = { |
103 | .owner = THIS_MODULE, | 115 | .owner = THIS_MODULE, |
104 | .open = video_exclusive_open, | 116 | .open = maxiradio_exclusive_open, |
105 | .release = video_exclusive_release, | 117 | .release = maxiradio_exclusive_release, |
106 | .ioctl = video_ioctl2, | 118 | .ioctl = video_ioctl2, |
107 | #ifdef CONFIG_COMPAT | 119 | #ifdef CONFIG_COMPAT |
108 | .compat_ioctl = v4l_compat_ioctl32, | 120 | .compat_ioctl = v4l_compat_ioctl32, |