diff options
author | Alan Cox <alan@redhat.com> | 2009-01-02 08:47:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 13:19:40 -0500 |
commit | c9f19e96a2f33cd56c2bd19f87a0c4982d011c2b (patch) | |
tree | 7ebb5f6e6648e7e8eb975944d4a18aadb05851bf /drivers/char/synclinkmp.c | |
parent | 0ac6053c4db9369d7b0f9b39c30f4fb04405666b (diff) |
tty: Remove some pointless casts
disc_data and driver_data are void *
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/synclinkmp.c')
-rw-r--r-- | drivers/char/synclinkmp.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 2aac55bcf5fd..7b0c5b2dd263 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
@@ -801,7 +801,7 @@ cleanup: | |||
801 | */ | 801 | */ |
802 | static void close(struct tty_struct *tty, struct file *filp) | 802 | static void close(struct tty_struct *tty, struct file *filp) |
803 | { | 803 | { |
804 | SLMP_INFO * info = (SLMP_INFO *)tty->driver_data; | 804 | SLMP_INFO * info = tty->driver_data; |
805 | 805 | ||
806 | if (sanity_check(info, tty->name, "close")) | 806 | if (sanity_check(info, tty->name, "close")) |
807 | return; | 807 | return; |
@@ -833,7 +833,7 @@ cleanup: | |||
833 | */ | 833 | */ |
834 | static void hangup(struct tty_struct *tty) | 834 | static void hangup(struct tty_struct *tty) |
835 | { | 835 | { |
836 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 836 | SLMP_INFO *info = tty->driver_data; |
837 | 837 | ||
838 | if (debug_level >= DEBUG_LEVEL_INFO) | 838 | if (debug_level >= DEBUG_LEVEL_INFO) |
839 | printk("%s(%d):%s hangup()\n", | 839 | printk("%s(%d):%s hangup()\n", |
@@ -856,7 +856,7 @@ static void hangup(struct tty_struct *tty) | |||
856 | */ | 856 | */ |
857 | static void set_termios(struct tty_struct *tty, struct ktermios *old_termios) | 857 | static void set_termios(struct tty_struct *tty, struct ktermios *old_termios) |
858 | { | 858 | { |
859 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 859 | SLMP_INFO *info = tty->driver_data; |
860 | unsigned long flags; | 860 | unsigned long flags; |
861 | 861 | ||
862 | if (debug_level >= DEBUG_LEVEL_INFO) | 862 | if (debug_level >= DEBUG_LEVEL_INFO) |
@@ -909,7 +909,7 @@ static int write(struct tty_struct *tty, | |||
909 | const unsigned char *buf, int count) | 909 | const unsigned char *buf, int count) |
910 | { | 910 | { |
911 | int c, ret = 0; | 911 | int c, ret = 0; |
912 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 912 | SLMP_INFO *info = tty->driver_data; |
913 | unsigned long flags; | 913 | unsigned long flags; |
914 | 914 | ||
915 | if (debug_level >= DEBUG_LEVEL_INFO) | 915 | if (debug_level >= DEBUG_LEVEL_INFO) |
@@ -987,7 +987,7 @@ cleanup: | |||
987 | */ | 987 | */ |
988 | static int put_char(struct tty_struct *tty, unsigned char ch) | 988 | static int put_char(struct tty_struct *tty, unsigned char ch) |
989 | { | 989 | { |
990 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 990 | SLMP_INFO *info = tty->driver_data; |
991 | unsigned long flags; | 991 | unsigned long flags; |
992 | int ret = 0; | 992 | int ret = 0; |
993 | 993 | ||
@@ -1024,7 +1024,7 @@ static int put_char(struct tty_struct *tty, unsigned char ch) | |||
1024 | */ | 1024 | */ |
1025 | static void send_xchar(struct tty_struct *tty, char ch) | 1025 | static void send_xchar(struct tty_struct *tty, char ch) |
1026 | { | 1026 | { |
1027 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1027 | SLMP_INFO *info = tty->driver_data; |
1028 | unsigned long flags; | 1028 | unsigned long flags; |
1029 | 1029 | ||
1030 | if (debug_level >= DEBUG_LEVEL_INFO) | 1030 | if (debug_level >= DEBUG_LEVEL_INFO) |
@@ -1048,7 +1048,7 @@ static void send_xchar(struct tty_struct *tty, char ch) | |||
1048 | */ | 1048 | */ |
1049 | static void wait_until_sent(struct tty_struct *tty, int timeout) | 1049 | static void wait_until_sent(struct tty_struct *tty, int timeout) |
1050 | { | 1050 | { |
1051 | SLMP_INFO * info = (SLMP_INFO *)tty->driver_data; | 1051 | SLMP_INFO * info = tty->driver_data; |
1052 | unsigned long orig_jiffies, char_time; | 1052 | unsigned long orig_jiffies, char_time; |
1053 | 1053 | ||
1054 | if (!info ) | 1054 | if (!info ) |
@@ -1115,7 +1115,7 @@ exit: | |||
1115 | */ | 1115 | */ |
1116 | static int write_room(struct tty_struct *tty) | 1116 | static int write_room(struct tty_struct *tty) |
1117 | { | 1117 | { |
1118 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1118 | SLMP_INFO *info = tty->driver_data; |
1119 | int ret; | 1119 | int ret; |
1120 | 1120 | ||
1121 | if (sanity_check(info, tty->name, "write_room")) | 1121 | if (sanity_check(info, tty->name, "write_room")) |
@@ -1142,7 +1142,7 @@ static int write_room(struct tty_struct *tty) | |||
1142 | */ | 1142 | */ |
1143 | static void flush_chars(struct tty_struct *tty) | 1143 | static void flush_chars(struct tty_struct *tty) |
1144 | { | 1144 | { |
1145 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1145 | SLMP_INFO *info = tty->driver_data; |
1146 | unsigned long flags; | 1146 | unsigned long flags; |
1147 | 1147 | ||
1148 | if ( debug_level >= DEBUG_LEVEL_INFO ) | 1148 | if ( debug_level >= DEBUG_LEVEL_INFO ) |
@@ -1181,7 +1181,7 @@ static void flush_chars(struct tty_struct *tty) | |||
1181 | */ | 1181 | */ |
1182 | static void flush_buffer(struct tty_struct *tty) | 1182 | static void flush_buffer(struct tty_struct *tty) |
1183 | { | 1183 | { |
1184 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1184 | SLMP_INFO *info = tty->driver_data; |
1185 | unsigned long flags; | 1185 | unsigned long flags; |
1186 | 1186 | ||
1187 | if (debug_level >= DEBUG_LEVEL_INFO) | 1187 | if (debug_level >= DEBUG_LEVEL_INFO) |
@@ -1203,7 +1203,7 @@ static void flush_buffer(struct tty_struct *tty) | |||
1203 | */ | 1203 | */ |
1204 | static void tx_hold(struct tty_struct *tty) | 1204 | static void tx_hold(struct tty_struct *tty) |
1205 | { | 1205 | { |
1206 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1206 | SLMP_INFO *info = tty->driver_data; |
1207 | unsigned long flags; | 1207 | unsigned long flags; |
1208 | 1208 | ||
1209 | if (sanity_check(info, tty->name, "tx_hold")) | 1209 | if (sanity_check(info, tty->name, "tx_hold")) |
@@ -1223,7 +1223,7 @@ static void tx_hold(struct tty_struct *tty) | |||
1223 | */ | 1223 | */ |
1224 | static void tx_release(struct tty_struct *tty) | 1224 | static void tx_release(struct tty_struct *tty) |
1225 | { | 1225 | { |
1226 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1226 | SLMP_INFO *info = tty->driver_data; |
1227 | unsigned long flags; | 1227 | unsigned long flags; |
1228 | 1228 | ||
1229 | if (sanity_check(info, tty->name, "tx_release")) | 1229 | if (sanity_check(info, tty->name, "tx_release")) |
@@ -1253,7 +1253,7 @@ static void tx_release(struct tty_struct *tty) | |||
1253 | static int do_ioctl(struct tty_struct *tty, struct file *file, | 1253 | static int do_ioctl(struct tty_struct *tty, struct file *file, |
1254 | unsigned int cmd, unsigned long arg) | 1254 | unsigned int cmd, unsigned long arg) |
1255 | { | 1255 | { |
1256 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1256 | SLMP_INFO *info = tty->driver_data; |
1257 | int error; | 1257 | int error; |
1258 | struct mgsl_icount cnow; /* kernel counter temps */ | 1258 | struct mgsl_icount cnow; /* kernel counter temps */ |
1259 | struct serial_icounter_struct __user *p_cuser; /* user space */ | 1259 | struct serial_icounter_struct __user *p_cuser; /* user space */ |
@@ -1464,7 +1464,7 @@ done: | |||
1464 | */ | 1464 | */ |
1465 | static int chars_in_buffer(struct tty_struct *tty) | 1465 | static int chars_in_buffer(struct tty_struct *tty) |
1466 | { | 1466 | { |
1467 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1467 | SLMP_INFO *info = tty->driver_data; |
1468 | 1468 | ||
1469 | if (sanity_check(info, tty->name, "chars_in_buffer")) | 1469 | if (sanity_check(info, tty->name, "chars_in_buffer")) |
1470 | return 0; | 1470 | return 0; |
@@ -1480,7 +1480,7 @@ static int chars_in_buffer(struct tty_struct *tty) | |||
1480 | */ | 1480 | */ |
1481 | static void throttle(struct tty_struct * tty) | 1481 | static void throttle(struct tty_struct * tty) |
1482 | { | 1482 | { |
1483 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1483 | SLMP_INFO *info = tty->driver_data; |
1484 | unsigned long flags; | 1484 | unsigned long flags; |
1485 | 1485 | ||
1486 | if (debug_level >= DEBUG_LEVEL_INFO) | 1486 | if (debug_level >= DEBUG_LEVEL_INFO) |
@@ -1505,7 +1505,7 @@ static void throttle(struct tty_struct * tty) | |||
1505 | */ | 1505 | */ |
1506 | static void unthrottle(struct tty_struct * tty) | 1506 | static void unthrottle(struct tty_struct * tty) |
1507 | { | 1507 | { |
1508 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1508 | SLMP_INFO *info = tty->driver_data; |
1509 | unsigned long flags; | 1509 | unsigned long flags; |
1510 | 1510 | ||
1511 | if (debug_level >= DEBUG_LEVEL_INFO) | 1511 | if (debug_level >= DEBUG_LEVEL_INFO) |
@@ -1536,7 +1536,7 @@ static void unthrottle(struct tty_struct * tty) | |||
1536 | static int set_break(struct tty_struct *tty, int break_state) | 1536 | static int set_break(struct tty_struct *tty, int break_state) |
1537 | { | 1537 | { |
1538 | unsigned char RegValue; | 1538 | unsigned char RegValue; |
1539 | SLMP_INFO * info = (SLMP_INFO *)tty->driver_data; | 1539 | SLMP_INFO * info = tty->driver_data; |
1540 | unsigned long flags; | 1540 | unsigned long flags; |
1541 | 1541 | ||
1542 | if (debug_level >= DEBUG_LEVEL_INFO) | 1542 | if (debug_level >= DEBUG_LEVEL_INFO) |
@@ -3218,7 +3218,7 @@ static int modem_input_wait(SLMP_INFO *info,int arg) | |||
3218 | */ | 3218 | */ |
3219 | static int tiocmget(struct tty_struct *tty, struct file *file) | 3219 | static int tiocmget(struct tty_struct *tty, struct file *file) |
3220 | { | 3220 | { |
3221 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 3221 | SLMP_INFO *info = tty->driver_data; |
3222 | unsigned int result; | 3222 | unsigned int result; |
3223 | unsigned long flags; | 3223 | unsigned long flags; |
3224 | 3224 | ||
@@ -3244,7 +3244,7 @@ static int tiocmget(struct tty_struct *tty, struct file *file) | |||
3244 | static int tiocmset(struct tty_struct *tty, struct file *file, | 3244 | static int tiocmset(struct tty_struct *tty, struct file *file, |
3245 | unsigned int set, unsigned int clear) | 3245 | unsigned int set, unsigned int clear) |
3246 | { | 3246 | { |
3247 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 3247 | SLMP_INFO *info = tty->driver_data; |
3248 | unsigned long flags; | 3248 | unsigned long flags; |
3249 | 3249 | ||
3250 | if (debug_level >= DEBUG_LEVEL_INFO) | 3250 | if (debug_level >= DEBUG_LEVEL_INFO) |