From mboxrd@z Thu Jan 1 00:00:00 1970 From: Barry Song <21cnbao@gmail.com> Subject: [PATCH V2 1/3] serial: sirf: drop redundant pinctrl_get_select_default as pinctrl core does it Date: Thu, 15 Aug 2013 06:52:14 +0800 Message-ID: <1376520736-3838-1-git-send-email-Baohua.Song@csr.com> Return-path: Received: from mail-pb0-f49.google.com ([209.85.160.49]:48960 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933149Ab3HNWwe (ORCPT ); Wed, 14 Aug 2013 18:52:34 -0400 Received: by mail-pb0-f49.google.com with SMTP id xb4so65701pbc.36 for ; Wed, 14 Aug 2013 15:52:33 -0700 (PDT) Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: gregkh@linuxfoundation.org, linux-serial@vger.kernel.org Cc: workgroup.linux@csr.com, Barry Song , Linus Walleij pinctrl core will get default pinmux, so drop it in the sirfsoc serial driver. Cc: Linus Walleij Signed-off-by: Barry Song --- -v2: rebase to tty-next drivers/tty/serial/sirfsoc_uart.c | 16 +--------------- drivers/tty/serial/sirfsoc_uart.h | 1 - 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index d28f38b..d87003d 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -22,7 +22,6 @@ #include #include #include -#include #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 6f6d275..2b41b06 100644 --- 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; -- 1.8.2.3