Commit b4c650f1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: remove compat_ioctl32 code 



This is one of the last remaining users of compat_alloc_user_space()
and copy_in_user(), which are in the process of getting removed.

As of commit 57e6b6f2 ("media: atomisp_fops.c: disable
atomisp_compat_ioctl32"), nothing in this file is actually getting used
as the only reference has been stubbed out.

Remove the entire file -- anyone willing to restore the functionality
can equally well just look up the contents in the git history if needed.

Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 8162f78d

drivers/staging/media/atomisp/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ atomisp-objs += \ 
	pci/atomisp_acc.o \

	pci/atomisp_cmd.o \

	pci/atomisp_compat_css20.o \

	pci/atomisp_compat_ioctl32.o \

	pci/atomisp_csi2.o \

	pci/atomisp_drvfs.o \

	pci/atomisp_file.o \

drivers/staging/media/atomisp/TODO

+5 −0
Original line number Diff line number Diff line
@@ -120,6 +120,11 @@ TODO 
    for this driver until the other work is done, as there will be a lot

    of code churn until this driver becomes functional again.



16. Fix private ioctls to not need a compat_ioctl handler for running

    32-bit tasks. The compat code has been removed because of bugs,

    and should not be needed for modern drivers. Fixing this properly

    unfortunately means an incompatible ABI change.



Limitations

===========

drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c

deleted100644 → 0
+0 −1202

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/atomisp/pci/atomisp_fops.c

+3 −5
Original line number Diff line number Diff line
@@ -1283,7 +1283,8 @@ const struct v4l2_file_operations atomisp_fops = { 
	.unlocked_ioctl = video_ioctl2,

#ifdef CONFIG_COMPAT

	/*

	 * There are problems with this code. Disable this for now.

	 * this was removed because of bugs, the interface

	 * needs to be made safe for compat tasks instead.

	.compat_ioctl32 = atomisp_compat_ioctl32,

	 */

#endif
@@ -1297,10 +1298,7 @@ const struct v4l2_file_operations atomisp_file_fops = { 
	.mmap = atomisp_file_mmap,

	.unlocked_ioctl = video_ioctl2,

#ifdef CONFIG_COMPAT

	/*

	 * There are problems with this code. Disable this for now.

	.compat_ioctl32 = atomisp_compat_ioctl32,

	 */

	/* .compat_ioctl32 = atomisp_compat_ioctl32, */

#endif

	.poll = atomisp_poll,

};