aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-09-26 07:20:13 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:14 -0400
commitc29fcff3daafbf46d64a543c1950bbd206ad8c1c (patch)
treecd57a91e596b5529a88d6fa45bad461b89d80c0d
parentd69f27186c16008540166c8017e9d4db2b477588 (diff)
V4L/DVB: v4l2-dev: remove get_unmapped_area
The get_unmapped_area file operation is unused. Remove. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/v4l2-dev.c18
-rw-r--r--include/media/v4l2-dev.h2
2 files changed, 0 insertions, 20 deletions
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index f069c61cdf68..5a54eabd4c42 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -236,23 +236,6 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
236 return ret; 236 return ret;
237} 237}
238 238
239#ifdef CONFIG_MMU
240#define v4l2_get_unmapped_area NULL
241#else
242static unsigned long v4l2_get_unmapped_area(struct file *filp,
243 unsigned long addr, unsigned long len, unsigned long pgoff,
244 unsigned long flags)
245{
246 struct video_device *vdev = video_devdata(filp);
247
248 if (!vdev->fops->get_unmapped_area)
249 return -ENOSYS;
250 if (!video_is_registered(vdev))
251 return -ENODEV;
252 return vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
253}
254#endif
255
256static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm) 239static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
257{ 240{
258 struct video_device *vdev = video_devdata(filp); 241 struct video_device *vdev = video_devdata(filp);
@@ -309,7 +292,6 @@ static const struct file_operations v4l2_fops = {
309 .read = v4l2_read, 292 .read = v4l2_read,
310 .write = v4l2_write, 293 .write = v4l2_write,
311 .open = v4l2_open, 294 .open = v4l2_open,
312 .get_unmapped_area = v4l2_get_unmapped_area,
313 .mmap = v4l2_mmap, 295 .mmap = v4l2_mmap,
314 .unlocked_ioctl = v4l2_ioctl, 296 .unlocked_ioctl = v4l2_ioctl,
315#ifdef CONFIG_COMPAT 297#ifdef CONFIG_COMPAT
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 8ad4f9f93fe2..ba236ff35c8a 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -41,8 +41,6 @@ struct v4l2_file_operations {
41 unsigned int (*poll) (struct file *, struct poll_table_struct *); 41 unsigned int (*poll) (struct file *, struct poll_table_struct *);
42 long (*ioctl) (struct file *, unsigned int, unsigned long); 42 long (*ioctl) (struct file *, unsigned int, unsigned long);
43 long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); 43 long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
44 unsigned long (*get_unmapped_area) (struct file *, unsigned long,
45 unsigned long, unsigned long, unsigned long);
46 int (*mmap) (struct file *, struct vm_area_struct *); 44 int (*mmap) (struct file *, struct vm_area_struct *);
47 int (*open) (struct file *); 45 int (*open) (struct file *);
48 int (*release) (struct file *); 46 int (*release) (struct file *);