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/rocket.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/rocket.c')
-rw-r--r-- | drivers/char/rocket.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 9d819808e84b..1e68cc2296fa 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c | |||
@@ -1094,7 +1094,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp) | |||
1094 | */ | 1094 | */ |
1095 | static void rp_close(struct tty_struct *tty, struct file *filp) | 1095 | static void rp_close(struct tty_struct *tty, struct file *filp) |
1096 | { | 1096 | { |
1097 | struct r_port *info = (struct r_port *) tty->driver_data; | 1097 | struct r_port *info = tty->driver_data; |
1098 | unsigned long flags; | 1098 | unsigned long flags; |
1099 | int timeout; | 1099 | int timeout; |
1100 | CHANNEL_t *cp; | 1100 | CHANNEL_t *cp; |
@@ -1208,7 +1208,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp) | |||
1208 | static void rp_set_termios(struct tty_struct *tty, | 1208 | static void rp_set_termios(struct tty_struct *tty, |
1209 | struct ktermios *old_termios) | 1209 | struct ktermios *old_termios) |
1210 | { | 1210 | { |
1211 | struct r_port *info = (struct r_port *) tty->driver_data; | 1211 | struct r_port *info = tty->driver_data; |
1212 | CHANNEL_t *cp; | 1212 | CHANNEL_t *cp; |
1213 | unsigned cflag; | 1213 | unsigned cflag; |
1214 | 1214 | ||
@@ -1251,7 +1251,7 @@ static void rp_set_termios(struct tty_struct *tty, | |||
1251 | 1251 | ||
1252 | static int rp_break(struct tty_struct *tty, int break_state) | 1252 | static int rp_break(struct tty_struct *tty, int break_state) |
1253 | { | 1253 | { |
1254 | struct r_port *info = (struct r_port *) tty->driver_data; | 1254 | struct r_port *info = tty->driver_data; |
1255 | unsigned long flags; | 1255 | unsigned long flags; |
1256 | 1256 | ||
1257 | if (rocket_paranoia_check(info, "rp_break")) | 1257 | if (rocket_paranoia_check(info, "rp_break")) |
@@ -1297,7 +1297,7 @@ static int sGetChanRI(CHANNEL_T * ChP) | |||
1297 | */ | 1297 | */ |
1298 | static int rp_tiocmget(struct tty_struct *tty, struct file *file) | 1298 | static int rp_tiocmget(struct tty_struct *tty, struct file *file) |
1299 | { | 1299 | { |
1300 | struct r_port *info = (struct r_port *)tty->driver_data; | 1300 | struct r_port *info = tty->driver_data; |
1301 | unsigned int control, result, ChanStatus; | 1301 | unsigned int control, result, ChanStatus; |
1302 | 1302 | ||
1303 | ChanStatus = sGetChanStatusLo(&info->channel); | 1303 | ChanStatus = sGetChanStatusLo(&info->channel); |
@@ -1318,7 +1318,7 @@ static int rp_tiocmget(struct tty_struct *tty, struct file *file) | |||
1318 | static int rp_tiocmset(struct tty_struct *tty, struct file *file, | 1318 | static int rp_tiocmset(struct tty_struct *tty, struct file *file, |
1319 | unsigned int set, unsigned int clear) | 1319 | unsigned int set, unsigned int clear) |
1320 | { | 1320 | { |
1321 | struct r_port *info = (struct r_port *)tty->driver_data; | 1321 | struct r_port *info = tty->driver_data; |
1322 | 1322 | ||
1323 | if (set & TIOCM_RTS) | 1323 | if (set & TIOCM_RTS) |
1324 | info->channel.TxControl[3] |= SET_RTS; | 1324 | info->channel.TxControl[3] |= SET_RTS; |
@@ -1447,7 +1447,7 @@ static int get_version(struct r_port *info, struct rocket_version __user *retver | |||
1447 | static int rp_ioctl(struct tty_struct *tty, struct file *file, | 1447 | static int rp_ioctl(struct tty_struct *tty, struct file *file, |
1448 | unsigned int cmd, unsigned long arg) | 1448 | unsigned int cmd, unsigned long arg) |
1449 | { | 1449 | { |
1450 | struct r_port *info = (struct r_port *) tty->driver_data; | 1450 | struct r_port *info = tty->driver_data; |
1451 | void __user *argp = (void __user *)arg; | 1451 | void __user *argp = (void __user *)arg; |
1452 | int ret = 0; | 1452 | int ret = 0; |
1453 | 1453 | ||
@@ -1485,7 +1485,7 @@ static int rp_ioctl(struct tty_struct *tty, struct file *file, | |||
1485 | 1485 | ||
1486 | static void rp_send_xchar(struct tty_struct *tty, char ch) | 1486 | static void rp_send_xchar(struct tty_struct *tty, char ch) |
1487 | { | 1487 | { |
1488 | struct r_port *info = (struct r_port *) tty->driver_data; | 1488 | struct r_port *info = tty->driver_data; |
1489 | CHANNEL_t *cp; | 1489 | CHANNEL_t *cp; |
1490 | 1490 | ||
1491 | if (rocket_paranoia_check(info, "rp_send_xchar")) | 1491 | if (rocket_paranoia_check(info, "rp_send_xchar")) |
@@ -1500,7 +1500,7 @@ static void rp_send_xchar(struct tty_struct *tty, char ch) | |||
1500 | 1500 | ||
1501 | static void rp_throttle(struct tty_struct *tty) | 1501 | static void rp_throttle(struct tty_struct *tty) |
1502 | { | 1502 | { |
1503 | struct r_port *info = (struct r_port *) tty->driver_data; | 1503 | struct r_port *info = tty->driver_data; |
1504 | CHANNEL_t *cp; | 1504 | CHANNEL_t *cp; |
1505 | 1505 | ||
1506 | #ifdef ROCKET_DEBUG_THROTTLE | 1506 | #ifdef ROCKET_DEBUG_THROTTLE |
@@ -1520,7 +1520,7 @@ static void rp_throttle(struct tty_struct *tty) | |||
1520 | 1520 | ||
1521 | static void rp_unthrottle(struct tty_struct *tty) | 1521 | static void rp_unthrottle(struct tty_struct *tty) |
1522 | { | 1522 | { |
1523 | struct r_port *info = (struct r_port *) tty->driver_data; | 1523 | struct r_port *info = tty->driver_data; |
1524 | CHANNEL_t *cp; | 1524 | CHANNEL_t *cp; |
1525 | #ifdef ROCKET_DEBUG_THROTTLE | 1525 | #ifdef ROCKET_DEBUG_THROTTLE |
1526 | printk(KERN_INFO "unthrottle %s: %d....\n", tty->name, | 1526 | printk(KERN_INFO "unthrottle %s: %d....\n", tty->name, |
@@ -1547,7 +1547,7 @@ static void rp_unthrottle(struct tty_struct *tty) | |||
1547 | */ | 1547 | */ |
1548 | static void rp_stop(struct tty_struct *tty) | 1548 | static void rp_stop(struct tty_struct *tty) |
1549 | { | 1549 | { |
1550 | struct r_port *info = (struct r_port *) tty->driver_data; | 1550 | struct r_port *info = tty->driver_data; |
1551 | 1551 | ||
1552 | #ifdef ROCKET_DEBUG_FLOW | 1552 | #ifdef ROCKET_DEBUG_FLOW |
1553 | printk(KERN_INFO "stop %s: %d %d....\n", tty->name, | 1553 | printk(KERN_INFO "stop %s: %d %d....\n", tty->name, |
@@ -1563,7 +1563,7 @@ static void rp_stop(struct tty_struct *tty) | |||
1563 | 1563 | ||
1564 | static void rp_start(struct tty_struct *tty) | 1564 | static void rp_start(struct tty_struct *tty) |
1565 | { | 1565 | { |
1566 | struct r_port *info = (struct r_port *) tty->driver_data; | 1566 | struct r_port *info = tty->driver_data; |
1567 | 1567 | ||
1568 | #ifdef ROCKET_DEBUG_FLOW | 1568 | #ifdef ROCKET_DEBUG_FLOW |
1569 | printk(KERN_INFO "start %s: %d %d....\n", tty->name, | 1569 | printk(KERN_INFO "start %s: %d %d....\n", tty->name, |
@@ -1583,7 +1583,7 @@ static void rp_start(struct tty_struct *tty) | |||
1583 | */ | 1583 | */ |
1584 | static void rp_wait_until_sent(struct tty_struct *tty, int timeout) | 1584 | static void rp_wait_until_sent(struct tty_struct *tty, int timeout) |
1585 | { | 1585 | { |
1586 | struct r_port *info = (struct r_port *) tty->driver_data; | 1586 | struct r_port *info = tty->driver_data; |
1587 | CHANNEL_t *cp; | 1587 | CHANNEL_t *cp; |
1588 | unsigned long orig_jiffies; | 1588 | unsigned long orig_jiffies; |
1589 | int check_time, exit_time; | 1589 | int check_time, exit_time; |
@@ -1640,7 +1640,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout) | |||
1640 | static void rp_hangup(struct tty_struct *tty) | 1640 | static void rp_hangup(struct tty_struct *tty) |
1641 | { | 1641 | { |
1642 | CHANNEL_t *cp; | 1642 | CHANNEL_t *cp; |
1643 | struct r_port *info = (struct r_port *) tty->driver_data; | 1643 | struct r_port *info = tty->driver_data; |
1644 | 1644 | ||
1645 | if (rocket_paranoia_check(info, "rp_hangup")) | 1645 | if (rocket_paranoia_check(info, "rp_hangup")) |
1646 | return; | 1646 | return; |
@@ -1680,7 +1680,7 @@ static void rp_hangup(struct tty_struct *tty) | |||
1680 | */ | 1680 | */ |
1681 | static int rp_put_char(struct tty_struct *tty, unsigned char ch) | 1681 | static int rp_put_char(struct tty_struct *tty, unsigned char ch) |
1682 | { | 1682 | { |
1683 | struct r_port *info = (struct r_port *) tty->driver_data; | 1683 | struct r_port *info = tty->driver_data; |
1684 | CHANNEL_t *cp; | 1684 | CHANNEL_t *cp; |
1685 | unsigned long flags; | 1685 | unsigned long flags; |
1686 | 1686 | ||
@@ -1727,7 +1727,7 @@ static int rp_put_char(struct tty_struct *tty, unsigned char ch) | |||
1727 | static int rp_write(struct tty_struct *tty, | 1727 | static int rp_write(struct tty_struct *tty, |
1728 | const unsigned char *buf, int count) | 1728 | const unsigned char *buf, int count) |
1729 | { | 1729 | { |
1730 | struct r_port *info = (struct r_port *) tty->driver_data; | 1730 | struct r_port *info = tty->driver_data; |
1731 | CHANNEL_t *cp; | 1731 | CHANNEL_t *cp; |
1732 | const unsigned char *b; | 1732 | const unsigned char *b; |
1733 | int c, retval = 0; | 1733 | int c, retval = 0; |
@@ -1819,7 +1819,7 @@ end: | |||
1819 | */ | 1819 | */ |
1820 | static int rp_write_room(struct tty_struct *tty) | 1820 | static int rp_write_room(struct tty_struct *tty) |
1821 | { | 1821 | { |
1822 | struct r_port *info = (struct r_port *) tty->driver_data; | 1822 | struct r_port *info = tty->driver_data; |
1823 | int ret; | 1823 | int ret; |
1824 | 1824 | ||
1825 | if (rocket_paranoia_check(info, "rp_write_room")) | 1825 | if (rocket_paranoia_check(info, "rp_write_room")) |
@@ -1840,7 +1840,7 @@ static int rp_write_room(struct tty_struct *tty) | |||
1840 | */ | 1840 | */ |
1841 | static int rp_chars_in_buffer(struct tty_struct *tty) | 1841 | static int rp_chars_in_buffer(struct tty_struct *tty) |
1842 | { | 1842 | { |
1843 | struct r_port *info = (struct r_port *) tty->driver_data; | 1843 | struct r_port *info = tty->driver_data; |
1844 | CHANNEL_t *cp; | 1844 | CHANNEL_t *cp; |
1845 | 1845 | ||
1846 | if (rocket_paranoia_check(info, "rp_chars_in_buffer")) | 1846 | if (rocket_paranoia_check(info, "rp_chars_in_buffer")) |
@@ -1861,7 +1861,7 @@ static int rp_chars_in_buffer(struct tty_struct *tty) | |||
1861 | */ | 1861 | */ |
1862 | static void rp_flush_buffer(struct tty_struct *tty) | 1862 | static void rp_flush_buffer(struct tty_struct *tty) |
1863 | { | 1863 | { |
1864 | struct r_port *info = (struct r_port *) tty->driver_data; | 1864 | struct r_port *info = tty->driver_data; |
1865 | CHANNEL_t *cp; | 1865 | CHANNEL_t *cp; |
1866 | unsigned long flags; | 1866 | unsigned long flags; |
1867 | 1867 | ||