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/serial167.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/serial167.c')
-rw-r--r-- | drivers/char/serial167.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index a8f15e6be594..f1f24f0ee26f 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
@@ -315,7 +315,7 @@ u_short write_cy_cmd(volatile u_char * base_addr, u_char cmd) | |||
315 | 315 | ||
316 | static void cy_stop(struct tty_struct *tty) | 316 | static void cy_stop(struct tty_struct *tty) |
317 | { | 317 | { |
318 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 318 | struct cyclades_port *info = tty->driver_data; |
319 | volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR; | 319 | volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR; |
320 | int channel; | 320 | int channel; |
321 | unsigned long flags; | 321 | unsigned long flags; |
@@ -337,7 +337,7 @@ static void cy_stop(struct tty_struct *tty) | |||
337 | 337 | ||
338 | static void cy_start(struct tty_struct *tty) | 338 | static void cy_start(struct tty_struct *tty) |
339 | { | 339 | { |
340 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 340 | struct cyclades_port *info = tty->driver_data; |
341 | volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR; | 341 | volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR; |
342 | int channel; | 342 | int channel; |
343 | unsigned long flags; | 343 | unsigned long flags; |
@@ -1062,7 +1062,7 @@ static void config_setup(struct cyclades_port *info) | |||
1062 | 1062 | ||
1063 | static int cy_put_char(struct tty_struct *tty, unsigned char ch) | 1063 | static int cy_put_char(struct tty_struct *tty, unsigned char ch) |
1064 | { | 1064 | { |
1065 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1065 | struct cyclades_port *info = tty->driver_data; |
1066 | unsigned long flags; | 1066 | unsigned long flags; |
1067 | 1067 | ||
1068 | #ifdef SERIAL_DEBUG_IO | 1068 | #ifdef SERIAL_DEBUG_IO |
@@ -1090,7 +1090,7 @@ static int cy_put_char(struct tty_struct *tty, unsigned char ch) | |||
1090 | 1090 | ||
1091 | static void cy_flush_chars(struct tty_struct *tty) | 1091 | static void cy_flush_chars(struct tty_struct *tty) |
1092 | { | 1092 | { |
1093 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1093 | struct cyclades_port *info = tty->driver_data; |
1094 | unsigned long flags; | 1094 | unsigned long flags; |
1095 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; | 1095 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; |
1096 | int channel; | 1096 | int channel; |
@@ -1122,7 +1122,7 @@ static void cy_flush_chars(struct tty_struct *tty) | |||
1122 | */ | 1122 | */ |
1123 | static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) | 1123 | static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) |
1124 | { | 1124 | { |
1125 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1125 | struct cyclades_port *info = tty->driver_data; |
1126 | unsigned long flags; | 1126 | unsigned long flags; |
1127 | int c, total = 0; | 1127 | int c, total = 0; |
1128 | 1128 | ||
@@ -1166,7 +1166,7 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) | |||
1166 | 1166 | ||
1167 | static int cy_write_room(struct tty_struct *tty) | 1167 | static int cy_write_room(struct tty_struct *tty) |
1168 | { | 1168 | { |
1169 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1169 | struct cyclades_port *info = tty->driver_data; |
1170 | int ret; | 1170 | int ret; |
1171 | 1171 | ||
1172 | #ifdef SERIAL_DEBUG_IO | 1172 | #ifdef SERIAL_DEBUG_IO |
@@ -1183,7 +1183,7 @@ static int cy_write_room(struct tty_struct *tty) | |||
1183 | 1183 | ||
1184 | static int cy_chars_in_buffer(struct tty_struct *tty) | 1184 | static int cy_chars_in_buffer(struct tty_struct *tty) |
1185 | { | 1185 | { |
1186 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1186 | struct cyclades_port *info = tty->driver_data; |
1187 | 1187 | ||
1188 | #ifdef SERIAL_DEBUG_IO | 1188 | #ifdef SERIAL_DEBUG_IO |
1189 | printk("cy_chars_in_buffer %s %d\n", tty->name, info->xmit_cnt); /* */ | 1189 | printk("cy_chars_in_buffer %s %d\n", tty->name, info->xmit_cnt); /* */ |
@@ -1197,7 +1197,7 @@ static int cy_chars_in_buffer(struct tty_struct *tty) | |||
1197 | 1197 | ||
1198 | static void cy_flush_buffer(struct tty_struct *tty) | 1198 | static void cy_flush_buffer(struct tty_struct *tty) |
1199 | { | 1199 | { |
1200 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1200 | struct cyclades_port *info = tty->driver_data; |
1201 | unsigned long flags; | 1201 | unsigned long flags; |
1202 | 1202 | ||
1203 | #ifdef SERIAL_DEBUG_IO | 1203 | #ifdef SERIAL_DEBUG_IO |
@@ -1218,7 +1218,7 @@ static void cy_flush_buffer(struct tty_struct *tty) | |||
1218 | */ | 1218 | */ |
1219 | static void cy_throttle(struct tty_struct *tty) | 1219 | static void cy_throttle(struct tty_struct *tty) |
1220 | { | 1220 | { |
1221 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1221 | struct cyclades_port *info = tty->driver_data; |
1222 | unsigned long flags; | 1222 | unsigned long flags; |
1223 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; | 1223 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; |
1224 | int channel; | 1224 | int channel; |
@@ -1250,7 +1250,7 @@ static void cy_throttle(struct tty_struct *tty) | |||
1250 | 1250 | ||
1251 | static void cy_unthrottle(struct tty_struct *tty) | 1251 | static void cy_unthrottle(struct tty_struct *tty) |
1252 | { | 1252 | { |
1253 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1253 | struct cyclades_port *info = tty->driver_data; |
1254 | unsigned long flags; | 1254 | unsigned long flags; |
1255 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; | 1255 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; |
1256 | int channel; | 1256 | int channel; |
@@ -1345,7 +1345,7 @@ check_and_exit: | |||
1345 | 1345 | ||
1346 | static int cy_tiocmget(struct tty_struct *tty, struct file *file) | 1346 | static int cy_tiocmget(struct tty_struct *tty, struct file *file) |
1347 | { | 1347 | { |
1348 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1348 | struct cyclades_port *info = tty->driver_data; |
1349 | int channel; | 1349 | int channel; |
1350 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; | 1350 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; |
1351 | unsigned long flags; | 1351 | unsigned long flags; |
@@ -1369,7 +1369,7 @@ static int | |||
1369 | cy_tiocmset(struct tty_struct *tty, struct file *file, | 1369 | cy_tiocmset(struct tty_struct *tty, struct file *file, |
1370 | unsigned int set, unsigned int clear) | 1370 | unsigned int set, unsigned int clear) |
1371 | { | 1371 | { |
1372 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1372 | struct cyclades_port *info = tty->driver_data; |
1373 | int channel; | 1373 | int channel; |
1374 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; | 1374 | volatile unsigned char *base_addr = (u_char *) BASE_ADDR; |
1375 | unsigned long flags; | 1375 | unsigned long flags; |
@@ -1532,7 +1532,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file, | |||
1532 | unsigned int cmd, unsigned long arg) | 1532 | unsigned int cmd, unsigned long arg) |
1533 | { | 1533 | { |
1534 | unsigned long val; | 1534 | unsigned long val; |
1535 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1535 | struct cyclades_port *info = tty->driver_data; |
1536 | int ret_val = 0; | 1536 | int ret_val = 0; |
1537 | void __user *argp = (void __user *)arg; | 1537 | void __user *argp = (void __user *)arg; |
1538 | 1538 | ||
@@ -1607,7 +1607,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file, | |||
1607 | 1607 | ||
1608 | static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | 1608 | static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios) |
1609 | { | 1609 | { |
1610 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1610 | struct cyclades_port *info = tty->driver_data; |
1611 | 1611 | ||
1612 | #ifdef SERIAL_DEBUG_OTHER | 1612 | #ifdef SERIAL_DEBUG_OTHER |
1613 | printk("cy_set_termios %s\n", tty->name); | 1613 | printk("cy_set_termios %s\n", tty->name); |
@@ -1631,7 +1631,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | |||
1631 | 1631 | ||
1632 | static void cy_close(struct tty_struct *tty, struct file *filp) | 1632 | static void cy_close(struct tty_struct *tty, struct file *filp) |
1633 | { | 1633 | { |
1634 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1634 | struct cyclades_port *info = tty->driver_data; |
1635 | 1635 | ||
1636 | /* CP('C'); */ | 1636 | /* CP('C'); */ |
1637 | #ifdef SERIAL_DEBUG_OTHER | 1637 | #ifdef SERIAL_DEBUG_OTHER |
@@ -1698,7 +1698,7 @@ static void cy_close(struct tty_struct *tty, struct file *filp) | |||
1698 | */ | 1698 | */ |
1699 | void cy_hangup(struct tty_struct *tty) | 1699 | void cy_hangup(struct tty_struct *tty) |
1700 | { | 1700 | { |
1701 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 1701 | struct cyclades_port *info = tty->driver_data; |
1702 | 1702 | ||
1703 | #ifdef SERIAL_DEBUG_OTHER | 1703 | #ifdef SERIAL_DEBUG_OTHER |
1704 | printk("cy_hangup %s\n", tty->name); /* */ | 1704 | printk("cy_hangup %s\n", tty->name); /* */ |