pinctrl: assume map table entries can't have a NULL name field

[deliverable/linux.git] / drivers / tty / serial / sirfsoc_uart.c

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index a60523fee11bc27c9438809493cd7c0e8a869696..3cabb650a1c10a5e0f33aa1d4b3a1eab4a113f85 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -22,7 +22,7 @@
 #include <linux/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <linux/pinctrl/pinmux.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "sirfsoc_uart.h"
 
@@ -673,12 +673,12 @@ int sirfsoc_uart_probe(struct platform_device *pdev)
        port->irq = res->start;
 
        if (sirfport->hw_flow_ctrl) {
-               sirfport->pmx = pinmux_get(&pdev->dev, NULL);
-               ret = IS_ERR(sirfport->pmx);
+               sirfport->p = pinctrl_get(&pdev->dev, PINCTRL_STATE_DEFAULT);
+               ret = IS_ERR(sirfport->p);
                if (ret)
-                       goto pmx_err;
+                       goto pin_err;
 
-               pinmux_enable(sirfport->pmx);
+               pinctrl_enable(sirfport->p);
        }
 
        port->ops = &sirfsoc_uart_ops;
@@ -696,10 +696,10 @@ int sirfsoc_uart_probe(struct platform_device *pdev)
 port_err:
        platform_set_drvdata(pdev, NULL);
        if (sirfport->hw_flow_ctrl) {
-               pinmux_disable(sirfport->pmx);
-               pinmux_put(sirfport->pmx);
+               pinctrl_disable(sirfport->p);
+               pinctrl_put(sirfport->p);
        }
-pmx_err:
+pin_err:
 irq_err:
        devm_iounmap(&pdev->dev, port->membase);
 err:
@@ -712,8 +712,8 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
        struct uart_port *port = &sirfport->port;
        platform_set_drvdata(pdev, NULL);
        if (sirfport->hw_flow_ctrl) {
-               pinmux_disable(sirfport->pmx);
-               pinmux_put(sirfport->pmx);
+               pinctrl_disable(sirfport->p);
+               pinctrl_put(sirfport->p);
        }
        devm_iounmap(&pdev->dev, port->membase);
        uart_remove_one_port(&sirfsoc_uart_drv, port);