redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

V4L/DVB (10139): v4l: rename v4l_compat_ioctl32 to v4l2_compat_ioctl32 

This rename prevents conflicts with the older compat_ioctl32 module.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
wifi-calibration
Hans Verkuil 2008-12-30 06:42:40 -03:00 committed by Mauro Carvalho Chehab
parent 069b747931
commit 9bb7cde793
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/v4l2-compat-ioctl32.c
View File

@ -937,7 +937,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
return err;
}
long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
{
long ret = -ENOIOCTLCMD;
@ -1072,7 +1072,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
}
return ret;
}
EXPORT_SYMBOL_GPL(v4l_compat_ioctl32);
EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32);
#endif
MODULE_LICENSE("GPL");

4
drivers/media/video/v4l2-dev.c
View File

@ -253,7 +253,7 @@ static const struct file_operations v4l2_unlocked_fops = {
.mmap = v4l2_mmap,
.unlocked_ioctl = v4l2_unlocked_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = v4l_compat_ioctl32,
.compat_ioctl = v4l2_compat_ioctl32,
#endif
.release = v4l2_release,
.poll = v4l2_poll,
@ -268,7 +268,7 @@ static const struct file_operations v4l2_fops = {
.mmap = v4l2_mmap,
.ioctl = v4l2_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = v4l_compat_ioctl32,
.compat_ioctl = v4l2_compat_ioctl32,
#endif
.release = v4l2_release,
.poll = v4l2_poll,

2
include/media/v4l2-ioctl.h
View File

@ -288,7 +288,7 @@ long v4l_compat_translate_ioctl(struct file *file,
#ifdef CONFIG_COMPAT
/* 32 Bits compatibility layer for 64 bits processors */
extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,
extern long v4l2_compat_ioctl32(struct file *file, unsigned int cmd,
unsigned long arg);
#endif