tty: serial: 8250_mtk: remove unnecessary test
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 27 Apr 2015 06:49:54 +0000 (08:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 May 2015 20:27:02 +0000 (22:27 +0200)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_mtk.c

index 7a11fac775c4d18ff9db8d8642bed81036ad0644..1297827ca7dd62a8bb97af1133f37fbf0a344210 100644 (file)
@@ -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;
 }