git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Staging: w35und: inline DRIVER_AUTHOR and DRIVER_DESC macros
[safe/jmp/linux-2.6]
/
drivers
/
media
/
radio
/
radio-cadet.c
diff --git
a/drivers/media/radio/radio-cadet.c
b/drivers/media/radio/radio-cadet.c
index
6166e72
..
cb3075a
100644
(file)
--- a/
drivers/media/radio/radio-cadet.c
+++ b/
drivers/media/radio/radio-cadet.c
@@
-23,7
+23,7
@@
* 2002-01-17 Adam Belay <ambx1@neo.rr.com>
* Updated to latest pnp code
*
* 2002-01-17 Adam Belay <ambx1@neo.rr.com>
* Updated to latest pnp code
*
- * 2003-01-31 Alan Cox <alan@
redhat.com
>
+ * 2003-01-31 Alan Cox <alan@
lxorguk.ukuu.org.uk
>
* Cleaned up locking, delay code, general odds and ends
*
* 2006-07-30 Hans J. Koch <koch@hjk-az.de>
* Cleaned up locking, delay code, general odds and ends
*
* 2006-07-30 Hans J. Koch <koch@hjk-az.de>
@@
-529,7
+529,7
@@
static int vidioc_s_audio(struct file *file, void *priv,
}
static int
}
static int
-cadet_open(struct
inode *inode, struct
file *file)
+cadet_open(struct file *file)
{
users++;
if (1 == users) init_waitqueue_head(&read_queue);
{
users++;
if (1 == users) init_waitqueue_head(&read_queue);
@@
-537,7
+537,7
@@
cadet_open(struct inode *inode, struct file *file)
}
static int
}
static int
-cadet_release(struct
inode *inode, struct
file *file)
+cadet_release(struct file *file)
{
users--;
if (0 == users){
{
users--;
if (0 == users){
@@
-557,17
+557,13
@@
cadet_poll(struct file *file, struct poll_table_struct *wait)
}
}
-static const struct file_operations cadet_fops = {
+static const struct
v4l2_
file_operations cadet_fops = {
.owner = THIS_MODULE,
.open = cadet_open,
.release = cadet_release,
.read = cadet_read,
.ioctl = video_ioctl2,
.poll = cadet_poll,
.owner = THIS_MODULE,
.open = cadet_open,
.release = cadet_release,
.read = cadet_read,
.ioctl = video_ioctl2,
.poll = cadet_poll,
-#ifdef CONFIG_COMPAT
- .compat_ioctl = v4l_compat_ioctl32,
-#endif
- .llseek = no_llseek,
};
static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
};
static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
@@
-589,6
+585,7
@@
static struct video_device cadet_radio = {
.name = "Cadet radio",
.fops = &cadet_fops,
.ioctl_ops = &cadet_ioctl_ops,
.name = "Cadet radio",
.fops = &cadet_fops,
.ioctl_ops = &cadet_ioctl_ops,
+ .release = video_device_release_empty,
};
#ifdef CONFIG_PNP
};
#ifdef CONFIG_PNP
@@
-682,7
+679,7
@@
static int __init cadet_init(void)
}
if (!request_region(io,2,"cadet"))
goto fail;
}
if (!request_region(io,2,"cadet"))
goto fail;
- if
(video_register_device(&cadet_radio,VFL_TYPE_RADIO,radio_nr)==-1
) {
+ if
(video_register_device(&cadet_radio, VFL_TYPE_RADIO, radio_nr) < 0
) {
release_region(io,2);
goto fail;
}
release_region(io,2);
goto fail;
}