aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/sirfsoc_uart.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-06-24 21:08:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-26 18:39:36 -0400
commit43b829b3c1aa8d4f748a8e68724df476d242365a (patch)
tree22c2de2529047a224eaab8526634a6e6eb23abec /drivers/tty/serial/sirfsoc_uart.c
parent74b3b4cd80f43b094b5cb78e73bf612383d80749 (diff)
serial: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Barry Song <baohua.song@csr.com> Acked-by: Tony Prisk <linux@prisktech.co.nz> Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/sirfsoc_uart.c')
-rw-r--r--drivers/tty/serial/sirfsoc_uart.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 1fd564b8194b..67a0d1b8341c 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -717,7 +717,6 @@ port_err:
717 clk_disable_unprepare(sirfport->clk); 717 clk_disable_unprepare(sirfport->clk);
718 clk_put(sirfport->clk); 718 clk_put(sirfport->clk);
719clk_err: 719clk_err:
720 platform_set_drvdata(pdev, NULL);
721 if (sirfport->hw_flow_ctrl) 720 if (sirfport->hw_flow_ctrl)
722 pinctrl_put(sirfport->p); 721 pinctrl_put(sirfport->p);
723err: 722err:
@@ -728,7 +727,7 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
728{ 727{
729 struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev); 728 struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
730 struct uart_port *port = &sirfport->port; 729 struct uart_port *port = &sirfport->port;
731 platform_set_drvdata(pdev, NULL); 730
732 if (sirfport->hw_flow_ctrl) 731 if (sirfport->hw_flow_ctrl)
733 pinctrl_put(sirfport->p); 732 pinctrl_put(sirfport->p);
734 clk_disable_unprepare(sirfport->clk); 733 clk_disable_unprepare(sirfport->clk);