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

Commit 20b9d177 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

tiocmset: kill the file pointer argument 



Doing tiocmget was such fun we should do tiocmset as well for the same
reasons

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

drivers/char/amiserial.c

+2 −2
Original line number Diff line number Diff line
@@ -1216,8 +1216,8 @@ static int rs_tiocmget(struct tty_struct *tty) 
		| (!(status  & SER_CTS) ? TIOCM_CTS : 0);

}



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

		       unsigned int set, unsigned int clear)

static int rs_tiocmset(struct tty_struct *tty, unsigned int set,

						unsigned int clear)

{

	struct async_struct * info = tty->driver_data;

	unsigned long flags;

drivers/char/cyclades.c

+1 −1
Original line number Diff line number Diff line
@@ -2483,7 +2483,7 @@ static int cy_tiocmget(struct tty_struct *tty) 
}				/* cy_tiomget */



static int

cy_tiocmset(struct tty_struct *tty, struct file *file,

cy_tiocmset(struct tty_struct *tty,

		unsigned int set, unsigned int clear)

{

	struct cyclades_port *info = tty->driver_data;

drivers/char/epca.c

+2 −2
Original line number Diff line number Diff line
@@ -2015,7 +2015,7 @@ static int pc_tiocmget(struct tty_struct *tty) 
	return mflag;

}



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

static int pc_tiocmset(struct tty_struct *tty,

		       unsigned int set, unsigned int clear)

{

	struct channel *ch = tty->driver_data;
@@ -2081,7 +2081,7 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file, 
	case TIOCMODS:

		if (get_user(mstat, (unsigned __user *)argp))

			return -EFAULT;

		return pc_tiocmset(tty, file, mstat, ~mstat);

		return pc_tiocmset(tty, mstat, ~mstat);

	case TIOCSDTR:

		spin_lock_irqsave(&epca_lock, flags);

		ch->omodem |= ch->m_dtr;

drivers/char/ip2/ip2main.c

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void ip2_stop(PTTY); 
static void ip2_start(PTTY);

static void ip2_hangup(PTTY);

static int  ip2_tiocmget(struct tty_struct *tty);

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

static int  ip2_tiocmset(struct tty_struct *tty,

			 unsigned int set, unsigned int clear);

static int ip2_get_icount(struct tty_struct *tty,

		struct serial_icounter_struct *icount);
@@ -2085,7 +2085,7 @@ static int ip2_tiocmget(struct tty_struct *tty) 
	      | ((pCh->dataSetIn  & I2_CTS) ? TIOCM_CTS : 0);

}



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

static int ip2_tiocmset(struct tty_struct *tty,

			unsigned int set, unsigned int clear)

{

	i2ChanStrPtr pCh = DevTable[tty->index];

drivers/char/isicom.c

+2 −2
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ static int isicom_tiocmget(struct tty_struct *tty) 
		((status & ISI_RI ) ? TIOCM_RI  : 0);

}



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

static int isicom_tiocmset(struct tty_struct *tty,

					unsigned int set, unsigned int clear)

{

	struct isi_port *port = tty->driver_data;