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>

diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index 28861e4910f33b4e117279b33bd89f57e82144fb..ec81b9737bd75e8cad62974534e2eb9d186a8dda 100644 (file)
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -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");

diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 000013448b6025ff2309c2415c1cd787fb26b194..13f87c22e78dce1721bb10c464409786df685c2c 100644 (file)
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -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,

diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 172c39678c5af7ff9fc9239a2f2da43eeb765805..bf0e723a99c14f69e0715217be5cba2f6b351ceb 100644 (file)
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -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