summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/8250/8250_mtk.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-04-27 08:49:54 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-06 22:27:02 +0200
commit59f89f21b5f34b50584a218734d2b9cc1efd8c0c (patch)
treed96c4ea269b68f995e60bdc174c3b795c7e1bd91 /drivers/tty/serial/8250/8250_mtk.c
parentc547630f6b5cfebf211b313d7c1f54794ac013f0 (diff)
tty: serial: 8250_mtk: remove unnecessary test
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>
Diffstat (limited to 'drivers/tty/serial/8250/8250_mtk.c')
-rw-r--r--drivers/tty/serial/8250/8250_mtk.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index 7a11fac775c4..1297827ca7dd 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;
}