tty: now phase out the ioctl file pointer for good

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Alan Cox and committed by

Greg Kroah-Hartman 15 years ago 6caa76b7 00a0d0d6

+66 -78

41 changed files

expand all collapse all

drivers

char

amiserial.c

cyclades.c

epca.c

ip2

ip2main.c

isicom.c

istallion.c

moxa.c

mxser.c

nozomi.c

pcmcia

ipwireless

tty.c

riscom8.c

rocket.c

ser_a2232.c

serial167.c

specialix.c

stallion.c

sx.c

synclink.c

synclink_gt.c

synclinkmp.c

ttyprintk.c

vme_scc.c

isdn

capi

capi.c

gigaset

interface.c

i4l

isdn_tty.c

net

usb

hso.c

tty

n_gsm.c

pty.c

serial

68328serial.c

68360serial.c

crisv10.c

serial_core.c

tty_io.c

vt_ioctl.c

usb

class

cdc-acm.c

serial

usb-serial.c

include

linux

tty.h

tty_driver.h

net

irda

ircomm_tty.h

net

bluetooth

rfcomm

tty.c

irda

ircomm

ircomm_tty_ioctl.c

+1 -1

drivers/char/amiserial.c

reviewed

··· 1293 1293 return 0; 1294 1294 } 1295 1295 1296 1296 - static int rs_ioctl(struct tty_struct *tty, struct file * file, 1296 1296 + static int rs_ioctl(struct tty_struct *tty, 1297 1297 unsigned int cmd, unsigned long arg) 1298 1298 { 1299 1299 struct async_struct * info = tty->driver_data;

+1 -1

drivers/char/cyclades.c

reviewed

··· 2680 2680 * not recognized by the driver, it should return ENOIOCTLCMD. 2681 2681 */ 2682 2682 static int 2683 2683 - cy_ioctl(struct tty_struct *tty, struct file *file, 2683 2683 + cy_ioctl(struct tty_struct *tty, 2684 2684 unsigned int cmd, unsigned long arg) 2685 2685 { 2686 2686 struct cyclades_port *info = tty->driver_data;

+4 -4

drivers/char/epca.c

reviewed

··· 175 175 static unsigned termios2digi_c(struct channel *ch, unsigned); 176 176 static void epcaparam(struct tty_struct *, struct channel *); 177 177 static void receive_data(struct channel *, struct tty_struct *tty); 178 178 - static int pc_ioctl(struct tty_struct *, struct file *, 178 178 + static int pc_ioctl(struct tty_struct *, 179 179 unsigned int, unsigned long); 180 180 - static int info_ioctl(struct tty_struct *, struct file *, 180 180 + static int info_ioctl(struct tty_struct *, 181 181 unsigned int, unsigned long); 182 182 static void pc_set_termios(struct tty_struct *, struct ktermios *); 183 183 static void do_softint(struct work_struct *work); ··· 1919 1919 tty_schedule_flip(tty); 1920 1920 } 1921 1921 1922 1922 - static int info_ioctl(struct tty_struct *tty, struct file *file, 1922 1922 + static int info_ioctl(struct tty_struct *tty, 1923 1923 unsigned int cmd, unsigned long arg) 1924 1924 { 1925 1925 switch (cmd) { ··· 2057 2057 return 0; 2058 2058 } 2059 2059 2060 2060 - static int pc_ioctl(struct tty_struct *tty, struct file *file, 2060 2060 + static int pc_ioctl(struct tty_struct *tty, 2061 2061 unsigned int cmd, unsigned long arg) 2062 2062 { 2063 2063 digiflow_t dflow;

+2 -2

drivers/char/ip2/ip2main.c

reviewed

··· 173 173 static int ip2_write_room(PTTY); 174 174 static int ip2_chars_in_buf(PTTY); 175 175 static void ip2_flush_buffer(PTTY); 176 176 - static int ip2_ioctl(PTTY, struct file *, UINT, ULONG); 176 176 + static int ip2_ioctl(PTTY, UINT, ULONG); 177 177 static void ip2_set_termios(PTTY, struct ktermios *); 178 178 static void ip2_set_line_discipline(PTTY); 179 179 static void ip2_throttle(PTTY); ··· 2127 2127 /* */ 2128 2128 /******************************************************************************/ 2129 2129 static int 2130 2130 - ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg ) 2130 2130 + ip2_ioctl ( PTTY tty, UINT cmd, ULONG arg ) 2131 2131 { 2132 2132 wait_queue_t wait; 2133 2133 i2ChanStrPtr pCh = DevTable[tty->index];

+1 -1

drivers/char/isicom.c

reviewed

··· 1167 1167 return 0; 1168 1168 } 1169 1169 1170 1170 - static int isicom_ioctl(struct tty_struct *tty, struct file *filp, 1170 1170 + static int isicom_ioctl(struct tty_struct *tty, 1171 1171 unsigned int cmd, unsigned long arg) 1172 1172 { 1173 1173 struct isi_port *port = tty->driver_data;

+2 -2

drivers/char/istallion.c

reviewed

··· 603 603 static void stli_flushchars(struct tty_struct *tty); 604 604 static int stli_writeroom(struct tty_struct *tty); 605 605 static int stli_charsinbuffer(struct tty_struct *tty); 606 606 - static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); 606 606 + static int stli_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); 607 607 static void stli_settermios(struct tty_struct *tty, struct ktermios *old); 608 608 static void stli_throttle(struct tty_struct *tty); 609 609 static void stli_unthrottle(struct tty_struct *tty); ··· 1556 1556 sizeof(asysigs_t), 0); 1557 1557 } 1558 1558 1559 1559 - static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) 1559 1559 + static int stli_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) 1560 1560 { 1561 1561 struct stliport *portp; 1562 1562 struct stlibrd *brdp;

+1 -1

drivers/char/moxa.c

reviewed

··· 287 287 * TTY operations 288 288 */ 289 289 290 290 - static int moxa_ioctl(struct tty_struct *tty, struct file *file, 290 290 + static int moxa_ioctl(struct tty_struct *tty, 291 291 unsigned int cmd, unsigned long arg) 292 292 { 293 293 struct moxa_port *ch = tty->driver_data;

+1 -1

drivers/char/mxser.c

reviewed

··· 1655 1655 return ret; 1656 1656 } 1657 1657 1658 1658 - static int mxser_ioctl(struct tty_struct *tty, struct file *file, 1658 1658 + static int mxser_ioctl(struct tty_struct *tty, 1659 1659 unsigned int cmd, unsigned long arg) 1660 1660 { 1661 1661 struct mxser_port *info = tty->driver_data;

+1 -1

drivers/char/nozomi.c

reviewed

··· 1824 1824 return 0; 1825 1825 } 1826 1826 1827 1827 - static int ntty_ioctl(struct tty_struct *tty, struct file *file, 1827 1827 + static int ntty_ioctl(struct tty_struct *tty, 1828 1828 unsigned int cmd, unsigned long arg) 1829 1829 { 1830 1830 struct port *port = tty->driver_data;

+2 -2

drivers/char/pcmcia/ipwireless/tty.c

reviewed

··· 425 425 return set_control_lines(tty, set, clear); 426 426 } 427 427 428 428 - static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file, 428 428 + static int ipw_ioctl(struct tty_struct *linux_tty, 429 429 unsigned int cmd, unsigned long arg) 430 430 { 431 431 struct ipw_tty *tty = linux_tty->driver_data; ··· 484 484 return tty_perform_flush(linux_tty, arg); 485 485 } 486 486 } 487 487 - return tty_mode_ioctl(linux_tty, file, cmd , arg); 487 487 + return -ENOIOCTLCMD; 488 488 } 489 489 490 490 static int add_tty(int j,

+1 -1

drivers/char/riscom8.c

reviewed

··· 1236 1236 return copy_to_user(retinfo, &tmp, sizeof(tmp)) ? -EFAULT : 0; 1237 1237 } 1238 1238 1239 1239 - static int rc_ioctl(struct tty_struct *tty, struct file *filp, 1239 1239 + static int rc_ioctl(struct tty_struct *tty, 1240 1240 unsigned int cmd, unsigned long arg) 1241 1241 { 1242 1242 struct riscom_port *port = tty->driver_data;

+1 -1

drivers/char/rocket.c

reviewed

··· 1326 1326 } 1327 1327 1328 1328 /* IOCTL call handler into the driver */ 1329 1329 - static int rp_ioctl(struct tty_struct *tty, struct file *file, 1329 1329 + static int rp_ioctl(struct tty_struct *tty, 1330 1330 unsigned int cmd, unsigned long arg) 1331 1331 { 1332 1332 struct r_port *info = tty->driver_data;

+3 -3

drivers/char/ser_a2232.c

reviewed

··· 133 133 /* END GENERIC_SERIAL PROTOTYPES */ 134 134 135 135 /* Functions that the TTY driver struct expects */ 136 136 - static int a2232_ioctl(struct tty_struct *tty, struct file *file, 137 137 - unsigned int cmd, unsigned long arg); 136 136 + static int a2232_ioctl(struct tty_struct *tty, 137 137 + unsigned int cmd, unsigned long arg); 138 138 static void a2232_throttle(struct tty_struct *tty); 139 139 static void a2232_unthrottle(struct tty_struct *tty); 140 140 static int a2232_open(struct tty_struct * tty, struct file * filp); ··· 447 447 /*** END OF REAL_DRIVER FUNCTIONS ***/ 448 448 449 449 /*** BEGIN FUNCTIONS EXPECTED BY TTY DRIVER STRUCTS ***/ 450 450 - static int a2232_ioctl( struct tty_struct *tty, struct file *file, 450 450 + static int a2232_ioctl( struct tty_struct *tty, 451 451 unsigned int cmd, unsigned long arg) 452 452 { 453 453 return -ENOIOCTLCMD;

+1 -1

drivers/char/serial167.c

reviewed

··· 1492 1492 } 1493 1493 1494 1494 static int 1495 1495 - cy_ioctl(struct tty_struct *tty, struct file *file, 1495 1495 + cy_ioctl(struct tty_struct *tty, 1496 1496 unsigned int cmd, unsigned long arg) 1497 1497 { 1498 1498 struct cyclades_port *info = tty->driver_data;

+1 -1

drivers/char/specialix.c

reviewed

··· 1928 1928 } 1929 1929 1930 1930 1931 1931 - static int sx_ioctl(struct tty_struct *tty, struct file *filp, 1931 1931 + static int sx_ioctl(struct tty_struct *tty, 1932 1932 unsigned int cmd, unsigned long arg) 1933 1933 { 1934 1934 struct specialix_port *port = tty->driver_data;

+2 -3

drivers/char/stallion.c

reviewed

··· 1132 1132 return 0; 1133 1133 } 1134 1134 1135 1135 - static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) 1135 1135 + static int stl_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) 1136 1136 { 1137 1137 struct stlport *portp; 1138 1138 int rc; 1139 1139 void __user *argp = (void __user *)arg; 1140 1140 1141 1141 - pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd, 1142 1142 - arg); 1141 1141 + pr_debug("stl_ioctl(tty=%p,cmd=%x,arg=%lx)\n", tty, cmd, arg); 1143 1142 1144 1143 portp = tty->driver_data; 1145 1144 if (portp == NULL)

+1 -1

drivers/char/sx.c

reviewed

··· 1899 1899 return 0; 1900 1900 } 1901 1901 1902 1902 - static int sx_ioctl(struct tty_struct *tty, struct file *filp, 1902 1902 + static int sx_ioctl(struct tty_struct *tty, 1903 1903 unsigned int cmd, unsigned long arg) 1904 1904 { 1905 1905 int rc;

+1 -2

drivers/char/synclink.c

reviewed

··· 2962 2962 * Arguments: 2963 2963 * 2964 2964 * tty pointer to tty instance data 2965 2965 - * file pointer to associated file object for device 2966 2965 * cmd IOCTL command code 2967 2966 * arg command argument/context 2968 2967 * 2969 2968 * Return Value: 0 if success, otherwise error code 2970 2969 */ 2971 2971 - static int mgsl_ioctl(struct tty_struct *tty, struct file * file, 2970 2970 + static int mgsl_ioctl(struct tty_struct *tty, 2972 2971 unsigned int cmd, unsigned long arg) 2973 2972 { 2974 2973 struct mgsl_struct * info = tty->driver_data;

+4 -5

drivers/char/synclink_gt.c

reviewed

··· 154 154 static void tx_hold(struct tty_struct *tty); 155 155 static void tx_release(struct tty_struct *tty); 156 156 157 157 - static int ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); 157 157 + static int ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); 158 158 static int chars_in_buffer(struct tty_struct *tty); 159 159 static void throttle(struct tty_struct * tty); 160 160 static void unthrottle(struct tty_struct * tty); ··· 1030 1030 * Arguments 1031 1031 * 1032 1032 * tty pointer to tty instance data 1033 1033 - * file pointer to associated file object for device 1034 1033 * cmd IOCTL command code 1035 1034 * arg command argument/context 1036 1035 * 1037 1036 * Return 0 if success, otherwise error code 1038 1037 */ 1039 1039 - static int ioctl(struct tty_struct *tty, struct file *file, 1038 1038 + static int ioctl(struct tty_struct *tty, 1040 1039 unsigned int cmd, unsigned long arg) 1041 1040 { 1042 1041 struct slgt_info *info = tty->driver_data; ··· 1199 1200 return 0; 1200 1201 } 1201 1202 1202 1202 - static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file, 1203 1203 + static long slgt_compat_ioctl(struct tty_struct *tty, 1203 1204 unsigned int cmd, unsigned long arg) 1204 1205 { 1205 1206 struct slgt_info *info = tty->driver_data; ··· 1238 1239 case MGSL_IOCSIF: 1239 1240 case MGSL_IOCSXSYNC: 1240 1241 case MGSL_IOCSXCTRL: 1241 1241 - rc = ioctl(tty, file, cmd, arg); 1242 1242 + rc = ioctl(tty, cmd, arg); 1242 1243 break; 1243 1244 } 1244 1245

+2 -3

drivers/char/synclinkmp.c

reviewed

··· 520 520 static void tx_hold(struct tty_struct *tty); 521 521 static void tx_release(struct tty_struct *tty); 522 522 523 523 - static int ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); 523 523 + static int ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); 524 524 static int chars_in_buffer(struct tty_struct *tty); 525 525 static void throttle(struct tty_struct * tty); 526 526 static void unthrottle(struct tty_struct * tty); ··· 1248 1248 * Arguments: 1249 1249 * 1250 1250 * tty pointer to tty instance data 1251 1251 - * file pointer to associated file object for device 1252 1251 * cmd IOCTL command code 1253 1252 * arg command argument/context 1254 1253 * 1255 1254 * Return Value: 0 if success, otherwise error code 1256 1255 */ 1257 1257 - static int ioctl(struct tty_struct *tty, struct file *file, 1256 1256 + static int ioctl(struct tty_struct *tty, 1258 1257 unsigned int cmd, unsigned long arg) 1259 1258 { 1260 1259 SLMP_INFO *info = tty->driver_data;

+1 -1

drivers/char/ttyprintk.c

reviewed

··· 144 144 /* 145 145 * TTY operations ioctl function. 146 146 */ 147 147 - static int tpk_ioctl(struct tty_struct *tty, struct file *file, 147 147 + static int tpk_ioctl(struct tty_struct *tty, 148 148 unsigned int cmd, unsigned long arg) 149 149 { 150 150 struct ttyprintk_port *tpkp = tty->driver_data;

+2 -2

drivers/char/vme_scc.c

reviewed

··· 75 75 static void scc_close(void *ptr); 76 76 static int scc_chars_in_buffer(void * ptr); 77 77 static int scc_open(struct tty_struct * tty, struct file * filp); 78 78 - static int scc_ioctl(struct tty_struct * tty, struct file * filp, 78 78 + static int scc_ioctl(struct tty_struct * tty, 79 79 unsigned int cmd, unsigned long arg); 80 80 static void scc_throttle(struct tty_struct *tty); 81 81 static void scc_unthrottle(struct tty_struct *tty); ··· 1046 1046 } 1047 1047 1048 1048 1049 1049 - static int scc_ioctl(struct tty_struct *tty, struct file *file, 1049 1049 + static int scc_ioctl(struct tty_struct *tty, 1050 1050 unsigned int cmd, unsigned long arg) 1051 1051 { 1052 1052 return -ENOIOCTLCMD;

+2 -8

drivers/isdn/capi/capi.c

reviewed

··· 1219 1219 return mp->outbytes; 1220 1220 } 1221 1221 1222 1222 - static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file, 1222 1222 + static int capinc_tty_ioctl(struct tty_struct *tty, 1223 1223 unsigned int cmd, unsigned long arg) 1224 1224 { 1225 1225 - int error = 0; 1226 1226 - switch (cmd) { 1227 1227 - default: 1228 1228 - error = n_tty_ioctl_helper(tty, file, cmd, arg); 1229 1229 - break; 1230 1230 - } 1231 1231 - return error; 1225 1225 + return -ENOIOCTLCMD; 1232 1226 } 1233 1227 1234 1228 static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios * old)

+2 -2

drivers/isdn/gigaset/interface.c

reviewed

··· 115 115 116 116 static int if_open(struct tty_struct *tty, struct file *filp); 117 117 static void if_close(struct tty_struct *tty, struct file *filp); 118 118 - static int if_ioctl(struct tty_struct *tty, struct file *file, 118 118 + static int if_ioctl(struct tty_struct *tty, 119 119 unsigned int cmd, unsigned long arg); 120 120 static int if_write_room(struct tty_struct *tty); 121 121 static int if_chars_in_buffer(struct tty_struct *tty); ··· 205 205 module_put(cs->driver->owner); 206 206 } 207 207 208 208 - static int if_ioctl(struct tty_struct *tty, struct file *file, 208 208 + static int if_ioctl(struct tty_struct *tty, 209 209 unsigned int cmd, unsigned long arg) 210 210 { 211 211 struct cardstate *cs;

+1 -2

drivers/isdn/i4l/isdn_tty.c

reviewed

··· 1413 1413 } 1414 1414 1415 1415 static int 1416 1416 - isdn_tty_ioctl(struct tty_struct *tty, struct file *file, 1417 1417 - uint cmd, ulong arg) 1416 1416 + isdn_tty_ioctl(struct tty_struct *tty, uint cmd, ulong arg) 1418 1417 { 1419 1418 modem_info *info = (modem_info *) tty->driver_data; 1420 1419 int retval;

+1 -1

drivers/net/usb/hso.c

reviewed

··· 1730 1730 USB_CTRL_SET_TIMEOUT); 1731 1731 } 1732 1732 1733 1733 - static int hso_serial_ioctl(struct tty_struct *tty, struct file *file, 1733 1733 + static int hso_serial_ioctl(struct tty_struct *tty, 1734 1734 unsigned int cmd, unsigned long arg) 1735 1735 { 1736 1736 struct hso_serial *serial = get_serial_by_tty(tty);

+1 -1

drivers/tty/n_gsm.c

reviewed

··· 2671 2671 } 2672 2672 2673 2673 2674 2674 - static int gsmtty_ioctl(struct tty_struct *tty, struct file *filp, 2674 2674 + static int gsmtty_ioctl(struct tty_struct *tty, 2675 2675 unsigned int cmd, unsigned long arg) 2676 2676 { 2677 2677 return -ENOIOCTLCMD;

+2 -2

drivers/tty/pty.c

reviewed

··· 334 334 return -ENOMEM; 335 335 } 336 336 337 337 - static int pty_bsd_ioctl(struct tty_struct *tty, struct file *file, 337 337 + static int pty_bsd_ioctl(struct tty_struct *tty, 338 338 unsigned int cmd, unsigned long arg) 339 339 { 340 340 switch (cmd) { ··· 489 489 }; 490 490 491 491 492 492 - static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file, 492 492 + static int pty_unix98_ioctl(struct tty_struct *tty, 493 493 unsigned int cmd, unsigned long arg) 494 494 { 495 495 switch (cmd) {

+1 -1

drivers/tty/serial/68328serial.c

reviewed

··· 945 945 local_irq_restore(flags); 946 946 } 947 947 948 948 - static int rs_ioctl(struct tty_struct *tty, struct file * file, 948 948 + static int rs_ioctl(struct tty_struct *tty, 949 949 unsigned int cmd, unsigned long arg) 950 950 { 951 951 int error;

+1 -1

drivers/tty/serial/68360serial.c

reviewed

··· 1405 1405 return 0; 1406 1406 } 1407 1407 1408 1408 - static int rs_360_ioctl(struct tty_struct *tty, struct file * file, 1408 1408 + static int rs_360_ioctl(struct tty_struct *tty, 1409 1409 unsigned int cmd, unsigned long arg) 1410 1410 { 1411 1411 int error;

+1 -1

drivers/tty/serial/crisv10.c

reviewed

··· 3647 3647 3648 3648 3649 3649 static int 3650 3650 - rs_ioctl(struct tty_struct *tty, struct file * file, 3650 3650 + rs_ioctl(struct tty_struct *tty, 3651 3651 unsigned int cmd, unsigned long arg) 3652 3652 { 3653 3653 struct e100_serial * info = (struct e100_serial *)tty->driver_data;

+2 -2

drivers/tty/serial/serial_core.c

reviewed

··· 1099 1099 * Called via sys_ioctl. We can use spin_lock_irq() here. 1100 1100 */ 1101 1101 static int 1102 1102 - uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, 1102 1102 + uart_ioctl(struct tty_struct *tty, unsigned int cmd, 1103 1103 unsigned long arg) 1104 1104 { 1105 1105 struct uart_state *state = tty->driver_data; ··· 1152 1152 1153 1153 mutex_lock(&port->mutex); 1154 1154 1155 1155 - if (tty_hung_up_p(filp)) { 1155 1155 + if (tty->flags & (1 << TTY_IO_ERROR)) { 1156 1156 ret = -EIO; 1157 1157 goto out_up; 1158 1158 }

+2 -2

drivers/tty/tty_io.c

reviewed

··· 2676 2676 break; 2677 2677 } 2678 2678 if (tty->ops->ioctl) { 2679 2679 - retval = (tty->ops->ioctl)(tty, file, cmd, arg); 2679 2679 + retval = (tty->ops->ioctl)(tty, cmd, arg); 2680 2680 if (retval != -ENOIOCTLCMD) 2681 2681 return retval; 2682 2682 } ··· 2704 2704 return -EINVAL; 2705 2705 2706 2706 if (tty->ops->compat_ioctl) { 2707 2707 - retval = (tty->ops->compat_ioctl)(tty, file, cmd, arg); 2707 2707 + retval = (tty->ops->compat_ioctl)(tty, cmd, arg); 2708 2708 if (retval != -ENOIOCTLCMD) 2709 2709 return retval; 2710 2710 }

+3 -3

drivers/tty/vt/vt_ioctl.c

reviewed

··· 495 495 * We handle the console-specific ioctl's here. We allow the 496 496 * capability to modify any console, not just the fg_console. 497 497 */ 498 498 - int vt_ioctl(struct tty_struct *tty, struct file * file, 498 498 + int vt_ioctl(struct tty_struct *tty, 499 499 unsigned int cmd, unsigned long arg) 500 500 { 501 501 struct vc_data *vc = tty->driver_data; ··· 1495 1495 return 0; 1496 1496 } 1497 1497 1498 1498 - long vt_compat_ioctl(struct tty_struct *tty, struct file * file, 1498 1498 + long vt_compat_ioctl(struct tty_struct *tty, 1499 1499 unsigned int cmd, unsigned long arg) 1500 1500 { 1501 1501 struct vc_data *vc = tty->driver_data; ··· 1581 1581 1582 1582 fallback: 1583 1583 tty_unlock(); 1584 1584 - return vt_ioctl(tty, file, cmd, arg); 1584 1584 + return vt_ioctl(tty, cmd, arg); 1585 1585 } 1586 1586 1587 1587

+1 -1

drivers/usb/class/cdc-acm.c

reviewed

··· 813 813 return acm_set_control(acm, acm->ctrlout = newctrl); 814 814 } 815 815 816 816 - static int acm_tty_ioctl(struct tty_struct *tty, struct file *file, 816 816 + static int acm_tty_ioctl(struct tty_struct *tty, 817 817 unsigned int cmd, unsigned long arg) 818 818 { 819 819 struct acm *acm = tty->driver_data;

+1 -1

drivers/usb/serial/usb-serial.c

reviewed

··· 406 406 port->serial->type->unthrottle(tty); 407 407 } 408 408 409 409 - static int serial_ioctl(struct tty_struct *tty, struct file *file, 409 409 + static int serial_ioctl(struct tty_struct *tty, 410 410 unsigned int cmd, unsigned long arg) 411 411 { 412 412 struct usb_serial_port *port = tty->driver_data;

+1 -1

include/linux/tty.h

reviewed

··· 584 584 585 585 /* vt.c */ 586 586 587 587 - extern int vt_ioctl(struct tty_struct *tty, struct file *file, 587 587 + extern int vt_ioctl(struct tty_struct *tty, 588 588 unsigned int cmd, unsigned long arg); 589 589 590 590 extern long vt_compat_ioctl(struct tty_struct *tty, struct file * file,

+4 -5

include/linux/tty_driver.h

reviewed

··· 98 98 * 99 99 * Note: Do not call this function directly, call tty_write_room 100 100 * 101 101 - * int (*ioctl)(struct tty_struct *tty, struct file * file, 102 102 - * unsigned int cmd, unsigned long arg); 101 101 + * int (*ioctl)(struct tty_struct *tty, unsigned int cmd, unsigned long arg); 103 102 * 104 103 * This routine allows the tty driver to implement 105 104 * device-specific ioctls. If the ioctl number passed in cmd ··· 106 107 * 107 108 * Optional 108 109 * 109 109 - * long (*compat_ioctl)(struct tty_struct *tty, struct file * file, 110 110 + * long (*compat_ioctl)(struct tty_struct *tty,, 110 111 * unsigned int cmd, unsigned long arg); 111 112 * 112 113 * implement ioctl processing for 32 bit process on 64 bit system ··· 255 256 void (*flush_chars)(struct tty_struct *tty); 256 257 int (*write_room)(struct tty_struct *tty); 257 258 int (*chars_in_buffer)(struct tty_struct *tty); 258 258 - int (*ioctl)(struct tty_struct *tty, struct file * file, 259 259 + int (*ioctl)(struct tty_struct *tty, 259 260 unsigned int cmd, unsigned long arg); 260 260 - long (*compat_ioctl)(struct tty_struct *tty, struct file * file, 261 261 + long (*compat_ioctl)(struct tty_struct *tty, 261 262 unsigned int cmd, unsigned long arg); 262 263 void (*set_termios)(struct tty_struct *tty, struct ktermios * old); 263 264 void (*throttle)(struct tty_struct * tty);

+1 -1

include/net/irda/ircomm_tty.h

reviewed

··· 123 123 extern int ircomm_tty_tiocmget(struct tty_struct *tty); 124 124 extern int ircomm_tty_tiocmset(struct tty_struct *tty, 125 125 unsigned int set, unsigned int clear); 126 126 - extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, 126 126 + extern int ircomm_tty_ioctl(struct tty_struct *tty, 127 127 unsigned int cmd, unsigned long arg); 128 128 extern void ircomm_tty_set_termios(struct tty_struct *tty, 129 129 struct ktermios *old_termios);

+1 -1

net/bluetooth/rfcomm/tty.c

reviewed

··· 830 830 return room; 831 831 } 832 832 833 833 - static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) 833 833 + static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) 834 834 { 835 835 BT_DBG("tty %p cmd 0x%02x", tty, cmd); 836 836

+2 -2

net/irda/ircomm/ircomm_tty_ioctl.c

reviewed

··· 365 365 } 366 366 367 367 /* 368 368 - * Function ircomm_tty_ioctl (tty, file, cmd, arg) 368 368 + * Function ircomm_tty_ioctl (tty, cmd, arg) 369 369 * 370 370 * 371 371 * 372 372 */ 373 373 - int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, 373 373 + int ircomm_tty_ioctl(struct tty_struct *tty, 374 374 unsigned int cmd, unsigned long arg) 375 375 { 376 376 struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;