Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[~andy/linux] / drivers / tty / serial / pxa.c

diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 05f504e0c27144b04b3b56b075256e6a20f5d4b9..f9f20f38376003efc35691196e3baae6dae2c2da 100644 (file)
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -332,31 +332,6 @@ static void serial_pxa_break_ctl(struct uart_port *port, int break_state)
        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-#if 0
-static void serial_pxa_dma_init(struct pxa_uart *up)
-{
-       up->rxdma =
-               pxa_request_dma(up->name, DMA_PRIO_LOW, pxa_receive_dma, up);
-       if (up->rxdma < 0)
-               goto out;
-       up->txdma =
-               pxa_request_dma(up->name, DMA_PRIO_LOW, pxa_transmit_dma, up);
-       if (up->txdma < 0)
-               goto err_txdma;
-       up->dmadesc = kmalloc(4 * sizeof(pxa_dma_desc), GFP_KERNEL);
-       if (!up->dmadesc)
-               goto err_alloc;
-
-       /* ... */
-err_alloc:
-       pxa_free_dma(up->txdma);
-err_rxdma:
-       pxa_free_dma(up->rxdma);
-out:
-       return;
-}
-#endif
-
 static int serial_pxa_startup(struct uart_port *port)
 {
        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
@@ -790,7 +765,7 @@ static struct console serial_pxa_console = {
 #define PXA_CONSOLE    NULL
 #endif
 
-struct uart_ops serial_pxa_pops = {
+static struct uart_ops serial_pxa_pops = {
        .tx_empty       = serial_pxa_tx_empty,
        .set_mctrl      = serial_pxa_set_mctrl,
        .get_mctrl      = serial_pxa_get_mctrl,
@@ -945,8 +920,6 @@ static int serial_pxa_remove(struct platform_device *dev)
 {
        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
-       platform_set_drvdata(dev, NULL);
-
        uart_remove_one_port(&serial_pxa_reg, &sport->port);
 
        clk_unprepare(sport->clk);
@@ -970,7 +943,7 @@ static struct platform_driver serial_pxa_driver = {
        },
 };
 
-int __init serial_pxa_init(void)
+static int __init serial_pxa_init(void)
 {
        int ret;
 
@@ -985,7 +958,7 @@ int __init serial_pxa_init(void)
        return ret;
 }
 
-void __exit serial_pxa_exit(void)
+static void __exit serial_pxa_exit(void)
 {
        platform_driver_unregister(&serial_pxa_driver);
        uart_unregister_driver(&serial_pxa_reg);