diff options
-rw-r--r-- | drivers/char/cyclades.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 09249149d96f..962a36303d5e 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
@@ -2636,7 +2636,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp) | |||
2636 | */ | 2636 | */ |
2637 | static void cy_wait_until_sent(struct tty_struct *tty, int timeout) | 2637 | static void cy_wait_until_sent(struct tty_struct *tty, int timeout) |
2638 | { | 2638 | { |
2639 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 2639 | struct cyclades_port *info = tty->driver_data; |
2640 | void __iomem *base_addr; | 2640 | void __iomem *base_addr; |
2641 | int card, chip, channel, index; | 2641 | int card, chip, channel, index; |
2642 | unsigned long orig_jiffies; | 2642 | unsigned long orig_jiffies; |
@@ -2713,7 +2713,7 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout) | |||
2713 | */ | 2713 | */ |
2714 | static void cy_close(struct tty_struct *tty, struct file *filp) | 2714 | static void cy_close(struct tty_struct *tty, struct file *filp) |
2715 | { | 2715 | { |
2716 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 2716 | struct cyclades_port *info = tty->driver_data; |
2717 | unsigned long flags; | 2717 | unsigned long flags; |
2718 | 2718 | ||
2719 | #ifdef CY_DEBUG_OTHER | 2719 | #ifdef CY_DEBUG_OTHER |
@@ -2858,7 +2858,7 @@ static void cy_close(struct tty_struct *tty, struct file *filp) | |||
2858 | */ | 2858 | */ |
2859 | static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) | 2859 | static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) |
2860 | { | 2860 | { |
2861 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 2861 | struct cyclades_port *info = tty->driver_data; |
2862 | unsigned long flags; | 2862 | unsigned long flags; |
2863 | int c, ret = 0; | 2863 | int c, ret = 0; |
2864 | 2864 | ||
@@ -2909,7 +2909,7 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) | |||
2909 | */ | 2909 | */ |
2910 | static void cy_put_char(struct tty_struct *tty, unsigned char ch) | 2910 | static void cy_put_char(struct tty_struct *tty, unsigned char ch) |
2911 | { | 2911 | { |
2912 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 2912 | struct cyclades_port *info = tty->driver_data; |
2913 | unsigned long flags; | 2913 | unsigned long flags; |
2914 | 2914 | ||
2915 | #ifdef CY_DEBUG_IO | 2915 | #ifdef CY_DEBUG_IO |
@@ -2942,7 +2942,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch) | |||
2942 | */ | 2942 | */ |
2943 | static void cy_flush_chars(struct tty_struct *tty) | 2943 | static void cy_flush_chars(struct tty_struct *tty) |
2944 | { | 2944 | { |
2945 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 2945 | struct cyclades_port *info = tty->driver_data; |
2946 | 2946 | ||
2947 | #ifdef CY_DEBUG_IO | 2947 | #ifdef CY_DEBUG_IO |
2948 | printk("cyc:cy_flush_chars ttyC%d\n", info->line); /* */ | 2948 | printk("cyc:cy_flush_chars ttyC%d\n", info->line); /* */ |
@@ -2966,7 +2966,7 @@ static void cy_flush_chars(struct tty_struct *tty) | |||
2966 | */ | 2966 | */ |
2967 | static int cy_write_room(struct tty_struct *tty) | 2967 | static int cy_write_room(struct tty_struct *tty) |
2968 | { | 2968 | { |
2969 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 2969 | struct cyclades_port *info = tty->driver_data; |
2970 | int ret; | 2970 | int ret; |
2971 | 2971 | ||
2972 | #ifdef CY_DEBUG_IO | 2972 | #ifdef CY_DEBUG_IO |
@@ -2983,7 +2983,7 @@ static int cy_write_room(struct tty_struct *tty) | |||
2983 | 2983 | ||
2984 | static int cy_chars_in_buffer(struct tty_struct *tty) | 2984 | static int cy_chars_in_buffer(struct tty_struct *tty) |
2985 | { | 2985 | { |
2986 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 2986 | struct cyclades_port *info = tty->driver_data; |
2987 | int card, channel; | 2987 | int card, channel; |
2988 | 2988 | ||
2989 | if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer")) | 2989 | if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer")) |
@@ -3572,7 +3572,7 @@ static int get_lsr_info(struct cyclades_port *info, unsigned int __user * value) | |||
3572 | 3572 | ||
3573 | static int cy_tiocmget(struct tty_struct *tty, struct file *file) | 3573 | static int cy_tiocmget(struct tty_struct *tty, struct file *file) |
3574 | { | 3574 | { |
3575 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 3575 | struct cyclades_port *info = tty->driver_data; |
3576 | int card, chip, channel, index; | 3576 | int card, chip, channel, index; |
3577 | void __iomem *base_addr; | 3577 | void __iomem *base_addr; |
3578 | unsigned long flags; | 3578 | unsigned long flags; |
@@ -3646,7 +3646,7 @@ static int | |||
3646 | cy_tiocmset(struct tty_struct *tty, struct file *file, | 3646 | cy_tiocmset(struct tty_struct *tty, struct file *file, |
3647 | unsigned int set, unsigned int clear) | 3647 | unsigned int set, unsigned int clear) |
3648 | { | 3648 | { |
3649 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 3649 | struct cyclades_port *info = tty->driver_data; |
3650 | int card, chip, channel, index; | 3650 | int card, chip, channel, index; |
3651 | void __iomem *base_addr; | 3651 | void __iomem *base_addr; |
3652 | unsigned long flags; | 3652 | unsigned long flags; |
@@ -3797,7 +3797,7 @@ cy_tiocmset(struct tty_struct *tty, struct file *file, | |||
3797 | */ | 3797 | */ |
3798 | static void cy_break(struct tty_struct *tty, int break_state) | 3798 | static void cy_break(struct tty_struct *tty, int break_state) |
3799 | { | 3799 | { |
3800 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 3800 | struct cyclades_port *info = tty->driver_data; |
3801 | unsigned long flags; | 3801 | unsigned long flags; |
3802 | 3802 | ||
3803 | if (serial_paranoia_check(info, tty->name, "cy_break")) | 3803 | if (serial_paranoia_check(info, tty->name, "cy_break")) |
@@ -3997,7 +3997,7 @@ static int | |||
3997 | cy_ioctl(struct tty_struct *tty, struct file *file, | 3997 | cy_ioctl(struct tty_struct *tty, struct file *file, |
3998 | unsigned int cmd, unsigned long arg) | 3998 | unsigned int cmd, unsigned long arg) |
3999 | { | 3999 | { |
4000 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4000 | struct cyclades_port *info = tty->driver_data; |
4001 | struct cyclades_icount cprev, cnow; /* kernel counter temps */ | 4001 | struct cyclades_icount cprev, cnow; /* kernel counter temps */ |
4002 | struct serial_icounter_struct __user *p_cuser; /* user space */ | 4002 | struct serial_icounter_struct __user *p_cuser; /* user space */ |
4003 | int ret_val = 0; | 4003 | int ret_val = 0; |
@@ -4190,7 +4190,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file, | |||
4190 | */ | 4190 | */ |
4191 | static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | 4191 | static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios) |
4192 | { | 4192 | { |
4193 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4193 | struct cyclades_port *info = tty->driver_data; |
4194 | 4194 | ||
4195 | #ifdef CY_DEBUG_OTHER | 4195 | #ifdef CY_DEBUG_OTHER |
4196 | printk("cyc:cy_set_termios ttyC%d\n", info->line); | 4196 | printk("cyc:cy_set_termios ttyC%d\n", info->line); |
@@ -4225,7 +4225,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | |||
4225 | */ | 4225 | */ |
4226 | static void cy_send_xchar(struct tty_struct *tty, char ch) | 4226 | static void cy_send_xchar(struct tty_struct *tty, char ch) |
4227 | { | 4227 | { |
4228 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4228 | struct cyclades_port *info = tty->driver_data; |
4229 | int card, channel; | 4229 | int card, channel; |
4230 | 4230 | ||
4231 | if (serial_paranoia_check(info, tty->name, "cy_send_xchar")) | 4231 | if (serial_paranoia_check(info, tty->name, "cy_send_xchar")) |
@@ -4255,7 +4255,7 @@ static void cy_send_xchar(struct tty_struct *tty, char ch) | |||
4255 | */ | 4255 | */ |
4256 | static void cy_throttle(struct tty_struct *tty) | 4256 | static void cy_throttle(struct tty_struct *tty) |
4257 | { | 4257 | { |
4258 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4258 | struct cyclades_port *info = tty->driver_data; |
4259 | unsigned long flags; | 4259 | unsigned long flags; |
4260 | void __iomem *base_addr; | 4260 | void __iomem *base_addr; |
4261 | int card, chip, channel, index; | 4261 | int card, chip, channel, index; |
@@ -4313,7 +4313,7 @@ static void cy_throttle(struct tty_struct *tty) | |||
4313 | */ | 4313 | */ |
4314 | static void cy_unthrottle(struct tty_struct *tty) | 4314 | static void cy_unthrottle(struct tty_struct *tty) |
4315 | { | 4315 | { |
4316 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4316 | struct cyclades_port *info = tty->driver_data; |
4317 | unsigned long flags; | 4317 | unsigned long flags; |
4318 | void __iomem *base_addr; | 4318 | void __iomem *base_addr; |
4319 | int card, chip, channel, index; | 4319 | int card, chip, channel, index; |
@@ -4369,7 +4369,7 @@ static void cy_unthrottle(struct tty_struct *tty) | |||
4369 | static void cy_stop(struct tty_struct *tty) | 4369 | static void cy_stop(struct tty_struct *tty) |
4370 | { | 4370 | { |
4371 | struct cyclades_card *cinfo; | 4371 | struct cyclades_card *cinfo; |
4372 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4372 | struct cyclades_port *info = tty->driver_data; |
4373 | void __iomem *base_addr; | 4373 | void __iomem *base_addr; |
4374 | int chip, channel, index; | 4374 | int chip, channel, index; |
4375 | unsigned long flags; | 4375 | unsigned long flags; |
@@ -4404,7 +4404,7 @@ static void cy_stop(struct tty_struct *tty) | |||
4404 | static void cy_start(struct tty_struct *tty) | 4404 | static void cy_start(struct tty_struct *tty) |
4405 | { | 4405 | { |
4406 | struct cyclades_card *cinfo; | 4406 | struct cyclades_card *cinfo; |
4407 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4407 | struct cyclades_port *info = tty->driver_data; |
4408 | void __iomem *base_addr; | 4408 | void __iomem *base_addr; |
4409 | int chip, channel, index; | 4409 | int chip, channel, index; |
4410 | unsigned long flags; | 4410 | unsigned long flags; |
@@ -4437,7 +4437,7 @@ static void cy_start(struct tty_struct *tty) | |||
4437 | 4437 | ||
4438 | static void cy_flush_buffer(struct tty_struct *tty) | 4438 | static void cy_flush_buffer(struct tty_struct *tty) |
4439 | { | 4439 | { |
4440 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4440 | struct cyclades_port *info = tty->driver_data; |
4441 | int card, channel, retval; | 4441 | int card, channel, retval; |
4442 | unsigned long flags; | 4442 | unsigned long flags; |
4443 | 4443 | ||
@@ -4474,7 +4474,7 @@ static void cy_flush_buffer(struct tty_struct *tty) | |||
4474 | */ | 4474 | */ |
4475 | static void cy_hangup(struct tty_struct *tty) | 4475 | static void cy_hangup(struct tty_struct *tty) |
4476 | { | 4476 | { |
4477 | struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; | 4477 | struct cyclades_port *info = tty->driver_data; |
4478 | 4478 | ||
4479 | #ifdef CY_DEBUG_OTHER | 4479 | #ifdef CY_DEBUG_OTHER |
4480 | printk("cyc:cy_hangup ttyC%d\n", info->line); /* */ | 4480 | printk("cyc:cy_hangup ttyC%d\n", info->line); /* */ |