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/amiserial.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/amiserial.c')
-rw-r--r-- | drivers/char/amiserial.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index b97aebd7aeb8..4e0cfdeab146 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
@@ -170,7 +170,7 @@ static __inline__ void rtsdtr_ctrl(int bits) | |||
170 | */ | 170 | */ |
171 | static void rs_stop(struct tty_struct *tty) | 171 | static void rs_stop(struct tty_struct *tty) |
172 | { | 172 | { |
173 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 173 | struct async_struct *info = tty->driver_data; |
174 | unsigned long flags; | 174 | unsigned long flags; |
175 | 175 | ||
176 | if (serial_paranoia_check(info, tty->name, "rs_stop")) | 176 | if (serial_paranoia_check(info, tty->name, "rs_stop")) |
@@ -190,7 +190,7 @@ static void rs_stop(struct tty_struct *tty) | |||
190 | 190 | ||
191 | static void rs_start(struct tty_struct *tty) | 191 | static void rs_start(struct tty_struct *tty) |
192 | { | 192 | { |
193 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 193 | struct async_struct *info = tty->driver_data; |
194 | unsigned long flags; | 194 | unsigned long flags; |
195 | 195 | ||
196 | if (serial_paranoia_check(info, tty->name, "rs_start")) | 196 | if (serial_paranoia_check(info, tty->name, "rs_start")) |
@@ -861,7 +861,7 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch) | |||
861 | 861 | ||
862 | static void rs_flush_chars(struct tty_struct *tty) | 862 | static void rs_flush_chars(struct tty_struct *tty) |
863 | { | 863 | { |
864 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 864 | struct async_struct *info = tty->driver_data; |
865 | unsigned long flags; | 865 | unsigned long flags; |
866 | 866 | ||
867 | if (serial_paranoia_check(info, tty->name, "rs_flush_chars")) | 867 | if (serial_paranoia_check(info, tty->name, "rs_flush_chars")) |
@@ -934,7 +934,7 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count | |||
934 | 934 | ||
935 | static int rs_write_room(struct tty_struct *tty) | 935 | static int rs_write_room(struct tty_struct *tty) |
936 | { | 936 | { |
937 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 937 | struct async_struct *info = tty->driver_data; |
938 | 938 | ||
939 | if (serial_paranoia_check(info, tty->name, "rs_write_room")) | 939 | if (serial_paranoia_check(info, tty->name, "rs_write_room")) |
940 | return 0; | 940 | return 0; |
@@ -943,7 +943,7 @@ static int rs_write_room(struct tty_struct *tty) | |||
943 | 943 | ||
944 | static int rs_chars_in_buffer(struct tty_struct *tty) | 944 | static int rs_chars_in_buffer(struct tty_struct *tty) |
945 | { | 945 | { |
946 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 946 | struct async_struct *info = tty->driver_data; |
947 | 947 | ||
948 | if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer")) | 948 | if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer")) |
949 | return 0; | 949 | return 0; |
@@ -952,7 +952,7 @@ static int rs_chars_in_buffer(struct tty_struct *tty) | |||
952 | 952 | ||
953 | static void rs_flush_buffer(struct tty_struct *tty) | 953 | static void rs_flush_buffer(struct tty_struct *tty) |
954 | { | 954 | { |
955 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 955 | struct async_struct *info = tty->driver_data; |
956 | unsigned long flags; | 956 | unsigned long flags; |
957 | 957 | ||
958 | if (serial_paranoia_check(info, tty->name, "rs_flush_buffer")) | 958 | if (serial_paranoia_check(info, tty->name, "rs_flush_buffer")) |
@@ -969,7 +969,7 @@ static void rs_flush_buffer(struct tty_struct *tty) | |||
969 | */ | 969 | */ |
970 | static void rs_send_xchar(struct tty_struct *tty, char ch) | 970 | static void rs_send_xchar(struct tty_struct *tty, char ch) |
971 | { | 971 | { |
972 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 972 | struct async_struct *info = tty->driver_data; |
973 | unsigned long flags; | 973 | unsigned long flags; |
974 | 974 | ||
975 | if (serial_paranoia_check(info, tty->name, "rs_send_char")) | 975 | if (serial_paranoia_check(info, tty->name, "rs_send_char")) |
@@ -1004,7 +1004,7 @@ static void rs_send_xchar(struct tty_struct *tty, char ch) | |||
1004 | */ | 1004 | */ |
1005 | static void rs_throttle(struct tty_struct * tty) | 1005 | static void rs_throttle(struct tty_struct * tty) |
1006 | { | 1006 | { |
1007 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 1007 | struct async_struct *info = tty->driver_data; |
1008 | unsigned long flags; | 1008 | unsigned long flags; |
1009 | #ifdef SERIAL_DEBUG_THROTTLE | 1009 | #ifdef SERIAL_DEBUG_THROTTLE |
1010 | char buf[64]; | 1010 | char buf[64]; |
@@ -1029,7 +1029,7 @@ static void rs_throttle(struct tty_struct * tty) | |||
1029 | 1029 | ||
1030 | static void rs_unthrottle(struct tty_struct * tty) | 1030 | static void rs_unthrottle(struct tty_struct * tty) |
1031 | { | 1031 | { |
1032 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 1032 | struct async_struct *info = tty->driver_data; |
1033 | unsigned long flags; | 1033 | unsigned long flags; |
1034 | #ifdef SERIAL_DEBUG_THROTTLE | 1034 | #ifdef SERIAL_DEBUG_THROTTLE |
1035 | char buf[64]; | 1035 | char buf[64]; |
@@ -1194,7 +1194,7 @@ static int get_lsr_info(struct async_struct * info, unsigned int __user *value) | |||
1194 | 1194 | ||
1195 | static int rs_tiocmget(struct tty_struct *tty, struct file *file) | 1195 | static int rs_tiocmget(struct tty_struct *tty, struct file *file) |
1196 | { | 1196 | { |
1197 | struct async_struct * info = (struct async_struct *)tty->driver_data; | 1197 | struct async_struct * info = tty->driver_data; |
1198 | unsigned char control, status; | 1198 | unsigned char control, status; |
1199 | unsigned long flags; | 1199 | unsigned long flags; |
1200 | 1200 | ||
@@ -1217,7 +1217,7 @@ static int rs_tiocmget(struct tty_struct *tty, struct file *file) | |||
1217 | static int rs_tiocmset(struct tty_struct *tty, struct file *file, | 1217 | static int rs_tiocmset(struct tty_struct *tty, struct file *file, |
1218 | unsigned int set, unsigned int clear) | 1218 | unsigned int set, unsigned int clear) |
1219 | { | 1219 | { |
1220 | struct async_struct * info = (struct async_struct *)tty->driver_data; | 1220 | struct async_struct * info = tty->driver_data; |
1221 | unsigned long flags; | 1221 | unsigned long flags; |
1222 | 1222 | ||
1223 | if (serial_paranoia_check(info, tty->name, "rs_ioctl")) | 1223 | if (serial_paranoia_check(info, tty->name, "rs_ioctl")) |
@@ -1244,7 +1244,7 @@ static int rs_tiocmset(struct tty_struct *tty, struct file *file, | |||
1244 | */ | 1244 | */ |
1245 | static int rs_break(struct tty_struct *tty, int break_state) | 1245 | static int rs_break(struct tty_struct *tty, int break_state) |
1246 | { | 1246 | { |
1247 | struct async_struct * info = (struct async_struct *)tty->driver_data; | 1247 | struct async_struct * info = tty->driver_data; |
1248 | unsigned long flags; | 1248 | unsigned long flags; |
1249 | 1249 | ||
1250 | if (serial_paranoia_check(info, tty->name, "rs_break")) | 1250 | if (serial_paranoia_check(info, tty->name, "rs_break")) |
@@ -1264,7 +1264,7 @@ static int rs_break(struct tty_struct *tty, int break_state) | |||
1264 | static int rs_ioctl(struct tty_struct *tty, struct file * file, | 1264 | static int rs_ioctl(struct tty_struct *tty, struct file * file, |
1265 | unsigned int cmd, unsigned long arg) | 1265 | unsigned int cmd, unsigned long arg) |
1266 | { | 1266 | { |
1267 | struct async_struct * info = (struct async_struct *)tty->driver_data; | 1267 | struct async_struct * info = tty->driver_data; |
1268 | struct async_icount cprev, cnow; /* kernel counter temps */ | 1268 | struct async_icount cprev, cnow; /* kernel counter temps */ |
1269 | struct serial_icounter_struct icount; | 1269 | struct serial_icounter_struct icount; |
1270 | void __user *argp = (void __user *)arg; | 1270 | void __user *argp = (void __user *)arg; |
@@ -1368,7 +1368,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, | |||
1368 | 1368 | ||
1369 | static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | 1369 | static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) |
1370 | { | 1370 | { |
1371 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 1371 | struct async_struct *info = tty->driver_data; |
1372 | unsigned long flags; | 1372 | unsigned long flags; |
1373 | unsigned int cflag = tty->termios->c_cflag; | 1373 | unsigned int cflag = tty->termios->c_cflag; |
1374 | 1374 | ||
@@ -1428,7 +1428,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | |||
1428 | */ | 1428 | */ |
1429 | static void rs_close(struct tty_struct *tty, struct file * filp) | 1429 | static void rs_close(struct tty_struct *tty, struct file * filp) |
1430 | { | 1430 | { |
1431 | struct async_struct * info = (struct async_struct *)tty->driver_data; | 1431 | struct async_struct * info = tty->driver_data; |
1432 | struct serial_state *state; | 1432 | struct serial_state *state; |
1433 | unsigned long flags; | 1433 | unsigned long flags; |
1434 | 1434 | ||
@@ -1523,7 +1523,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) | |||
1523 | */ | 1523 | */ |
1524 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout) | 1524 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout) |
1525 | { | 1525 | { |
1526 | struct async_struct * info = (struct async_struct *)tty->driver_data; | 1526 | struct async_struct * info = tty->driver_data; |
1527 | unsigned long orig_jiffies, char_time; | 1527 | unsigned long orig_jiffies, char_time; |
1528 | int lsr; | 1528 | int lsr; |
1529 | 1529 | ||
@@ -1587,7 +1587,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) | |||
1587 | */ | 1587 | */ |
1588 | static void rs_hangup(struct tty_struct *tty) | 1588 | static void rs_hangup(struct tty_struct *tty) |
1589 | { | 1589 | { |
1590 | struct async_struct * info = (struct async_struct *)tty->driver_data; | 1590 | struct async_struct * info = tty->driver_data; |
1591 | struct serial_state *state = info->state; | 1591 | struct serial_state *state = info->state; |
1592 | 1592 | ||
1593 | if (serial_paranoia_check(info, tty->name, "rs_hangup")) | 1593 | if (serial_paranoia_check(info, tty->name, "rs_hangup")) |