rk_serial: fix compilation warning

diff --git a/drivers/tty/serial/rk_serial.c b/drivers/tty/serial/rk_serial.c
index d7c1cb9c45e97666dc1fe2643b6278d765620592..1f1f61d43a163ef34c048495b1ad025ec7cc9c45 100644 (file)
--- a/drivers/tty/serial/rk_serial.c
+++ b/drivers/tty/serial/rk_serial.c
@@ -1602,21 +1602,19 @@ static void
 serial_rk_pm(struct uart_port *port, unsigned int state,\r
              unsigned int oldstate)\r
 {\r
+#ifdef CONFIG_CLOCK_CTRL\r
        struct uart_rk_port *up =\r
                container_of(port, struct uart_rk_port, port);\r
 \r
        dev_dbg(port->dev, "%s: %s\n", __func__, state ? "disable" : "enable");\r
        if (state) {\r
-#ifdef CONFIG_CLOCK_CTRL\r
        clk_disable_unprepare(up->clk);\r
        clk_disable_unprepare(up->pclk); \r
-#endif\r
        } else {\r
-#ifdef CONFIG_CLOCK_CTRL\r
        clk_prepare_enable(up->clk);\r
        clk_prepare_enable(up->pclk); \r
-#endif\r
        }\r
+#endif\r
 }\r
 \r
 static void serial_rk_release_port(struct uart_port *port)\r
@@ -2001,7 +1999,7 @@ static int serial_rk_probe(struct platform_device *pdev)
                        dev_info(up->port.dev, "dmam_alloc_coherent dma_rx_buffer fail\n");\r
                }\r
                else {\r
-                       dev_info(up->port.dev, "dma_rx_buffer 0x%08x\n", (unsigned) up->dma->rx_buffer);\r
+                       dev_info(up->port.dev, "dma_rx_buffer %p\n", up->dma->rx_buffer);\r
                        dev_info(up->port.dev, "dma_rx_phy 0x%08x\n", (unsigned)up->dma->rx_phy_addr);\r
                }\r
 \r
@@ -2022,7 +2020,7 @@ static int serial_rk_probe(struct platform_device *pdev)
                        dev_info(up->port.dev, "dmam_alloc_coherent dma_tx_buffer fail\n");\r
                }\r
                else{\r
-                       dev_info(up->port.dev, "dma_tx_buffer 0x%08x\n", (unsigned) up->dma->tx_buffer);\r
+                       dev_info(up->port.dev, "dma_tx_buffer %p\n", up->dma->tx_buffer);\r
                        dev_info(up->port.dev, "dma_tx_phy 0x%08x\n", (unsigned) up->dma->tx_phy_addr);\r
                }\r
                spin_lock_init(&(up->dma->tx_lock));\r
@@ -2036,7 +2034,7 @@ static int serial_rk_probe(struct platform_device *pdev)
        if (ret != 0)\r
                return ret;\r
        platform_set_drvdata(pdev, up);\r
-       dev_info(&pdev->dev, "membase 0x%08x\n", (unsigned) up->port.membase);\r
+       dev_info(&pdev->dev, "membase %p\n", up->port.membase);\r
 #if USE_WAKEUP\r
        serial_rk_setup_wakeup_irq(up); \r
 #endif\r