Thread (13 messages) 13 messages, 2 authors, 2015-05-08

[PATCH 1/4] tty: serial: 8250_mtk: remove unnecessary test

From: matthias.bgg@gmail.com (Matthias Brugger)
Date: 2015-05-04 09:32:19
Also in: linux-mediatek, linux-serial, lkml

2015-04-27 8:49 GMT+02:00 Sascha Hauer [off-list ref]:
When the driver has probed successfully the clk pointer is always valid,
so no need to test for it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/tty/serial/8250/8250_mtk.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
quoted hunk ↗ jump to hunk
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index 7a11fac..1297827 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -214,10 +214,8 @@ static int mtk8250_remove(struct platform_device *pdev)
        pm_runtime_get_sync(&pdev->dev);

        serial8250_unregister_port(data->line);
-       if (!IS_ERR(data->uart_clk)) {
-               clk_disable_unprepare(data->uart_clk);
-               clk_put(data->uart_clk);
-       }
+       clk_disable_unprepare(data->uart_clk);
+       clk_put(data->uart_clk);

        pm_runtime_disable(&pdev->dev);
        pm_runtime_put_noidle(&pdev->dev);
@@ -249,8 +247,7 @@ static int mtk8250_runtime_suspend(struct device *dev)
 {
        struct mtk8250_data *data = dev_get_drvdata(dev);

-       if (!IS_ERR(data->uart_clk))
-               clk_disable_unprepare(data->uart_clk);
+       clk_disable_unprepare(data->uart_clk);

        return 0;
 }
@@ -259,8 +256,7 @@ static int mtk8250_runtime_resume(struct device *dev)
 {
        struct mtk8250_data *data = dev_get_drvdata(dev);

-       if (!IS_ERR(data->uart_clk))
-               clk_prepare_enable(data->uart_clk);
+       clk_prepare_enable(data->uart_clk);

        return 0;
 }
--
2.1.4


-- 
motzblog.wordpress.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help