aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/m32r_sio.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-01-12 04:59:09 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 01:16:58 -0500
commitb85e5ed5621b3a19f1ca20b30fd64803aa3d5ff8 (patch)
tree71d8d51c475389526e330852a90c27353b405c51 /drivers/tty/serial/m32r_sio.c
parentad245aa2750212a8daae44d6dc2f3d34b94d74c6 (diff)
TTY: serial/m32r_sio, remove unused members
struct uart_sio_port has a lots of unused members. Some of them are set to some constant but never read. Remove all those. This includes removal of uart_ops->pm handler as we never handle pm (pm was never set). Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/m32r_sio.c')
-rw-r--r--drivers/tty/serial/m32r_sio.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 6b1303505667..68765f7c2645 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -75,19 +75,7 @@ struct uart_sio_port {
75 struct uart_port port; 75 struct uart_port port;
76 struct timer_list timer; /* "no irq" timer */ 76 struct timer_list timer; /* "no irq" timer */
77 struct list_head list; /* ports on this IRQ */ 77 struct list_head list; /* ports on this IRQ */
78 unsigned short rev;
79 unsigned char acr;
80 unsigned char ier; 78 unsigned char ier;
81 unsigned char lcr;
82 unsigned char mcr_mask; /* mask of user bits */
83 unsigned char mcr_force; /* mask of forced bits */
84 unsigned char lsr_break_flag;
85
86 /*
87 * We provide a per-port pm hook.
88 */
89 void (*pm)(struct uart_port *port,
90 unsigned int state, unsigned int old);
91}; 79};
92 80
93struct irq_info { 81struct irq_info {
@@ -312,12 +300,6 @@ static void receive_chars(struct uart_sio_port *up, int *status)
312 */ 300 */
313 *status &= up->port.read_status_mask; 301 *status &= up->port.read_status_mask;
314 302
315 if (up->port.line == up->port.cons->index) {
316 /* Recover the break flag from console xmit */
317 *status |= up->lsr_break_flag;
318 up->lsr_break_flag = 0;
319 }
320
321 if (*status & UART_LSR_BI) { 303 if (*status & UART_LSR_BI) {
322 pr_debug("handling break....\n"); 304 pr_debug("handling break....\n");
323 flag = TTY_BREAK; 305 flag = TTY_BREAK;
@@ -749,20 +731,9 @@ static void m32r_sio_set_termios(struct uart_port *port,
749 731
750 serial_out(up, UART_IER, up->ier); 732 serial_out(up, UART_IER, up->ier);
751 733
752 up->lcr = cval; /* Save LCR */
753 spin_unlock_irqrestore(&up->port.lock, flags); 734 spin_unlock_irqrestore(&up->port.lock, flags);
754} 735}
755 736
756static void m32r_sio_pm(struct uart_port *port, unsigned int state,
757 unsigned int oldstate)
758{
759 struct uart_sio_port *up =
760 container_of(port, struct uart_sio_port, port);
761
762 if (up->pm)
763 up->pm(port, state, oldstate);
764}
765
766/* 737/*
767 * Resource handling. This is complicated by the fact that resources 738 * Resource handling. This is complicated by the fact that resources
768 * depend on the port type. Maybe we should be claiming the standard 739 * depend on the port type. Maybe we should be claiming the standard
@@ -899,7 +870,6 @@ static struct uart_ops m32r_sio_pops = {
899 .startup = m32r_sio_startup, 870 .startup = m32r_sio_startup,
900 .shutdown = m32r_sio_shutdown, 871 .shutdown = m32r_sio_shutdown,
901 .set_termios = m32r_sio_set_termios, 872 .set_termios = m32r_sio_set_termios,
902 .pm = m32r_sio_pm,
903 .release_port = m32r_sio_release_port, 873 .release_port = m32r_sio_release_port,
904 .request_port = m32r_sio_request_port, 874 .request_port = m32r_sio_request_port,
905 .config_port = m32r_sio_config_port, 875 .config_port = m32r_sio_config_port,
@@ -944,9 +914,6 @@ static void __init m32r_sio_register_ports(struct uart_driver *drv)
944 init_timer(&up->timer); 914 init_timer(&up->timer);
945 up->timer.function = m32r_sio_timeout; 915 up->timer.function = m32r_sio_timeout;
946 916
947 up->mcr_mask = ~0;
948 up->mcr_force = 0;
949
950 uart_add_one_port(drv, &up->port); 917 uart_add_one_port(drv, &up->port);
951 } 918 }
952} 919}