Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb7cde7 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 069b7479

drivers/media/video/v4l2-compat-ioctl32.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -937,7 +937,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar 
	return err;

	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;

	long ret = -ENOIOCTLCMD;
@@ -1072,7 +1072,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) 
	}

	}

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(v4l_compat_ioctl32);

EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32);

#endif

#endif





MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

drivers/media/video/v4l2-dev.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -253,7 +253,7 @@ static const struct file_operations v4l2_unlocked_fops = { 
	.mmap = v4l2_mmap,

	.mmap = v4l2_mmap,

	.unlocked_ioctl = v4l2_unlocked_ioctl,

	.unlocked_ioctl = v4l2_unlocked_ioctl,

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	.compat_ioctl = v4l_compat_ioctl32,

	.compat_ioctl = v4l2_compat_ioctl32,

#endif

#endif

	.release = v4l2_release,

	.release = v4l2_release,

	.poll = v4l2_poll,

	.poll = v4l2_poll,
@@ -268,7 +268,7 @@ static const struct file_operations v4l2_fops = { 
	.mmap = v4l2_mmap,

	.mmap = v4l2_mmap,

	.ioctl = v4l2_ioctl,

	.ioctl = v4l2_ioctl,

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	.compat_ioctl = v4l_compat_ioctl32,

	.compat_ioctl = v4l2_compat_ioctl32,

#endif

#endif

	.release = v4l2_release,

	.release = v4l2_release,

	.poll = v4l2_poll,

	.poll = v4l2_poll,

include/media/v4l2-ioctl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -288,7 +288,7 @@ long v4l_compat_translate_ioctl(struct file *file, 




#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

/* 32 Bits compatibility layer for 64 bits processors */

/* 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);

				unsigned long arg);

#endif

#endif