aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-02-14 11:26:50 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 14:52:43 -0500
commit20b9d17715017ae4dd4ec87fabc36d33b9de708e (patch)
tree64e9c4ff845844298f9056357d9f4914802207f8 /drivers/char
parent60b33c133ca0b7c0b6072c87234b63fee6e80558 (diff)
tiocmset: kill the file pointer argument
Doing tiocmget was such fun we should do tiocmset as well for the same reasons Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/amiserial.c4
-rw-r--r--drivers/char/cyclades.c2
-rw-r--r--drivers/char/epca.c4
-rw-r--r--drivers/char/ip2/ip2main.c4
-rw-r--r--drivers/char/isicom.c4
-rw-r--r--drivers/char/istallion.c2
-rw-r--r--drivers/char/moxa.c4
-rw-r--r--drivers/char/mxser.c2
-rw-r--r--drivers/char/nozomi.c4
-rw-r--r--drivers/char/pcmcia/ipwireless/tty.c2
-rw-r--r--drivers/char/pcmcia/synclink_cs.c6
-rw-r--r--drivers/char/riscom8.c4
-rw-r--r--drivers/char/rocket.c4
-rw-r--r--drivers/char/serial167.c3
-rw-r--r--drivers/char/specialix.c2
-rw-r--r--drivers/char/stallion.c2
-rw-r--r--drivers/char/sx.c4
-rw-r--r--drivers/char/synclink.c6
-rw-r--r--drivers/char/synclink_gt.c6
-rw-r--r--drivers/char/synclinkmp.c8
20 files changed, 38 insertions, 39 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index bc67e6839059..5c15fad71ad2 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1216,8 +1216,8 @@ static int rs_tiocmget(struct tty_struct *tty)
1216 | (!(status & SER_CTS) ? TIOCM_CTS : 0); 1216 | (!(status & SER_CTS) ? TIOCM_CTS : 0);
1217} 1217}
1218 1218
1219static int rs_tiocmset(struct tty_struct *tty, struct file *file, 1219static int rs_tiocmset(struct tty_struct *tty, unsigned int set,
1220 unsigned int set, unsigned int clear) 1220 unsigned int clear)
1221{ 1221{
1222 struct async_struct * info = tty->driver_data; 1222 struct async_struct * info = tty->driver_data;
1223 unsigned long flags; 1223 unsigned long flags;
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index e7945ddacd18..942b6f2b70a4 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -2483,7 +2483,7 @@ end:
2483} /* cy_tiomget */ 2483} /* cy_tiomget */
2484 2484
2485static int 2485static int
2486cy_tiocmset(struct tty_struct *tty, struct file *file, 2486cy_tiocmset(struct tty_struct *tty,
2487 unsigned int set, unsigned int clear) 2487 unsigned int set, unsigned int clear)
2488{ 2488{
2489 struct cyclades_port *info = tty->driver_data; 2489 struct cyclades_port *info = tty->driver_data;
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index ecf6f0a889fc..e5872b59f9cd 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -2015,7 +2015,7 @@ static int pc_tiocmget(struct tty_struct *tty)
2015 return mflag; 2015 return mflag;
2016} 2016}
2017 2017
2018static int pc_tiocmset(struct tty_struct *tty, struct file *file, 2018static int pc_tiocmset(struct tty_struct *tty,
2019 unsigned int set, unsigned int clear) 2019 unsigned int set, unsigned int clear)
2020{ 2020{
2021 struct channel *ch = tty->driver_data; 2021 struct channel *ch = tty->driver_data;
@@ -2081,7 +2081,7 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,
2081 case TIOCMODS: 2081 case TIOCMODS:
2082 if (get_user(mstat, (unsigned __user *)argp)) 2082 if (get_user(mstat, (unsigned __user *)argp))
2083 return -EFAULT; 2083 return -EFAULT;
2084 return pc_tiocmset(tty, file, mstat, ~mstat); 2084 return pc_tiocmset(tty, mstat, ~mstat);
2085 case TIOCSDTR: 2085 case TIOCSDTR:
2086 spin_lock_irqsave(&epca_lock, flags); 2086 spin_lock_irqsave(&epca_lock, flags);
2087 ch->omodem |= ch->m_dtr; 2087 ch->omodem |= ch->m_dtr;
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 476cd087118e..d5f866c7c672 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -182,7 +182,7 @@ static void ip2_stop(PTTY);
182static void ip2_start(PTTY); 182static void ip2_start(PTTY);
183static void ip2_hangup(PTTY); 183static void ip2_hangup(PTTY);
184static int ip2_tiocmget(struct tty_struct *tty); 184static int ip2_tiocmget(struct tty_struct *tty);
185static int ip2_tiocmset(struct tty_struct *tty, struct file *file, 185static int ip2_tiocmset(struct tty_struct *tty,
186 unsigned int set, unsigned int clear); 186 unsigned int set, unsigned int clear);
187static int ip2_get_icount(struct tty_struct *tty, 187static int ip2_get_icount(struct tty_struct *tty,
188 struct serial_icounter_struct *icount); 188 struct serial_icounter_struct *icount);
@@ -2085,7 +2085,7 @@ static int ip2_tiocmget(struct tty_struct *tty)
2085 | ((pCh->dataSetIn & I2_CTS) ? TIOCM_CTS : 0); 2085 | ((pCh->dataSetIn & I2_CTS) ? TIOCM_CTS : 0);
2086} 2086}
2087 2087
2088static int ip2_tiocmset(struct tty_struct *tty, struct file *file, 2088static int ip2_tiocmset(struct tty_struct *tty,
2089 unsigned int set, unsigned int clear) 2089 unsigned int set, unsigned int clear)
2090{ 2090{
2091 i2ChanStrPtr pCh = DevTable[tty->index]; 2091 i2ChanStrPtr pCh = DevTable[tty->index];
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 836370bc04c2..60f4d8ae7a49 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1082,8 +1082,8 @@ static int isicom_tiocmget(struct tty_struct *tty)
1082 ((status & ISI_RI ) ? TIOCM_RI : 0); 1082 ((status & ISI_RI ) ? TIOCM_RI : 0);
1083} 1083}
1084 1084
1085static int isicom_tiocmset(struct tty_struct *tty, struct file *file, 1085static int isicom_tiocmset(struct tty_struct *tty,
1086 unsigned int set, unsigned int clear) 1086 unsigned int set, unsigned int clear)
1087{ 1087{
1088 struct isi_port *port = tty->driver_data; 1088 struct isi_port *port = tty->driver_data;
1089 unsigned long flags; 1089 unsigned long flags;
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 7843a847b76a..763b58d58255 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -1524,7 +1524,7 @@ static int stli_tiocmget(struct tty_struct *tty)
1524 return stli_mktiocm(portp->asig.sigvalue); 1524 return stli_mktiocm(portp->asig.sigvalue);
1525} 1525}
1526 1526
1527static int stli_tiocmset(struct tty_struct *tty, struct file *file, 1527static int stli_tiocmset(struct tty_struct *tty,
1528 unsigned int set, unsigned int clear) 1528 unsigned int set, unsigned int clear)
1529{ 1529{
1530 struct stliport *portp = tty->driver_data; 1530 struct stliport *portp = tty->driver_data;
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index fdf069bb702f..9f4cd8968a5a 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -200,7 +200,7 @@ static void moxa_stop(struct tty_struct *);
200static void moxa_start(struct tty_struct *); 200static void moxa_start(struct tty_struct *);
201static void moxa_hangup(struct tty_struct *); 201static void moxa_hangup(struct tty_struct *);
202static int moxa_tiocmget(struct tty_struct *tty); 202static int moxa_tiocmget(struct tty_struct *tty);
203static int moxa_tiocmset(struct tty_struct *tty, struct file *file, 203static int moxa_tiocmset(struct tty_struct *tty,
204 unsigned int set, unsigned int clear); 204 unsigned int set, unsigned int clear);
205static void moxa_poll(unsigned long); 205static void moxa_poll(unsigned long);
206static void moxa_set_tty_param(struct tty_struct *, struct ktermios *); 206static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
@@ -1277,7 +1277,7 @@ static int moxa_tiocmget(struct tty_struct *tty)
1277 return flag; 1277 return flag;
1278} 1278}
1279 1279
1280static int moxa_tiocmset(struct tty_struct *tty, struct file *file, 1280static int moxa_tiocmset(struct tty_struct *tty,
1281 unsigned int set, unsigned int clear) 1281 unsigned int set, unsigned int clear)
1282{ 1282{
1283 struct moxa_port *ch; 1283 struct moxa_port *ch;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 4d2f03ec06cd..150a862c4989 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -1347,7 +1347,7 @@ static int mxser_tiocmget(struct tty_struct *tty)
1347 ((status & UART_MSR_CTS) ? TIOCM_CTS : 0); 1347 ((status & UART_MSR_CTS) ? TIOCM_CTS : 0);
1348} 1348}
1349 1349
1350static int mxser_tiocmset(struct tty_struct *tty, struct file *file, 1350static int mxser_tiocmset(struct tty_struct *tty,
1351 unsigned int set, unsigned int clear) 1351 unsigned int set, unsigned int clear)
1352{ 1352{
1353 struct mxser_port *info = tty->driver_data; 1353 struct mxser_port *info = tty->driver_data;
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 0e1dff2ffb1e..1b74c48c4016 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1767,8 +1767,8 @@ static int ntty_tiocmget(struct tty_struct *tty)
1767} 1767}
1768 1768
1769/* Sets io controls parameters */ 1769/* Sets io controls parameters */
1770static int ntty_tiocmset(struct tty_struct *tty, struct file *file, 1770static int ntty_tiocmset(struct tty_struct *tty,
1771 unsigned int set, unsigned int clear) 1771 unsigned int set, unsigned int clear)
1772{ 1772{
1773 struct nozomi *dc = get_dc_by_tty(tty); 1773 struct nozomi *dc = get_dc_by_tty(tty);
1774 unsigned long flags; 1774 unsigned long flags;
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
index 7d2ef4909a73..748190dfbab0 100644
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ b/drivers/char/pcmcia/ipwireless/tty.c
@@ -410,7 +410,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
410} 410}
411 411
412static int 412static int
413ipw_tiocmset(struct tty_struct *linux_tty, struct file *file, 413ipw_tiocmset(struct tty_struct *linux_tty,
414 unsigned int set, unsigned int clear) 414 unsigned int set, unsigned int clear)
415{ 415{
416 struct ipw_tty *tty = linux_tty->driver_data; 416 struct ipw_tty *tty = linux_tty->driver_data;
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 7b68ba6609fe..02127cad0980 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -419,8 +419,8 @@ static void bh_status(MGSLPC_INFO *info);
419 * ioctl handlers 419 * ioctl handlers
420 */ 420 */
421static int tiocmget(struct tty_struct *tty); 421static int tiocmget(struct tty_struct *tty);
422static int tiocmset(struct tty_struct *tty, struct file *file, 422static int tiocmset(struct tty_struct *tty,
423 unsigned int set, unsigned int clear); 423 unsigned int set, unsigned int clear);
424static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount); 424static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount);
425static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params); 425static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params);
426static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty); 426static 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)
2139 2139
2140/* set modem control signals (DTR/RTS) 2140/* set modem control signals (DTR/RTS)
2141 */ 2141 */
2142static int tiocmset(struct tty_struct *tty, struct file *file, 2142static int tiocmset(struct tty_struct *tty,
2143 unsigned int set, unsigned int clear) 2143 unsigned int set, unsigned int clear)
2144{ 2144{
2145 MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; 2145 MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 5d0c98456c93..3666decc6438 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -1115,8 +1115,8 @@ static int rc_tiocmget(struct tty_struct *tty)
1115 return result; 1115 return result;
1116} 1116}
1117 1117
1118static int rc_tiocmset(struct tty_struct *tty, struct file *file, 1118static int rc_tiocmset(struct tty_struct *tty,
1119 unsigned int set, unsigned int clear) 1119 unsigned int set, unsigned int clear)
1120{ 1120{
1121 struct riscom_port *port = tty->driver_data; 1121 struct riscom_port *port = tty->driver_data;
1122 unsigned long flags; 1122 unsigned long flags;
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 75e98efbc8e9..36c108811a81 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -1189,8 +1189,8 @@ static int rp_tiocmget(struct tty_struct *tty)
1189/* 1189/*
1190 * Sets the modem control lines 1190 * Sets the modem control lines
1191 */ 1191 */
1192static int rp_tiocmset(struct tty_struct *tty, struct file *file, 1192static int rp_tiocmset(struct tty_struct *tty,
1193 unsigned int set, unsigned int clear) 1193 unsigned int set, unsigned int clear)
1194{ 1194{
1195 struct r_port *info = tty->driver_data; 1195 struct r_port *info = tty->driver_data;
1196 1196
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index fda90643ead7..89ac542ffff2 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1331,8 +1331,7 @@ static int cy_tiocmget(struct tty_struct *tty)
1331} /* cy_tiocmget */ 1331} /* cy_tiocmget */
1332 1332
1333static int 1333static int
1334cy_tiocmset(struct tty_struct *tty, struct file *file, 1334cy_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
1335 unsigned int set, unsigned int clear)
1336{ 1335{
1337 struct cyclades_port *info = tty->driver_data; 1336 struct cyclades_port *info = tty->driver_data;
1338 int channel; 1337 int channel;
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index bfecfbef0895..a6b23847e4a7 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -1778,7 +1778,7 @@ static int sx_tiocmget(struct tty_struct *tty)
1778} 1778}
1779 1779
1780 1780
1781static int sx_tiocmset(struct tty_struct *tty, struct file *file, 1781static int sx_tiocmset(struct tty_struct *tty,
1782 unsigned int set, unsigned int clear) 1782 unsigned int set, unsigned int clear)
1783{ 1783{
1784 struct specialix_port *port = tty->driver_data; 1784 struct specialix_port *port = tty->driver_data;
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 8c2bf3fb5b89..c42dbffbed16 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -1107,7 +1107,7 @@ static int stl_tiocmget(struct tty_struct *tty)
1107 return stl_getsignals(portp); 1107 return stl_getsignals(portp);
1108} 1108}
1109 1109
1110static int stl_tiocmset(struct tty_struct *tty, struct file *file, 1110static int stl_tiocmset(struct tty_struct *tty,
1111 unsigned int set, unsigned int clear) 1111 unsigned int set, unsigned int clear)
1112{ 1112{
1113 struct stlport *portp; 1113 struct stlport *portp;
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index f46214e60d0c..342c6ae67da5 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1879,8 +1879,8 @@ static int sx_tiocmget(struct tty_struct *tty)
1879 return sx_getsignals(port); 1879 return sx_getsignals(port);
1880} 1880}
1881 1881
1882static int sx_tiocmset(struct tty_struct *tty, struct file *file, 1882static int sx_tiocmset(struct tty_struct *tty,
1883 unsigned int set, unsigned int clear) 1883 unsigned int set, unsigned int clear)
1884{ 1884{
1885 struct sx_port *port = tty->driver_data; 1885 struct sx_port *port = tty->driver_data;
1886 int rts = -1, dtr = -1; 1886 int rts = -1, dtr = -1;
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index d359e092904a..691e1094c20b 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -824,7 +824,7 @@ static isr_dispatch_func UscIsrTable[7] =
824 * ioctl call handlers 824 * ioctl call handlers
825 */ 825 */
826static int tiocmget(struct tty_struct *tty); 826static int tiocmget(struct tty_struct *tty);
827static int tiocmset(struct tty_struct *tty, struct file *file, 827static int tiocmset(struct tty_struct *tty,
828 unsigned int set, unsigned int clear); 828 unsigned int set, unsigned int clear);
829static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount 829static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount
830 __user *user_icount); 830 __user *user_icount);
@@ -2871,8 +2871,8 @@ static int tiocmget(struct tty_struct *tty)
2871 2871
2872/* set modem control signals (DTR/RTS) 2872/* set modem control signals (DTR/RTS)
2873 */ 2873 */
2874static int tiocmset(struct tty_struct *tty, struct file *file, 2874static int tiocmset(struct tty_struct *tty,
2875 unsigned int set, unsigned int clear) 2875 unsigned int set, unsigned int clear)
2876{ 2876{
2877 struct mgsl_struct *info = tty->driver_data; 2877 struct mgsl_struct *info = tty->driver_data;
2878 unsigned long flags; 2878 unsigned long flags;
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index f18ab8af0e1c..04da6d61dc4f 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -513,8 +513,8 @@ static int rx_enable(struct slgt_info *info, int enable);
513static int modem_input_wait(struct slgt_info *info,int arg); 513static int modem_input_wait(struct slgt_info *info,int arg);
514static int wait_mgsl_event(struct slgt_info *info, int __user *mask_ptr); 514static int wait_mgsl_event(struct slgt_info *info, int __user *mask_ptr);
515static int tiocmget(struct tty_struct *tty); 515static int tiocmget(struct tty_struct *tty);
516static int tiocmset(struct tty_struct *tty, struct file *file, 516static int tiocmset(struct tty_struct *tty,
517 unsigned int set, unsigned int clear); 517 unsigned int set, unsigned int clear);
518static int set_break(struct tty_struct *tty, int break_state); 518static int set_break(struct tty_struct *tty, int break_state);
519static int get_interface(struct slgt_info *info, int __user *if_mode); 519static int get_interface(struct slgt_info *info, int __user *if_mode);
520static int set_interface(struct slgt_info *info, int if_mode); 520static int set_interface(struct slgt_info *info, int if_mode);
@@ -3223,7 +3223,7 @@ static int tiocmget(struct tty_struct *tty)
3223 * TIOCMSET = set/clear signal values 3223 * TIOCMSET = set/clear signal values
3224 * value bit mask for command 3224 * value bit mask for command
3225 */ 3225 */
3226static int tiocmset(struct tty_struct *tty, struct file *file, 3226static int tiocmset(struct tty_struct *tty,
3227 unsigned int set, unsigned int clear) 3227 unsigned int set, unsigned int clear)
3228{ 3228{
3229 struct slgt_info *info = tty->driver_data; 3229 struct slgt_info *info = tty->driver_data;
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 5900213ae75b..1f9de97e8cfc 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -547,8 +547,8 @@ static int rx_enable(SLMP_INFO *info, int enable);
547static int modem_input_wait(SLMP_INFO *info,int arg); 547static int modem_input_wait(SLMP_INFO *info,int arg);
548static int wait_mgsl_event(SLMP_INFO *info, int __user *mask_ptr); 548static int wait_mgsl_event(SLMP_INFO *info, int __user *mask_ptr);
549static int tiocmget(struct tty_struct *tty); 549static int tiocmget(struct tty_struct *tty);
550static int tiocmset(struct tty_struct *tty, struct file *file, 550static int tiocmset(struct tty_struct *tty,
551 unsigned int set, unsigned int clear); 551 unsigned int set, unsigned int clear);
552static int set_break(struct tty_struct *tty, int break_state); 552static int set_break(struct tty_struct *tty, int break_state);
553 553
554static void add_device(SLMP_INFO *info); 554static void add_device(SLMP_INFO *info);
@@ -3232,8 +3232,8 @@ static int tiocmget(struct tty_struct *tty)
3232 3232
3233/* set modem control signals (DTR/RTS) 3233/* set modem control signals (DTR/RTS)
3234 */ 3234 */
3235static int tiocmset(struct tty_struct *tty, struct file *file, 3235static int tiocmset(struct tty_struct *tty,
3236 unsigned int set, unsigned int clear) 3236 unsigned int set, unsigned int clear)
3237{ 3237{
3238 SLMP_INFO *info = tty->driver_data; 3238 SLMP_INFO *info = tty->driver_data;
3239 unsigned long flags; 3239 unsigned long flags;