tty: serial: msm: Add msm prefix to all driver functions

Make function naming consistent across this driver.
Also rename msm_irq to msm_uart_irq. No functional changes.

Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index d08cfd3e1c3af38bf7b6767d0bef2feb3460c6ba..2315a614ff4510ed0ec2919b8a4ac9ac0b9abce5 100644 (file)
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -57,7 +57,7 @@ struct msm_port {
        bool                    break_detected;
 };
 
-static inline void wait_for_xmitr(struct uart_port *port)
+static inline void msm_wait_for_xmitr(struct uart_port *port)
 {
        while (!(msm_read(port, UART_SR) & UART_SR_TX_EMPTY)) {
                if (msm_read(port, UART_ISR) & UART_ISR_TX_READY)
@@ -99,7 +99,7 @@ static void msm_enable_ms(struct uart_port *port)
        msm_write(port, msm_port->imr, UART_IMR);
 }
 
-static void handle_rx_dm(struct uart_port *port, unsigned int misr)
+static void msm_handle_rx_dm(struct uart_port *port, unsigned int misr)
 {
        struct tty_port *tport = &port->state->port;
        unsigned int sr;
@@ -171,7 +171,7 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr)
        msm_write(port, UART_CR_CMD_STALE_EVENT_ENABLE, UART_CR);
 }
 
-static void handle_rx(struct uart_port *port)
+static void msm_handle_rx(struct uart_port *port)
 {
        struct tty_port *tport = &port->state->port;
        unsigned int sr;
@@ -224,14 +224,14 @@ static void handle_rx(struct uart_port *port)
        spin_lock(&port->lock);
 }
 
-static void reset_dm_count(struct uart_port *port, int count)
+static void msm_reset_dm_count(struct uart_port *port, int count)
 {
-       wait_for_xmitr(port);
+       msm_wait_for_xmitr(port);
        msm_write(port, count, UARTDM_NCF_TX);
        msm_read(port, UARTDM_NCF_TX);
 }
 
-static void handle_tx(struct uart_port *port)
+static void msm_handle_tx(struct uart_port *port)
 {
        struct circ_buf *xmit = &port->state->xmit;
        struct msm_port *msm_port = UART_TO_MSM(port);
@@ -250,13 +250,13 @@ static void handle_tx(struct uart_port *port)
 
        if (port->x_char) {
                if (msm_port->is_uartdm)
-                       reset_dm_count(port, tx_count + 1);
+                       msm_reset_dm_count(port, tx_count + 1);
 
                iowrite8_rep(tf, &port->x_char, 1);
                port->icount.tx++;
                port->x_char = 0;
        } else if (tx_count && msm_port->is_uartdm) {
-               reset_dm_count(port, tx_count);
+               msm_reset_dm_count(port, tx_count);
        }
 
        while (tf_pointer < tx_count) {
@@ -290,14 +290,14 @@ static void handle_tx(struct uart_port *port)
                uart_write_wakeup(port);
 }
 
-static void handle_delta_cts(struct uart_port *port)
+static void msm_handle_delta_cts(struct uart_port *port)
 {
        msm_write(port, UART_CR_CMD_RESET_CTS, UART_CR);
        port->icount.cts++;
        wake_up_interruptible(&port->state->port.delta_msr_wait);
 }
 
-static irqreturn_t msm_irq(int irq, void *dev_id)
+static irqreturn_t msm_uart_irq(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
        struct msm_port *msm_port = UART_TO_MSM(port);
@@ -314,14 +314,14 @@ static irqreturn_t msm_irq(int irq, void *dev_id)
 
        if (misr & (UART_IMR_RXLEV | UART_IMR_RXSTALE)) {
                if (msm_port->is_uartdm)
-                       handle_rx_dm(port, misr);
+                       msm_handle_rx_dm(port, misr);
                else
-                       handle_rx(port);
+                       msm_handle_rx(port);
        }
        if (misr & UART_IMR_TXLEV)
-               handle_tx(port);
+               msm_handle_tx(port);
        if (misr & UART_IMR_DELTA_CTS)
-               handle_delta_cts(port);
+               msm_handle_delta_cts(port);
 
        msm_write(port, msm_port->imr, UART_IMR); /* restore interrupt */
        spin_unlock(&port->lock);
@@ -489,7 +489,7 @@ static int msm_startup(struct uart_port *port)
        snprintf(msm_port->name, sizeof(msm_port->name),
                 "msm_serial%d", port->line);
 
-       ret = request_irq(port->irq, msm_irq, IRQF_TRIGGER_HIGH,
+       ret = request_irq(port->irq, msm_uart_irq, IRQF_TRIGGER_HIGH,
                          msm_port->name, port);
        if (unlikely(ret))
                return ret;
@@ -779,7 +779,7 @@ static void msm_poll_put_char(struct uart_port *port, unsigned char c)
        msm_write(port, 0, UART_IMR);
 
        if (msm_port->is_uartdm)
-               reset_dm_count(port, 1);
+               msm_reset_dm_count(port, 1);
 
        /* Wait until FIFO is empty */
        while (!(msm_read(port, UART_SR) & UART_SR_TX_READY))
@@ -853,7 +853,7 @@ static struct msm_port msm_uart_ports[] = {
 
 #define UART_NR        ARRAY_SIZE(msm_uart_ports)
 
-static inline struct uart_port *get_port_from_line(unsigned int line)
+static inline struct uart_port *msm_get_port_from_line(unsigned int line)
 {
        return &msm_uart_ports[line].uart;
 }
@@ -880,7 +880,7 @@ static void __msm_console_write(struct uart_port *port, const char *s,
 
        spin_lock(&port->lock);
        if (is_uartdm)
-               reset_dm_count(port, count);
+               msm_reset_dm_count(port, count);
 
        i = 0;
        while (i < count) {
@@ -925,7 +925,7 @@ static void msm_console_write(struct console *co, const char *s,
 
        BUG_ON(co->index < 0 || co->index >= UART_NR);
 
-       port = get_port_from_line(co->index);
+       port = msm_get_port_from_line(co->index);
        msm_port = UART_TO_MSM(port);
 
        __msm_console_write(port, s, count, msm_port->is_uartdm);
@@ -942,7 +942,7 @@ static int __init msm_console_setup(struct console *co, char *options)
        if (unlikely(co->index >= UART_NR || co->index < 0))
                return -ENXIO;
 
-       port = get_port_from_line(co->index);
+       port = msm_get_port_from_line(co->index);
 
        if (unlikely(!port->membase))
                return -ENXIO;
@@ -1057,7 +1057,7 @@ static int msm_serial_probe(struct platform_device *pdev)
 
        dev_info(&pdev->dev, "msm_serial: detected port #%d\n", line);
 
-       port = get_port_from_line(line);
+       port = msm_get_port_from_line(line);
        port->dev = &pdev->dev;
        msm_port = UART_TO_MSM(port);