Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a343756e authored by Barry Song's avatar Barry Song Committed by Greg Kroah-Hartman
Browse files

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: default avatarBarry Song <Baohua.Song@csr.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4a0ac0f5

drivers/tty/serial/sirfsoc_uart.c

+1 −15
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/mach/irq.h>

#include <asm/mach/irq.h>

#include <linux/pinctrl/consumer.h>





#include "sirfsoc_uart.h"

#include "sirfsoc_uart.h"
@@ -893,17 +892,10 @@ static int sirfsoc_uart_probe(struct platform_device *pdev) 
	}

	}

	port->irq = res->start;

	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);

	sirfport->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(sirfport->clk)) {

	if (IS_ERR(sirfport->clk)) {

		ret = PTR_ERR(sirfport->clk);

		ret = PTR_ERR(sirfport->clk);

		goto clk_err;

		goto err;

	}

	}

	clk_prepare_enable(sirfport->clk);

	clk_prepare_enable(sirfport->clk);

	port->uartclk = clk_get_rate(sirfport->clk);

	port->uartclk = clk_get_rate(sirfport->clk);
@@ -923,9 +915,6 @@ static int sirfsoc_uart_probe(struct platform_device *pdev) 
port_err:

port_err:

	clk_disable_unprepare(sirfport->clk);

	clk_disable_unprepare(sirfport->clk);

	clk_put(sirfport->clk);

	clk_put(sirfport->clk);

clk_err:

	if (sirfport->hw_flow_ctrl)

		pinctrl_put(sirfport->p);

err:

err:

	return ret;

	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 sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);

	struct uart_port *port = &sirfport->port;

	struct uart_port *port = &sirfport->port;



	if (sirfport->hw_flow_ctrl)

		pinctrl_put(sirfport->p);

	clk_disable_unprepare(sirfport->clk);

	clk_disable_unprepare(sirfport->clk);

	clk_put(sirfport->clk);

	clk_put(sirfport->clk);

	uart_remove_one_port(&sirfsoc_uart_drv, port);

	uart_remove_one_port(&sirfsoc_uart_drv, port);

drivers/tty/serial/sirfsoc_uart.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -367,7 +367,6 @@ struct sirfsoc_uart_port { 
	unsigned char			ms_enabled;

	unsigned char			ms_enabled;





	struct uart_port		port;

	struct uart_port		port;

	struct pinctrl			*p;

	struct clk			*clk;

	struct clk			*clk;

	/* for SiRFmarco, there are SET/CLR for UART_INT_EN */

	/* for SiRFmarco, there are SET/CLR for UART_INT_EN */

	bool				is_marco;

	bool				is_marco;