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

Commit 371e8c25 authored by Brian Gerst's avatar Brian Gerst Committed by Linus Torvalds
Browse files

[PATCH] Remove orphaned TIOCGDEV compat ioctl 



This ioctl doesn't exist for native i386.

Signed-off-by: default avatarBrian Gerst <bgerst@didntduck.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 381be254

arch/x86_64/ia32/ia32_ioctl.c

+0 −29
Original line number Original line Diff line number Diff line
@@ -17,34 +17,6 @@ 
#define CODE

#define CODE

#include "compat_ioctl.c"

#include "compat_ioctl.c"

  

  

#ifndef TIOCGDEV

#define TIOCGDEV       _IOR('T',0x32, unsigned int)

#endif

static int tiocgdev(unsigned fd, unsigned cmd,  unsigned int __user *ptr) 

{ 



	struct file *file;

	struct tty_struct *real_tty;

	int fput_needed, ret;



	file = fget_light(fd, &fput_needed);

	if (!file)

		return -EBADF;



	ret = -EINVAL;

	if (file->f_op->ioctl != tty_ioctl)

		goto out;

	real_tty = (struct tty_struct *)file->private_data;

	if (!real_tty) 	

		goto out;



	ret = put_user(new_encode_dev(tty_devnum(real_tty)), ptr); 



out:

	fput_light(file, fput_needed);

	return ret;

} 



#define RTC_IRQP_READ32	_IOR('p', 0x0b, unsigned int)	 /* Read IRQ rate   */

#define RTC_IRQP_READ32	_IOR('p', 0x0b, unsigned int)	 /* Read IRQ rate   */

#define RTC_IRQP_SET32	_IOW('p', 0x0c, unsigned int)	 /* Set IRQ rate    */

#define RTC_IRQP_SET32	_IOW('p', 0x0c, unsigned int)	 /* Set IRQ rate    */

#define RTC_EPOCH_READ32	_IOR('p', 0x0d, unsigned)	 /* Read epoch      */

#define RTC_EPOCH_READ32	_IOR('p', 0x0d, unsigned)	 /* Read epoch      */
@@ -100,7 +72,6 @@ COMPATIBLE_IOCTL(0x4B51) /* KDSHWCLK - not in the kernel, but don't complain * 
COMPATIBLE_IOCTL(FIOQSIZE)

COMPATIBLE_IOCTL(FIOQSIZE)





/* And these ioctls need translation */

/* And these ioctls need translation */

HANDLE_IOCTL(TIOCGDEV, tiocgdev)

/* realtime device */

/* realtime device */

HANDLE_IOCTL(RTC_IRQP_READ,  rtc32_ioctl)

HANDLE_IOCTL(RTC_IRQP_READ,  rtc32_ioctl)

HANDLE_IOCTL(RTC_IRQP_READ32,rtc32_ioctl)

HANDLE_IOCTL(RTC_IRQP_READ32,rtc32_ioctl)