diff options
Diffstat (limited to 'drivers/char/vme_scc.c')
-rw-r--r-- | drivers/char/vme_scc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c index c2ca31eb850b..0cdbaa70cf9f 100644 --- a/drivers/char/vme_scc.c +++ b/drivers/char/vme_scc.c | |||
@@ -81,10 +81,10 @@ static int scc_ioctl(struct tty_struct * tty, struct file * filp, | |||
81 | unsigned int cmd, unsigned long arg); | 81 | unsigned int cmd, unsigned long arg); |
82 | static void scc_throttle(struct tty_struct *tty); | 82 | static void scc_throttle(struct tty_struct *tty); |
83 | static void scc_unthrottle(struct tty_struct *tty); | 83 | static void scc_unthrottle(struct tty_struct *tty); |
84 | static irqreturn_t scc_tx_int(int irq, void *data, struct pt_regs *fp); | 84 | static irqreturn_t scc_tx_int(int irq, void *data); |
85 | static irqreturn_t scc_rx_int(int irq, void *data, struct pt_regs *fp); | 85 | static irqreturn_t scc_rx_int(int irq, void *data); |
86 | static irqreturn_t scc_stat_int(int irq, void *data, struct pt_regs *fp); | 86 | static irqreturn_t scc_stat_int(int irq, void *data); |
87 | static irqreturn_t scc_spcond_int(int irq, void *data, struct pt_regs *fp); | 87 | static irqreturn_t scc_spcond_int(int irq, void *data); |
88 | static void scc_setsignals(struct scc_port *port, int dtr, int rts); | 88 | static void scc_setsignals(struct scc_port *port, int dtr, int rts); |
89 | static void scc_break_ctl(struct tty_struct *tty, int break_state); | 89 | static void scc_break_ctl(struct tty_struct *tty, int break_state); |
90 | 90 | ||
@@ -419,7 +419,7 @@ module_init(vme_scc_init); | |||
419 | * Interrupt handlers | 419 | * Interrupt handlers |
420 | *--------------------------------------------------------------------------*/ | 420 | *--------------------------------------------------------------------------*/ |
421 | 421 | ||
422 | static irqreturn_t scc_rx_int(int irq, void *data, struct pt_regs *fp) | 422 | static irqreturn_t scc_rx_int(int irq, void *data) |
423 | { | 423 | { |
424 | unsigned char ch; | 424 | unsigned char ch; |
425 | struct scc_port *port = data; | 425 | struct scc_port *port = data; |
@@ -440,7 +440,7 @@ static irqreturn_t scc_rx_int(int irq, void *data, struct pt_regs *fp) | |||
440 | */ | 440 | */ |
441 | if (SCCread(INT_PENDING_REG) & | 441 | if (SCCread(INT_PENDING_REG) & |
442 | (port->channel == CHANNEL_A ? IPR_A_RX : IPR_B_RX)) { | 442 | (port->channel == CHANNEL_A ? IPR_A_RX : IPR_B_RX)) { |
443 | scc_spcond_int (irq, data, fp); | 443 | scc_spcond_int (irq, data); |
444 | return IRQ_HANDLED; | 444 | return IRQ_HANDLED; |
445 | } | 445 | } |
446 | 446 | ||
@@ -451,7 +451,7 @@ static irqreturn_t scc_rx_int(int irq, void *data, struct pt_regs *fp) | |||
451 | } | 451 | } |
452 | 452 | ||
453 | 453 | ||
454 | static irqreturn_t scc_spcond_int(int irq, void *data, struct pt_regs *fp) | 454 | static irqreturn_t scc_spcond_int(int irq, void *data) |
455 | { | 455 | { |
456 | struct scc_port *port = data; | 456 | struct scc_port *port = data; |
457 | struct tty_struct *tty = port->gs.tty; | 457 | struct tty_struct *tty = port->gs.tty; |
@@ -496,7 +496,7 @@ static irqreturn_t scc_spcond_int(int irq, void *data, struct pt_regs *fp) | |||
496 | } | 496 | } |
497 | 497 | ||
498 | 498 | ||
499 | static irqreturn_t scc_tx_int(int irq, void *data, struct pt_regs *fp) | 499 | static irqreturn_t scc_tx_int(int irq, void *data) |
500 | { | 500 | { |
501 | struct scc_port *port = data; | 501 | struct scc_port *port = data; |
502 | SCC_ACCESS_INIT(port); | 502 | SCC_ACCESS_INIT(port); |
@@ -538,7 +538,7 @@ static irqreturn_t scc_tx_int(int irq, void *data, struct pt_regs *fp) | |||
538 | } | 538 | } |
539 | 539 | ||
540 | 540 | ||
541 | static irqreturn_t scc_stat_int(int irq, void *data, struct pt_regs *fp) | 541 | static irqreturn_t scc_stat_int(int irq, void *data) |
542 | { | 542 | { |
543 | struct scc_port *port = data; | 543 | struct scc_port *port = data; |
544 | unsigned channel = port->channel; | 544 | unsigned channel = port->channel; |