projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
radio
/
radio-sf16fmr2.c
diff --git
a/drivers/media/radio/radio-sf16fmr2.c
b/drivers/media/radio/radio-sf16fmr2.c
index b1f47c322e02637e58b2117a3c7df2e51656dd76..92f17a347fa73baf2fa12fe7524d2cacd9dbd6a7 100644
(file)
--- a/
drivers/media/radio/radio-sf16fmr2.c
+++ b/
drivers/media/radio/radio-sf16fmr2.c
@@
-396,26
+396,22
@@
static int vidioc_s_audio(struct file *file, void *priv,
static struct fmr2_device fmr2_unit;
static struct fmr2_device fmr2_unit;
-static int fmr2_exclusive_open(struct
inode *inode, struct
file *file)
+static int fmr2_exclusive_open(struct file *file)
{
return test_and_set_bit(0, &fmr2_unit.in_use) ? -EBUSY : 0;
}
{
return test_and_set_bit(0, &fmr2_unit.in_use) ? -EBUSY : 0;
}
-static int fmr2_exclusive_release(struct
inode *inode, struct
file *file)
+static int fmr2_exclusive_release(struct file *file)
{
clear_bit(0, &fmr2_unit.in_use);
return 0;
}
{
clear_bit(0, &fmr2_unit.in_use);
return 0;
}
-static const struct file_operations fmr2_fops = {
+static const struct
v4l2_
file_operations fmr2_fops = {
.owner = THIS_MODULE,
.open = fmr2_exclusive_open,
.release = fmr2_exclusive_release,
.ioctl = video_ioctl2,
.owner = THIS_MODULE,
.open = fmr2_exclusive_open,
.release = fmr2_exclusive_release,
.ioctl = video_ioctl2,
-#ifdef CONFIG_COMPAT
- .compat_ioctl = v4l_compat_ioctl32,
-#endif
- .llseek = no_llseek,
};
static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {
};
static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {