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

Commit b31023fc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

[SPARC] openprom: implement ->compat_ioctl 



implement a compat_ioctl handle in the driver instead of having table
entries in sparc64 ioctl32.c (I plan to get rid of the arch ioctl32.c
file eventually)

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1928f8e5

arch/sparc64/kernel/ioctl32.c

+0 −18
Original line number Diff line number Diff line
@@ -477,24 +477,6 @@ COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */ 
/* COMPATIBLE_IOCTL(D7SIOCRD) same value as ENVCTRL_RD_VOLTAGE_STATUS */

COMPATIBLE_IOCTL(D7SIOCWR)

COMPATIBLE_IOCTL(D7SIOCTM)

/* OPENPROMIO, SunOS/Solaris only, the NetBSD one's have

 * embedded pointers in the arg which we'd need to clean up...

 */

COMPATIBLE_IOCTL(OPROMGETOPT)

COMPATIBLE_IOCTL(OPROMSETOPT)

COMPATIBLE_IOCTL(OPROMNXTOPT)

COMPATIBLE_IOCTL(OPROMSETOPT2)

COMPATIBLE_IOCTL(OPROMNEXT)

COMPATIBLE_IOCTL(OPROMCHILD)

COMPATIBLE_IOCTL(OPROMGETPROP)

COMPATIBLE_IOCTL(OPROMNXTPROP)

COMPATIBLE_IOCTL(OPROMU2P)

COMPATIBLE_IOCTL(OPROMGETCONS)

COMPATIBLE_IOCTL(OPROMGETFBNAME)

COMPATIBLE_IOCTL(OPROMGETBOOTARGS)

COMPATIBLE_IOCTL(OPROMSETCUR)

COMPATIBLE_IOCTL(OPROMPCI2NODE)

COMPATIBLE_IOCTL(OPROMPATH2NODE)

/* Big A */

#if defined(CONFIG_DRM) || defined(CONFIG_DRM_MODULE)

COMPATIBLE_IOCTL(DRM_IOCTL_GET_MAGIC)

drivers/sbus/char/openprom.c

+33 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/miscdevice.h>

#include <linux/smp_lock.h>

#include <linux/init.h>

#include <linux/fs.h>

#include <asm/oplib.h>
@@ -565,6 +566,38 @@ static int openprom_ioctl(struct inode * inode, struct file * file, 
	}

}



static long openprom_compat_ioctl(struct file *file, unsigned int cmd,

		unsigned long arg)

{

	long rval = -ENOTTY;



	/*

	 * SunOS/Solaris only, the NetBSD one's have embedded pointers in

	 * the arg which we'd need to clean up...

	 */

	switch (cmd) {

	case OPROMGETOPT:

	case OPROMSETOPT:

	case OPROMNXTOPT:

	case OPROMSETOPT2:

	case OPROMNEXT:

	case OPROMCHILD:

	case OPROMGETPROP:

	case OPROMNXTPROP:

	case OPROMU2P:

	case OPROMGETCONS:

	case OPROMGETFBNAME:

	case OPROMGETBOOTARGS:

	case OPROMSETCUR:

	case OPROMPCI2NODE:

	case OPROMPATH2NODE:

		lock_kernel();

		rval = openprom_ioctl(file->f_dentry->d_inode, file, cmd, arg);

		lock_kernel();

		break;

	}

}



static int openprom_open(struct inode * inode, struct file * file)

{

	DATA *data;