diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 08:52:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 14:48:42 -0500 |
commit | 9c8efecc91c02056340ae19612315f3225e6dbe2 (patch) | |
tree | 4702bd81b36848f572e341e057c21fb91bb5ad5e /arch/ia64/hp | |
parent | 3ee0017e03cd790ed1adaa97ef6f99aff3706ec2 (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 'arch/ia64/hp')
-rw-r--r-- | arch/ia64/hp/sim/simserial.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 2a2fe0c5611..9890b58960a 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
@@ -72,7 +72,7 @@ static char *serial_version = "0.6"; | |||
72 | */ | 72 | */ |
73 | static struct serial_state rs_table[NR_PORTS]={ | 73 | static struct serial_state rs_table[NR_PORTS]={ |
74 | /* UART CLK PORT IRQ FLAGS */ | 74 | /* UART CLK PORT IRQ FLAGS */ |
75 | { 0, BASE_BAUD, 0x3F8, 0, STD_COM_FLAGS,0,PORT_16550 } /* ttyS0 */ | 75 | { BASE_BAUD, 0x3F8, 0, STD_COM_FLAGS, PORT_16550 } /* ttyS0 */ |
76 | }; | 76 | }; |
77 | 77 | ||
78 | /* | 78 | /* |
@@ -194,11 +194,6 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id) | |||
194 | * ------------------------------------------------------------------- | 194 | * ------------------------------------------------------------------- |
195 | */ | 195 | */ |
196 | 196 | ||
197 | static void do_softint(struct work_struct *private_) | ||
198 | { | ||
199 | printk(KERN_ERR "simserial: do_softint called\n"); | ||
200 | } | ||
201 | |||
202 | static int rs_put_char(struct tty_struct *tty, unsigned char ch) | 197 | static int rs_put_char(struct tty_struct *tty, unsigned char ch) |
203 | { | 198 | { |
204 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 199 | struct async_struct *info = (struct async_struct *)tty->driver_data; |
@@ -641,13 +636,10 @@ static int get_async_struct(int line, struct async_struct **ret_info) | |||
641 | } | 636 | } |
642 | init_waitqueue_head(&info->open_wait); | 637 | init_waitqueue_head(&info->open_wait); |
643 | init_waitqueue_head(&info->close_wait); | 638 | init_waitqueue_head(&info->close_wait); |
644 | init_waitqueue_head(&info->delta_msr_wait); | ||
645 | info->magic = SERIAL_MAGIC; | ||
646 | info->port = sstate->port; | 639 | info->port = sstate->port; |
647 | info->flags = sstate->flags; | 640 | info->flags = sstate->flags; |
648 | info->xmit_fifo_size = sstate->xmit_fifo_size; | 641 | info->xmit_fifo_size = sstate->xmit_fifo_size; |
649 | info->line = line; | 642 | info->line = line; |
650 | INIT_WORK(&info->work, do_softint); | ||
651 | info->state = sstate; | 643 | info->state = sstate; |
652 | if (sstate->info) { | 644 | if (sstate->info) { |
653 | kfree(info); | 645 | kfree(info); |