serial: sirf: drop redundant pinctrl_get_select_default as pinctrl core does it

pinctrl core will get default pinmux, so drop it in the sirfsoc serial driver.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index d28f38b83332accf0b8ee7ed35e1755e792d1f4e..d87003d49c05f604e7f7520ea6ea58ab29468eee 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -22,7 +22,6 @@
 #include <linux/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <linux/pinctrl/consumer.h>
 
 #include "sirfsoc_uart.h"
 
@@ -893,17 +892,10 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
        }
        port->irq = res->start;
 
-       if (sirfport->hw_flow_ctrl) {
-               sirfport->p = pinctrl_get_select_default(&pdev->dev);
-               ret = IS_ERR(sirfport->p);
-               if (ret)
-                       goto err;
-       }
-
        sirfport->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(sirfport->clk)) {
                ret = PTR_ERR(sirfport->clk);
-               goto clk_err;
+               goto err;
        }
        clk_prepare_enable(sirfport->clk);
        port->uartclk = clk_get_rate(sirfport->clk);
@@ -923,9 +915,6 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
 port_err:
        clk_disable_unprepare(sirfport->clk);
        clk_put(sirfport->clk);
-clk_err:
-       if (sirfport->hw_flow_ctrl)
-               pinctrl_put(sirfport->p);
 err:
        return ret;
 }
@@ -934,9 +923,6 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
 {
        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
        struct uart_port *port = &sirfport->port;
-
-       if (sirfport->hw_flow_ctrl)
-               pinctrl_put(sirfport->p);
        clk_disable_unprepare(sirfport->clk);
        clk_put(sirfport->clk);
        uart_remove_one_port(&sirfsoc_uart_drv, port);

diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h
index 6f6d27547844fb63beb36168c0ece02f881a7456..2b41b06362df9fd6cdcd667408e2934a5af27fd6 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.h
+++ b/drivers/tty/serial/sirfsoc_uart.h
@@ -367,7 +367,6 @@ struct sirfsoc_uart_port {
        unsigned char                   ms_enabled;
 
        struct uart_port                port;
-       struct pinctrl                  *p;
        struct clk                      *clk;
        /* for SiRFmarco, there are SET/CLR for UART_INT_EN */
        bool                            is_marco;