Commit 0ba9841a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

compat_ioctl: move ATYFB_CLK handling to atyfb driver 



These are two obscure ioctl commands, in a driver that only
has compatible commands, so just let the driver handle this
itself.

Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 1207045d

drivers/video/fbdev/aty/atyfb_base.c

+11 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 


******************************************************************************/





#include <linux/compat.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/kernel.h>
@@ -235,6 +235,13 @@ static int atyfb_pan_display(struct fb_var_screeninfo *var, 
			     struct fb_info *info);

static int atyfb_blank(int blank, struct fb_info *info);

static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg);

#ifdef CONFIG_COMPAT

static int atyfb_compat_ioctl(struct fb_info *info, u_int cmd, u_long arg)

{

	return atyfb_ioctl(info, cmd, (u_long)compat_ptr(arg));

}

#endif



#ifdef __sparc__

static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma);

#endif
@@ -290,6 +297,9 @@ static struct fb_ops atyfb_ops = { 
	.fb_pan_display	= atyfb_pan_display,

	.fb_blank	= atyfb_blank,

	.fb_ioctl	= atyfb_ioctl,

#ifdef CONFIG_COMPAT

	.fb_compat_ioctl = atyfb_compat_ioctl,

#endif

	.fb_fillrect	= atyfb_fillrect,

	.fb_copyarea	= atyfb_copyarea,

	.fb_imageblit	= atyfb_imageblit,

fs/compat_ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -696,8 +696,6 @@ COMPATIBLE_IOCTL(CAPI_CLR_FLAGS) 
COMPATIBLE_IOCTL(CAPI_NCCI_OPENCOUNT)

COMPATIBLE_IOCTL(CAPI_NCCI_GETUNIT)

/* Misc. */

COMPATIBLE_IOCTL(0x41545900)		/* ATYIO_CLKR */

COMPATIBLE_IOCTL(0x41545901)		/* ATYIO_CLKW */

COMPATIBLE_IOCTL(PCIIOC_CONTROLLER)

COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO)

COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_MEM)

CRA Git | Maintained and supported by SUSTech CRA and CCSE