diff options
Diffstat (limited to 'drivers/net/wan/pc300_tty.c')
-rw-r--r-- | drivers/net/wan/pc300_tty.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c index 4293889e287e..1c65d1c33873 100644 --- a/drivers/net/wan/pc300_tty.c +++ b/drivers/net/wan/pc300_tty.c | |||
@@ -131,9 +131,8 @@ static void cpc_tty_trace(pc300dev_t *dev, char* buf, int len, char rxtx); | |||
131 | static void cpc_tty_signal_off(pc300dev_t *pc300dev, unsigned char); | 131 | static void cpc_tty_signal_off(pc300dev_t *pc300dev, unsigned char); |
132 | static void cpc_tty_signal_on(pc300dev_t *pc300dev, unsigned char); | 132 | static void cpc_tty_signal_on(pc300dev_t *pc300dev, unsigned char); |
133 | 133 | ||
134 | static int pc300_tiocmset(struct tty_struct *, struct file *, | 134 | static int pc300_tiocmset(struct tty_struct *, unsigned int, unsigned int); |
135 | unsigned int, unsigned int); | 135 | static int pc300_tiocmget(struct tty_struct *); |
136 | static int pc300_tiocmget(struct tty_struct *, struct file *); | ||
137 | 136 | ||
138 | /* functions called by PC300 driver */ | 137 | /* functions called by PC300 driver */ |
139 | void cpc_tty_init(pc300dev_t *dev); | 138 | void cpc_tty_init(pc300dev_t *dev); |
@@ -540,10 +539,10 @@ static int cpc_tty_chars_in_buffer(struct tty_struct *tty) | |||
540 | return -ENODEV; | 539 | return -ENODEV; |
541 | } | 540 | } |
542 | 541 | ||
543 | return(0); | 542 | return 0; |
544 | } | 543 | } |
545 | 544 | ||
546 | static int pc300_tiocmset(struct tty_struct *tty, struct file *file, | 545 | static int pc300_tiocmset(struct tty_struct *tty, |
547 | unsigned int set, unsigned int clear) | 546 | unsigned int set, unsigned int clear) |
548 | { | 547 | { |
549 | st_cpc_tty_area *cpc_tty; | 548 | st_cpc_tty_area *cpc_tty; |
@@ -570,7 +569,7 @@ static int pc300_tiocmset(struct tty_struct *tty, struct file *file, | |||
570 | return 0; | 569 | return 0; |
571 | } | 570 | } |
572 | 571 | ||
573 | static int pc300_tiocmget(struct tty_struct *tty, struct file *file) | 572 | static int pc300_tiocmget(struct tty_struct *tty) |
574 | { | 573 | { |
575 | unsigned int result; | 574 | unsigned int result; |
576 | unsigned char status; | 575 | unsigned char status; |