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

Commit acccb454 authored by Lidza Louina's avatar Lidza Louina Committed by Greg Kroah-Hartman
Browse files

staging: dgap: tty.c: fixes ioctl param list 



The declaration for the ioctl function has changed. The previous version
of this declaration took struct file *file as a parameter and the new
one does not. This patch removes that parameter.

It also removes cases for the commands TIOCGETP
TCGETS and TCGETA.

Signed-off-by: default avatarLidza Louina <lidza.louina@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd2ada8d

drivers/staging/dgap/dgap_tty.c

+2 −37
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static struct ktermios DgapDefaultTermios = 
static int dgap_tty_open(struct tty_struct *tty, struct file *file);

static void dgap_tty_close(struct tty_struct *tty, struct file *file);

static int dgap_block_til_ready(struct tty_struct *tty, struct file *file, struct channel_t *ch);

static int dgap_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);

static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg);

static int dgap_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retinfo);

static int dgap_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_info);

static int dgap_tty_digigetedelay(struct tty_struct *tty, int __user *retinfo);
@@ -3164,7 +3164,7 @@ static void dgap_tty_flush_buffer(struct tty_struct *tty) 
 *

 * The usual assortment of ioctl's

 */

static int dgap_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd,

static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,

		unsigned long arg)

{

	struct board_t *bd;
@@ -3423,41 +3423,6 @@ static int dgap_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned in 


		return(-ENOIOCTLCMD);



#ifdef TIOCGETP

	case TIOCGETP:

#endif

	case TCGETS:

	case TCGETA:

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)

		if (tty->ldisc->ops->ioctl) {

#else

		if (tty->ldisc.ops->ioctl) {

#endif

			int retval = (-ENXIO);



			DGAP_UNLOCK(ch->ch_lock, lock_flags2);

			DGAP_UNLOCK(bd->bd_lock, lock_flags);



			if (tty->termios) {

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)

				retval = ((tty->ldisc->ops->ioctl) (tty, file, cmd, arg));

#else

				retval = ((tty->ldisc.ops->ioctl) (tty, file, cmd, arg));

#endif

			}



			DPR_IOCTL(("dgap_tty_ioctl (LINE:%d) finish on port %d - cmd %s (%x), arg %lx\n", 

				__LINE__, ch->ch_portnum, dgap_ioctl_name(cmd), cmd, arg));

			return(retval);

		}



		DGAP_UNLOCK(ch->ch_lock, lock_flags2);

		DGAP_UNLOCK(bd->bd_lock, lock_flags);

		DPR_IOCTL(("dgap_tty_ioctl (LINE:%d) finish on port %d - cmd %s (%x), arg %lx\n", 

			__LINE__, ch->ch_portnum, dgap_ioctl_name(cmd), cmd, arg));



		return(-ENOIOCTLCMD);



	case TCSETSF:

	case TCSETSW:

		/*