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

Commit 6caa76b7 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

tty: now phase out the ioctl file pointer for good 



Only oddities here are a couple of drivers that bogusly called the ldisc
helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes
away.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 00a0d0d6

drivers/char/amiserial.c

+1 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ static int rs_get_icount(struct tty_struct *tty, 
	return 0;

}



static int rs_ioctl(struct tty_struct *tty, struct file * file,

static int rs_ioctl(struct tty_struct *tty,

		    unsigned int cmd, unsigned long arg)

{

	struct async_struct * info = tty->driver_data;

drivers/char/cyclades.c

+1 −1
Original line number Diff line number Diff line
@@ -2680,7 +2680,7 @@ static int cy_cflags_changed(struct cyclades_port *info, unsigned long arg, 
 * not recognized by the driver, it should return ENOIOCTLCMD.

 */

static int

cy_ioctl(struct tty_struct *tty, struct file *file,

cy_ioctl(struct tty_struct *tty,

	 unsigned int cmd, unsigned long arg)

{

	struct cyclades_port *info = tty->driver_data;

drivers/char/epca.c

+4 −4
Original line number Diff line number Diff line
@@ -175,9 +175,9 @@ static unsigned termios2digi_i(struct channel *ch, unsigned); 
static unsigned termios2digi_c(struct channel *ch, unsigned);

static void epcaparam(struct tty_struct *, struct channel *);

static void receive_data(struct channel *, struct tty_struct *tty);

static int pc_ioctl(struct tty_struct *, struct file *,

static int pc_ioctl(struct tty_struct *,

			unsigned int, unsigned long);

static int info_ioctl(struct tty_struct *, struct file *,

static int info_ioctl(struct tty_struct *,

			unsigned int, unsigned long);

static void pc_set_termios(struct tty_struct *, struct ktermios *);

static void do_softint(struct work_struct *work);
@@ -1919,7 +1919,7 @@ static void receive_data(struct channel *ch, struct tty_struct *tty) 
	tty_schedule_flip(tty);

}



static int info_ioctl(struct tty_struct *tty, struct file *file,

static int info_ioctl(struct tty_struct *tty,

		    unsigned int cmd, unsigned long arg)

{

	switch (cmd) {
@@ -2057,7 +2057,7 @@ static int pc_tiocmset(struct tty_struct *tty, 
	return 0;

}



static int pc_ioctl(struct tty_struct *tty, struct file *file,

static int pc_ioctl(struct tty_struct *tty,

					unsigned int cmd, unsigned long arg)

{

	digiflow_t dflow;

drivers/char/ip2/ip2main.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void ip2_flush_chars(PTTY); 
static int  ip2_write_room(PTTY);

static int  ip2_chars_in_buf(PTTY);

static void ip2_flush_buffer(PTTY);

static int  ip2_ioctl(PTTY, struct file *, UINT, ULONG);

static int  ip2_ioctl(PTTY, UINT, ULONG);

static void ip2_set_termios(PTTY, struct ktermios *);

static void ip2_set_line_discipline(PTTY);

static void ip2_throttle(PTTY);
@@ -2127,7 +2127,7 @@ static int ip2_tiocmset(struct tty_struct *tty, 
/*                                                                            */

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

static int

ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )

ip2_ioctl ( PTTY tty, UINT cmd, ULONG arg )

{

	wait_queue_t wait;

	i2ChanStrPtr pCh = DevTable[tty->index];

drivers/char/isicom.c

+1 −1
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ static int isicom_get_serial_info(struct isi_port *port, 
	return 0;

}



static int isicom_ioctl(struct tty_struct *tty, struct file *filp,

static int isicom_ioctl(struct tty_struct *tty,

	unsigned int cmd, unsigned long arg)

{

	struct isi_port *port = tty->driver_data;