Skip to content

Commit

Permalink
tty: serial: 8250_mtk: remove unnecessary test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sascha Hauer authored and Greg Kroah-Hartman committed May 6, 2015
1 parent c547630 commit 59f89f2
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/tty/serial/8250/8250_mtk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit 59f89f2

Please sign in to comment.