Make some cosmetic/stylistic (non-functional) improvements:
1. Use a DRV_NAME macro to avoid hard-coding "liteuart" in multiple
locations throughout the source file
2. Use bit numbers instead of magic constants for event flags
3. Remove stub uart_ops methods that are not called unconditionally
from serial_core; Document stubs that are required by serial_core
4. Don't set unused port->regshift and port->iobase fields gratuitously
during probe()
5. Improve coding style in liteuart_init()
Signed-off-by: Gabriel Somlo <gsomlo@xxxxxxxxx>
---
drivers/tty/serial/liteuart.c | 38 +++++++++--------------------------
1 file changed, 10 insertions(+), 28 deletions(-)
diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c
index 4c0604325ee9..4b9cca249828 100644
--- a/drivers/tty/serial/liteuart.c
+++ b/drivers/tty/serial/liteuart.c
@@ -18,6 +18,8 @@
#include <linux/tty_flip.h>
#include <linux/xarray.h>
+#define DRV_NAME "liteuart"
+
/*
* CSRs definitions (base address offsets + width)
*
@@ -38,8 +40,8 @@
#define OFF_EV_ENABLE 0x14
/* events */
-#define EV_TX 0x1
-#define EV_RX 0x2
+#define EV_TX BIT(0)
+#define EV_RX BIT(1)
struct liteuart_port {
struct uart_port port;
@@ -57,7 +59,7 @@ static struct console liteuart_console;
static struct uart_driver liteuart_driver = {
.owner = THIS_MODULE,
- .driver_name = "liteuart",
+ .driver_name = DRV_NAME,
.dev_name = "ttyLXU",
.major = 0,
.minor = 0,
@@ -122,6 +124,7 @@ static unsigned int liteuart_get_mctrl(struct uart_port *port)
static void liteuart_stop_tx(struct uart_port *port)
{
+ /* not used in LiteUART, but called unconditionally from serial_core */
}
static void liteuart_start_tx(struct uart_port *port)
@@ -154,11 +157,6 @@ static void liteuart_stop_rx(struct uart_port *port)
del_timer(&uart->timer);
}
-static void liteuart_break_ctl(struct uart_port *port, int break_state)
-{
- /* LiteUART doesn't support sending break signal */
-}
-
static int liteuart_startup(struct uart_port *port)
{
struct liteuart_port *uart = to_liteuart_port(port);
@@ -197,15 +195,6 @@ static const char *liteuart_type(struct uart_port *port)
return "liteuart";
}
-static void liteuart_release_port(struct uart_port *port)
-{
-}
-
-static int liteuart_request_port(struct uart_port *port)
-{
- return 0;
-}
-
static void liteuart_config_port(struct uart_port *port, int flags)
{
/*
@@ -232,13 +221,10 @@ static const struct uart_ops liteuart_ops = {
.stop_tx = liteuart_stop_tx,
.start_tx = liteuart_start_tx,
.stop_rx = liteuart_stop_rx,
- .break_ctl = liteuart_break_ctl,
.startup = liteuart_startup,
.shutdown = liteuart_shutdown,
.set_termios = liteuart_set_termios,
.type = liteuart_type,
- .release_port = liteuart_release_port,
- .request_port = liteuart_request_port,
.config_port = liteuart_config_port,
.verify_port = liteuart_verify_port,
};
@@ -280,9 +266,7 @@ static int liteuart_probe(struct platform_device *pdev)
port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF;
port->ops = &liteuart_ops;
- port->regshift = 2;
port->fifosize = 16;
- port->iobase = 1;
port->type = PORT_UNKNOWN;
port->line = dev_id;
spin_lock_init(&port->lock);
@@ -322,7 +306,7 @@ static struct platform_driver liteuart_platform_driver = {
.probe = liteuart_probe,
.remove = liteuart_remove,
.driver = {
- .name = "liteuart",
+ .name = DRV_NAME,
.of_match_table = liteuart_of_match,
},
};
@@ -368,7 +352,7 @@ static int liteuart_console_setup(struct console *co, char *options)
}
static struct console liteuart_console = {
- .name = "liteuart",
+ .name = DRV_NAME,
.write = liteuart_console_write,
.device = uart_console_device,
.setup = liteuart_console_setup,
@@ -416,12 +400,10 @@ static int __init liteuart_init(void)
return res;
res = platform_driver_register(&liteuart_platform_driver);
- if (res) {
+ if (res)
uart_unregister_driver(&liteuart_driver);
- return res;
- }
- return 0;
+ return res;
}
static void __exit liteuart_exit(void)
--
2.37.3
