aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/amiserial.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 08:52:12 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 14:48:42 -0500
commit9c8efecc91c02056340ae19612315f3225e6dbe2 (patch)
tree4702bd81b36848f572e341e057c21fb91bb5ad5e /drivers/tty/amiserial.c
parent3ee0017e03cd790ed1adaa97ef6f99aff3706ec2 (diff)
TTY: serialP, remove unused material
First, remove unused macro and rs_multiport_struct structure. Nobody uses them at all. Further, the 2 drivers (they are below) which use the rest of structures from serialP.h (async_struct and serial_state) do not use all the members. Remove the members: * which are unused or * which are only initialized and never used for something real. Everybody should avoid the structures with a looong distance. Finally, remove the ALPHA kludge MCR quirks. They are 1:1 copy from 8250.h. No need to redefine them here. The 2 promised users of the structures: arch/ia64/hp/sim/simserial.c drivers/tty/amiserial.c Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/amiserial.c')
-rw-r--r--drivers/tty/amiserial.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 753286257554..c6d8913dd6f6 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -473,7 +473,6 @@ static irqreturn_t ser_rx_int(int irq, void *dev_id)
473 return IRQ_NONE; 473 return IRQ_NONE;
474 474
475 receive_chars(info); 475 receive_chars(info);
476 info->last_active = jiffies;
477#ifdef SERIAL_DEBUG_INTR 476#ifdef SERIAL_DEBUG_INTR
478 printk("end.\n"); 477 printk("end.\n");
479#endif 478#endif
@@ -494,7 +493,6 @@ static irqreturn_t ser_tx_int(int irq, void *dev_id)
494 return IRQ_NONE; 493 return IRQ_NONE;
495 494
496 transmit_chars(info); 495 transmit_chars(info);
497 info->last_active = jiffies;
498#ifdef SERIAL_DEBUG_INTR 496#ifdef SERIAL_DEBUG_INTR
499 printk("end.\n"); 497 printk("end.\n");
500#endif 498#endif
@@ -828,7 +826,6 @@ static void change_speed(struct async_struct *info,
828 mb(); 826 mb();
829 } 827 }
830 828
831 info->LCR = cval; /* Save LCR */
832 local_irq_restore(flags); 829 local_irq_restore(flags);
833} 830}
834 831
@@ -1743,7 +1740,6 @@ static int get_async_struct(int line, struct async_struct **ret_info)
1743 init_waitqueue_head(&info->close_wait); 1740 init_waitqueue_head(&info->close_wait);
1744 init_waitqueue_head(&info->delta_msr_wait); 1741 init_waitqueue_head(&info->delta_msr_wait);
1745#endif 1742#endif
1746 info->magic = SERIAL_MAGIC;
1747 info->port = sstate->port; 1743 info->port = sstate->port;
1748 info->flags = sstate->flags; 1744 info->flags = sstate->flags;
1749 info->xmit_fifo_size = sstate->xmit_fifo_size; 1745 info->xmit_fifo_size = sstate->xmit_fifo_size;
@@ -1840,7 +1836,6 @@ static inline void line_info(struct seq_file *m, struct serial_state *state)
1840 if (!info) { 1836 if (!info) {
1841 info = &scr_info; /* This is just for serial_{in,out} */ 1837 info = &scr_info; /* This is just for serial_{in,out} */
1842 1838
1843 info->magic = SERIAL_MAGIC;
1844 info->flags = state->flags; 1839 info->flags = state->flags;
1845 info->quot = 0; 1840 info->quot = 0;
1846 info->tty = NULL; 1841 info->tty = NULL;
@@ -1987,7 +1982,6 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
1987 goto fail_put_tty_driver; 1982 goto fail_put_tty_driver;
1988 1983
1989 state = rs_table; 1984 state = rs_table;
1990 state->magic = SSTATE_MAGIC;
1991 state->port = (int)&custom.serdatr; /* Just to give it a value */ 1985 state->port = (int)&custom.serdatr; /* Just to give it a value */
1992 state->line = 0; 1986 state->line = 0;
1993 state->custom_divisor = 0; 1987 state->custom_divisor = 0;