diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2016-04-11 10:53:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 02:15:38 -0400 |
commit | 9220ebffda4aa23fe683c9ca6c94fb72d7c131c2 (patch) | |
tree | 28ce348eafc47e1f79689d9ccbef725bacae8703 | |
parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) |
Revert "serial-uartlite: Constify uartlite_be/uartlite_le"
This reverts commit 2905697a82eaf20606ced164d853b52d1b94aaa8.
The commit introduced two build warnings:
drivers/tty/serial/uartlite.c: In function ‘ulite_request_port’:
drivers/tty/serial/uartlite.c:348:21: warning: assignment discards
‘const’ qualifier from pointer target type
port->private_data = &uartlite_be;
^
drivers/tty/serial/uartlite.c:354:22: warning: assignment discards
‘const’ qualifier from pointer target type
port->private_data = &uartlite_le;
^
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Cc: Maarten Brock <m.brock@vanmierlo.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/uartlite.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c index c9fdfc8bf47f..d08baa668d5d 100644 --- a/drivers/tty/serial/uartlite.c +++ b/drivers/tty/serial/uartlite.c | |||
@@ -72,7 +72,7 @@ static void uartlite_outbe32(u32 val, void __iomem *addr) | |||
72 | iowrite32be(val, addr); | 72 | iowrite32be(val, addr); |
73 | } | 73 | } |
74 | 74 | ||
75 | static const struct uartlite_reg_ops uartlite_be = { | 75 | static struct uartlite_reg_ops uartlite_be = { |
76 | .in = uartlite_inbe32, | 76 | .in = uartlite_inbe32, |
77 | .out = uartlite_outbe32, | 77 | .out = uartlite_outbe32, |
78 | }; | 78 | }; |
@@ -87,21 +87,21 @@ static void uartlite_outle32(u32 val, void __iomem *addr) | |||
87 | iowrite32(val, addr); | 87 | iowrite32(val, addr); |
88 | } | 88 | } |
89 | 89 | ||
90 | static const struct uartlite_reg_ops uartlite_le = { | 90 | static struct uartlite_reg_ops uartlite_le = { |
91 | .in = uartlite_inle32, | 91 | .in = uartlite_inle32, |
92 | .out = uartlite_outle32, | 92 | .out = uartlite_outle32, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | static inline u32 uart_in32(u32 offset, struct uart_port *port) | 95 | static inline u32 uart_in32(u32 offset, struct uart_port *port) |
96 | { | 96 | { |
97 | const struct uartlite_reg_ops *reg_ops = port->private_data; | 97 | struct uartlite_reg_ops *reg_ops = port->private_data; |
98 | 98 | ||
99 | return reg_ops->in(port->membase + offset); | 99 | return reg_ops->in(port->membase + offset); |
100 | } | 100 | } |
101 | 101 | ||
102 | static inline void uart_out32(u32 val, u32 offset, struct uart_port *port) | 102 | static inline void uart_out32(u32 val, u32 offset, struct uart_port *port) |
103 | { | 103 | { |
104 | const struct uartlite_reg_ops *reg_ops = port->private_data; | 104 | struct uartlite_reg_ops *reg_ops = port->private_data; |
105 | 105 | ||
106 | reg_ops->out(val, port->membase + offset); | 106 | reg_ops->out(val, port->membase + offset); |
107 | } | 107 | } |