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
......@@ -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;
......
......@@ -2483,7 +2483,7 @@ end:
} /* 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;
......
......@@ -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;
......
......@@ -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];
......
......@@ -1082,8 +1082,8 @@ 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,
unsigned int set, unsigned int clear)
static int isicom_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct isi_port *port = tty->driver_data;
unsigned long flags;
......
......@@ -1524,7 +1524,7 @@ static int stli_tiocmget(struct tty_struct *tty)
return stli_mktiocm(portp->asig.sigvalue);
}
static int stli_tiocmset(struct tty_struct *tty, struct file *file,
static int stli_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct stliport *portp = tty->driver_data;
......
......@@ -200,7 +200,7 @@ static void moxa_stop(struct tty_struct *);
static void moxa_start(struct tty_struct *);
static void moxa_hangup(struct tty_struct *);
static int moxa_tiocmget(struct tty_struct *tty);
static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
static int moxa_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear);
static void moxa_poll(unsigned long);
static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
......@@ -1277,7 +1277,7 @@ static int moxa_tiocmget(struct tty_struct *tty)
return flag;
}
static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
static int moxa_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct moxa_port *ch;
......
......@@ -1347,7 +1347,7 @@ static int mxser_tiocmget(struct tty_struct *tty)
((status & UART_MSR_CTS) ? TIOCM_CTS : 0);
}
static int mxser_tiocmset(struct tty_struct *tty, struct file *file,
static int mxser_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct mxser_port *info = tty->driver_data;
......
......@@ -1767,8 +1767,8 @@ static int ntty_tiocmget(struct tty_struct *tty)
}
/* Sets io controls parameters */
static int ntty_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
static int ntty_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct nozomi *dc = get_dc_by_tty(tty);
unsigned long flags;
......
......@@ -410,7 +410,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
}
static int
ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
ipw_tiocmset(struct tty_struct *linux_tty,
unsigned int set, unsigned int clear)
{
struct ipw_tty *tty = linux_tty->driver_data;
......
......@@ -419,8 +419,8 @@ static void bh_status(MGSLPC_INFO *info);
* ioctl handlers
*/
static int tiocmget(struct tty_struct *tty);
static int tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear);
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear);
static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount);
static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params);
static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty);
......@@ -2139,7 +2139,7 @@ static int tiocmget(struct tty_struct *tty)
/* set modem control signals (DTR/RTS)
*/
static int tiocmset(struct tty_struct *tty, struct file *file,
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
......
......@@ -1115,8 +1115,8 @@ static int rc_tiocmget(struct tty_struct *tty)
return result;
}
static int rc_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
static int rc_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct riscom_port *port = tty->driver_data;
unsigned long flags;
......
......@@ -1189,8 +1189,8 @@ static int rp_tiocmget(struct tty_struct *tty)
/*
* Sets the modem control lines
*/
static int rp_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
static int rp_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct r_port *info = tty->driver_data;
......
......@@ -1331,8 +1331,7 @@ static int cy_tiocmget(struct tty_struct *tty)
} /* cy_tiocmget */
static int
cy_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
cy_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
{
struct cyclades_port *info = tty->driver_data;
int channel;
......
......@@ -1778,7 +1778,7 @@ static int sx_tiocmget(struct tty_struct *tty)
}
static int sx_tiocmset(struct tty_struct *tty, struct file *file,
static int sx_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct specialix_port *port = tty->driver_data;
......
......@@ -1107,7 +1107,7 @@ static int stl_tiocmget(struct tty_struct *tty)
return stl_getsignals(portp);
}
static int stl_tiocmset(struct tty_struct *tty, struct file *file,
static int stl_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct stlport *portp;
......
......@@ -1879,8 +1879,8 @@ static int sx_tiocmget(struct tty_struct *tty)
return sx_getsignals(port);
}
static int sx_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
static int sx_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct sx_port *port = tty->driver_data;
int rts = -1, dtr = -1;
......
......@@ -824,7 +824,7 @@ static isr_dispatch_func UscIsrTable[7] =
* ioctl call handlers
*/
static int tiocmget(struct tty_struct *tty);
static int tiocmset(struct tty_struct *tty, struct file *file,
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear);
static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount
__user *user_icount);
......@@ -2871,8 +2871,8 @@ static int tiocmget(struct tty_struct *tty)
/* set modem control signals (DTR/RTS)
*/
static int tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct mgsl_struct *info = tty->driver_data;
unsigned long flags;
......
......@@ -513,8 +513,8 @@ static int rx_enable(struct slgt_info *info, int enable);
static int modem_input_wait(struct slgt_info *info,int arg);
static int wait_mgsl_event(struct slgt_info *info, int __user *mask_ptr);
static int tiocmget(struct tty_struct *tty);
static int tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear);
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear);
static int set_break(struct tty_struct *tty, int break_state);
static int get_interface(struct slgt_info *info, int __user *if_mode);
static int set_interface(struct slgt_info *info, int if_mode);
......@@ -3223,7 +3223,7 @@ static int tiocmget(struct tty_struct *tty)
* TIOCMSET = set/clear signal values
* value bit mask for command
*/
static int tiocmset(struct tty_struct *tty, struct file *file,
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct slgt_info *info = tty->driver_data;
......
......@@ -547,8 +547,8 @@ static int rx_enable(SLMP_INFO *info, int enable);
static int modem_input_wait(SLMP_INFO *info,int arg);
static int wait_mgsl_event(SLMP_INFO *info, int __user *mask_ptr);
static int tiocmget(struct tty_struct *tty);
static int tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear);
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear);
static int set_break(struct tty_struct *tty, int break_state);
static void add_device(SLMP_INFO *info);
......@@ -3232,8 +3232,8 @@ static int tiocmget(struct tty_struct *tty)
/* set modem control signals (DTR/RTS)
*/
static int tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
static int tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
SLMP_INFO *info = tty->driver_data;
unsigned long flags;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment