diff options
Diffstat (limited to 'drivers/char/pcmcia/synclink_cs.c')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index eaa41992fbe2..beca80bb9bdb 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -418,9 +418,9 @@ static void bh_status(MGSLPC_INFO *info); | |||
418 | /* | 418 | /* |
419 | * ioctl handlers | 419 | * ioctl handlers |
420 | */ | 420 | */ |
421 | static int tiocmget(struct tty_struct *tty, struct file *file); | 421 | static int tiocmget(struct tty_struct *tty); |
422 | static int tiocmset(struct tty_struct *tty, struct file *file, | 422 | static int tiocmset(struct tty_struct *tty, |
423 | unsigned int set, unsigned int clear); | 423 | unsigned int set, unsigned int clear); |
424 | static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount); | 424 | static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount); |
425 | static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params); | 425 | static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params); |
426 | static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty); | 426 | static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty); |
@@ -2114,7 +2114,7 @@ static int modem_input_wait(MGSLPC_INFO *info,int arg) | |||
2114 | 2114 | ||
2115 | /* return the state of the serial control and status signals | 2115 | /* return the state of the serial control and status signals |
2116 | */ | 2116 | */ |
2117 | static int tiocmget(struct tty_struct *tty, struct file *file) | 2117 | static int tiocmget(struct tty_struct *tty) |
2118 | { | 2118 | { |
2119 | MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; | 2119 | MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; |
2120 | unsigned int result; | 2120 | unsigned int result; |
@@ -2139,7 +2139,7 @@ static int tiocmget(struct tty_struct *tty, struct file *file) | |||
2139 | 2139 | ||
2140 | /* set modem control signals (DTR/RTS) | 2140 | /* set modem control signals (DTR/RTS) |
2141 | */ | 2141 | */ |
2142 | static int tiocmset(struct tty_struct *tty, struct file *file, | 2142 | static 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; |
@@ -2222,13 +2222,12 @@ static int mgslpc_get_icount(struct tty_struct *tty, | |||
2222 | * Arguments: | 2222 | * Arguments: |
2223 | * | 2223 | * |
2224 | * tty pointer to tty instance data | 2224 | * tty pointer to tty instance data |
2225 | * file pointer to associated file object for device | ||
2226 | * cmd IOCTL command code | 2225 | * cmd IOCTL command code |
2227 | * arg command argument/context | 2226 | * arg command argument/context |
2228 | * | 2227 | * |
2229 | * Return Value: 0 if success, otherwise error code | 2228 | * Return Value: 0 if success, otherwise error code |
2230 | */ | 2229 | */ |
2231 | static int mgslpc_ioctl(struct tty_struct *tty, struct file * file, | 2230 | static int mgslpc_ioctl(struct tty_struct *tty, |
2232 | unsigned int cmd, unsigned long arg) | 2231 | unsigned int cmd, unsigned long arg) |
2233 | { | 2232 | { |
2234 | MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data; | 2233 | MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data; |