diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-03-22 04:09:07 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:51:30 -0400 |
commit | 467422678e9e73bff8d175024cdd89ed48483697 (patch) | |
tree | af04b378ac481098641786f16d7e9e490bcd89fc /drivers/media/video/pms.c | |
parent | b3e212dcbddb10b44d472a5f4c23d5aa0b5876ca (diff) |
V4L/DVB: pms: remove unnecessary exclusive open/close
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pms.c')
-rw-r--r-- | drivers/media/video/pms.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index 0598bbd3f368..7129b50757db 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c | |||
@@ -61,7 +61,6 @@ struct pms { | |||
61 | int depth; | 61 | int depth; |
62 | int input; | 62 | int input; |
63 | s32 brightness, saturation, hue, contrast; | 63 | s32 brightness, saturation, hue, contrast; |
64 | unsigned long in_use; | ||
65 | struct mutex lock; | 64 | struct mutex lock; |
66 | int i2c_count; | 65 | int i2c_count; |
67 | struct i2c_info i2cinfo[64]; | 66 | struct i2c_info i2cinfo[64]; |
@@ -931,25 +930,8 @@ static ssize_t pms_read(struct file *file, char __user *buf, | |||
931 | return len; | 930 | return len; |
932 | } | 931 | } |
933 | 932 | ||
934 | static int pms_exclusive_open(struct file *file) | ||
935 | { | ||
936 | struct pms *dev = video_drvdata(file); | ||
937 | |||
938 | return test_and_set_bit(0, &dev->in_use) ? -EBUSY : 0; | ||
939 | } | ||
940 | |||
941 | static int pms_exclusive_release(struct file *file) | ||
942 | { | ||
943 | struct pms *dev = video_drvdata(file); | ||
944 | |||
945 | clear_bit(0, &dev->in_use); | ||
946 | return 0; | ||
947 | } | ||
948 | |||
949 | static const struct v4l2_file_operations pms_fops = { | 933 | static const struct v4l2_file_operations pms_fops = { |
950 | .owner = THIS_MODULE, | 934 | .owner = THIS_MODULE, |
951 | .open = pms_exclusive_open, | ||
952 | .release = pms_exclusive_release, | ||
953 | .ioctl = video_ioctl2, | 935 | .ioctl = video_ioctl2, |
954 | .read = pms_read, | 936 | .read = pms_read, |
955 | }; | 937 | }; |