diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 14:52:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 12:48:28 -0800 |
| commit | 6e9ebcfa20b15f0ccdd4b5395a3c63f79c21fa57 (patch) | |
| tree | 436c9c72915d0d727b67d473401776a55c7308cb /arch/ia64 | |
| parent | f66279cd7d5cdf43686da0d9ed20378581b88d0f (diff) | |
| download | blackbird-obmc-linux-6e9ebcfa20b15f0ccdd4b5395a3c63f79c21fa57.tar.gz blackbird-obmc-linux-6e9ebcfa20b15f0ccdd4b5395a3c63f79c21fa57.zip | |
TTY: simserial, final cleanup
* remove pointless checks (tty cannot be NULL at that points)
* fix some printks (use __func__, print text directly w/o using global
strings)
* remove some empty lines
This is the last patch for simserial. Overall, the driver is 400 lines
shorter. Being now at 560 lines.
It was tested using ski with a busybox userspace.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
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')
| -rw-r--r-- | arch/ia64/hp/sim/simserial.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 516ad09f3131..c34785dca92b 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c @@ -47,9 +47,6 @@ struct serial_state { int x_char; }; -static char *serial_name = "SimSerial driver"; -static char *serial_version = "0.6"; - static struct serial_state rs_table[NR_PORTS]; struct tty_driver *hp_simserial_driver; @@ -99,7 +96,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id) struct tty_struct *tty = tty_port_tty_get(&info->port); if (!tty) { - printk(KERN_INFO "simrs_interrupt_single: info|tty=0 info=%p problem\n", info); + printk(KERN_INFO "%s: tty=0 problem\n", __func__); return IRQ_NONE; } /* @@ -122,7 +119,7 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch) struct serial_state *info = tty->driver_data; unsigned long flags; - if (!tty || !info->xmit.buf) + if (!info->xmit.buf) return 0; local_irq_save(flags); @@ -199,7 +196,6 @@ static void rs_flush_chars(struct tty_struct *tty) transmit_chars(tty, info, NULL); } - static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count) { @@ -207,7 +203,7 @@ static int rs_write(struct tty_struct * tty, int c, ret = 0; unsigned long flags; - if (!tty || !info->xmit.buf) + if (!info->xmit.buf) return 0; local_irq_save(flags); @@ -309,7 +305,6 @@ static void rs_unthrottle(struct tty_struct * tty) printk(KERN_INFO "simrs_unthrottle called\n"); } - static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && @@ -462,7 +457,7 @@ static int rs_proc_show(struct seq_file *m, void *v) { int i; - seq_printf(m, "simserinfo:1.0 driver:%s\n", serial_version); + seq_printf(m, "simserinfo:1.0\n"); for (i = 0; i < NR_PORTS; i++) seq_printf(m, "%d: uart:16550 port:3F8 irq:%d\n", i, rs_table[i].irq); @@ -482,12 +477,6 @@ static const struct file_operations rs_proc_fops = { .release = single_release, }; -static inline void show_serial_version(void) -{ - printk(KERN_INFO "%s version %s with", serial_name, serial_version); - printk(KERN_INFO " no serial options enabled\n"); -} - static const struct tty_operations hp_ops = { .open = rs_open, .close = rs_close, @@ -523,7 +512,7 @@ static int __init simrs_init(void) if (!hp_simserial_driver) return -ENOMEM; - show_serial_version(); + printk(KERN_INFO "SimSerial driver with no serial options enabled\n"); /* Initialize the tty_driver structure */ |
