diff options
Diffstat (limited to 'drivers/char/synclink_gt.c')
-rw-r--r-- | drivers/char/synclink_gt.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index 04da6d61dc4f..a35dd549a008 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
@@ -154,7 +154,7 @@ static void flush_buffer(struct tty_struct *tty); | |||
154 | static void tx_hold(struct tty_struct *tty); | 154 | static void tx_hold(struct tty_struct *tty); |
155 | static void tx_release(struct tty_struct *tty); | 155 | static void tx_release(struct tty_struct *tty); |
156 | 156 | ||
157 | static int ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); | 157 | static int ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); |
158 | static int chars_in_buffer(struct tty_struct *tty); | 158 | static int chars_in_buffer(struct tty_struct *tty); |
159 | static void throttle(struct tty_struct * tty); | 159 | static void throttle(struct tty_struct * tty); |
160 | static void unthrottle(struct tty_struct * tty); | 160 | static void unthrottle(struct tty_struct * tty); |
@@ -1030,13 +1030,12 @@ static void tx_release(struct tty_struct *tty) | |||
1030 | * Arguments | 1030 | * Arguments |
1031 | * | 1031 | * |
1032 | * tty pointer to tty instance data | 1032 | * tty pointer to tty instance data |
1033 | * file pointer to associated file object for device | ||
1034 | * cmd IOCTL command code | 1033 | * cmd IOCTL command code |
1035 | * arg command argument/context | 1034 | * arg command argument/context |
1036 | * | 1035 | * |
1037 | * Return 0 if success, otherwise error code | 1036 | * Return 0 if success, otherwise error code |
1038 | */ | 1037 | */ |
1039 | static int ioctl(struct tty_struct *tty, struct file *file, | 1038 | static int ioctl(struct tty_struct *tty, |
1040 | unsigned int cmd, unsigned long arg) | 1039 | unsigned int cmd, unsigned long arg) |
1041 | { | 1040 | { |
1042 | struct slgt_info *info = tty->driver_data; | 1041 | struct slgt_info *info = tty->driver_data; |
@@ -1200,7 +1199,7 @@ static long set_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *ne | |||
1200 | return 0; | 1199 | return 0; |
1201 | } | 1200 | } |
1202 | 1201 | ||
1203 | static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file, | 1202 | static long slgt_compat_ioctl(struct tty_struct *tty, |
1204 | unsigned int cmd, unsigned long arg) | 1203 | unsigned int cmd, unsigned long arg) |
1205 | { | 1204 | { |
1206 | struct slgt_info *info = tty->driver_data; | 1205 | struct slgt_info *info = tty->driver_data; |
@@ -1239,7 +1238,7 @@ static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file, | |||
1239 | case MGSL_IOCSIF: | 1238 | case MGSL_IOCSIF: |
1240 | case MGSL_IOCSXSYNC: | 1239 | case MGSL_IOCSXSYNC: |
1241 | case MGSL_IOCSXCTRL: | 1240 | case MGSL_IOCSXCTRL: |
1242 | rc = ioctl(tty, file, cmd, arg); | 1241 | rc = ioctl(tty, cmd, arg); |
1243 | break; | 1242 | break; |
1244 | } | 1243 | } |
1245 | 1244 | ||