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

Commit 7e4c54a2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] remove ioctl32_handler_t 



Some architectures define and use this type in their compat_ioctl code, but
all of them can easily use the identical ioctl_trans_handler_t type that is
defined in common code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7a81e316

arch/ia64/ia32/ia32_ioctl.c

+1 −3
Original line number Diff line number Diff line
@@ -29,10 +29,8 @@ 
#define CODE

#include "compat_ioctl.c"



typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);



#define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl32_handler_t)(handler), NULL },

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl_trans_handler_t)(handler), NULL },

#define IOCTL_TABLE_START \

	struct ioctl_trans ioctl_start[] = {

#define IOCTL_TABLE_END \

arch/mips/kernel/ioctl32.c

+1 −3
Original line number Diff line number Diff line
@@ -26,10 +26,8 @@ long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg); 
#define CODE

#include "compat_ioctl.c"



typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);



#define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl32_handler_t)(handler), NULL },

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl_trans_handler_t)(handler), NULL },

#define IOCTL_TABLE_START \

	struct ioctl_trans ioctl_start[] = {

#define IOCTL_TABLE_END \

arch/sparc64/kernel/ioctl32.c

+1 −3
Original line number Diff line number Diff line
@@ -92,10 +92,8 @@ static int fbiogscursor(unsigned int fd, unsigned int cmd, unsigned long arg) 
	return sys_ioctl (fd, FBIOSCURSOR, (unsigned long)p);

}



typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);



#define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl32_handler_t)(handler), NULL },

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl_trans_handler_t)(handler), NULL },

#define IOCTL_TABLE_START \

	struct ioctl_trans ioctl_start[] = {

#define IOCTL_TABLE_END \