From 5c9bdc3f52d20c9bc6c2552c6d3ec5bfa4119f75 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 16 Feb 2012 19:36:21 +0100 Subject: serial/sirf: fixup for changes to pin control We changed the signature of the pin multiplexing functions to handle any pin business, so fix up the Sirf driver to call this new interface and rename some variables to make the semantics understandable. Cc: linux-serial@vger.kernel.org Acked-by: Greg Kroah-Hartman Acked-by: Barry Song Signed-off-by: Linus Walleij --- drivers/tty/serial/sirfsoc_uart.c | 20 ++++++++++---------- drivers/tty/serial/sirfsoc_uart.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers/tty') diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index a60523fee11b..c1a871eac450 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #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, NULL); + 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); diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h index fc64260fa93c..6e207fdc2fed 100644 --- a/drivers/tty/serial/sirfsoc_uart.h +++ b/drivers/tty/serial/sirfsoc_uart.h @@ -162,7 +162,7 @@ struct sirfsoc_uart_port { unsigned char ms_enabled; struct uart_port port; - struct pinmux *pmx; + struct pinctrl *p; }; /* Hardware Flow Control */ -- cgit v1.2.3