Commit 3f6195d1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Sam Ravnborg
Browse files

fbdev: sbuslib: remove unused FBIOSCURSOR32 helper 



No driver implements FBIOSCURSOR, so this function has no purpose
and can be removed. Apparently it was added in linux-2.1.44 to handle
compatibility for drivers/sbus/char/sunfb.c but lost its purpose when
that driver got rewritten in linux-2.5.63.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200918100926.1447563-2-arnd@arndb.de
parent 06f42774

drivers/video/fbdev/sbuslib.c

+1 −28
Original line number Diff line number Diff line
@@ -214,32 +214,6 @@ static int fbiogetputcmap(struct fb_info *info, unsigned int cmd, unsigned long 
			(unsigned long)p);

}



static int fbiogscursor(struct fb_info *info, unsigned long arg)

{

	struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p));

	struct fbcursor32 __user *argp =  (void __user *)arg;

	compat_uptr_t addr;

	int ret;



	ret = copy_in_user(p, argp,

			      2 * sizeof (short) + 2 * sizeof(struct fbcurpos));

	ret |= copy_in_user(&p->size, &argp->size, sizeof(struct fbcurpos));

	ret |= copy_in_user(&p->cmap, &argp->cmap, 2 * sizeof(int));

	ret |= get_user(addr, &argp->cmap.red);

	ret |= put_user(compat_ptr(addr), &p->cmap.red);

	ret |= get_user(addr, &argp->cmap.green);

	ret |= put_user(compat_ptr(addr), &p->cmap.green);

	ret |= get_user(addr, &argp->cmap.blue);

	ret |= put_user(compat_ptr(addr), &p->cmap.blue);

	ret |= get_user(addr, &argp->mask);

	ret |= put_user(compat_ptr(addr), &p->mask);

	ret |= get_user(addr, &argp->image);

	ret |= put_user(compat_ptr(addr), &p->image);

	if (ret)

		return -EFAULT;

	return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p);

}



int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)

{

	switch (cmd) {
@@ -248,6 +222,7 @@ int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar 
	case FBIOGATTR:

	case FBIOSVIDEO:

	case FBIOGVIDEO:

	case FBIOSCURSOR32:

	case FBIOGCURSOR32:	/* This is not implemented yet.

				   Later it should be converted... */

	case FBIOSCURPOS:
@@ -258,8 +233,6 @@ int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar 
		return fbiogetputcmap(info, cmd, arg);

	case FBIOGETCMAP32:

		return fbiogetputcmap(info, cmd, arg);

	case FBIOSCURSOR32:

		return fbiogscursor(info, arg);

	default:

		return -ENOIOCTLCMD;

	}