Commit a5fd8445 authored by Sascha Hauer's avatar Sascha Hauer Committed by Greg Kroah-Hartman

tty: serial: 8250_mtk: Use devm_clk_get

When a struct device * is present clk_get should be used rather
than of_clk_get. Use the devm variant of this function to be able to
drop the clk_put in the error and remove pathes. While at it fix
a wrong error message.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59f89f21
...@@ -131,18 +131,16 @@ static int mtk8250_probe_of(struct platform_device *pdev, struct uart_port *p, ...@@ -131,18 +131,16 @@ static int mtk8250_probe_of(struct platform_device *pdev, struct uart_port *p,
struct mtk8250_data *data) struct mtk8250_data *data)
{ {
int err; int err;
struct device_node *np = pdev->dev.of_node;
data->uart_clk = of_clk_get(np, 0); data->uart_clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(data->uart_clk)) { if (IS_ERR(data->uart_clk)) {
dev_warn(&pdev->dev, "Can't get timer clock\n"); dev_warn(&pdev->dev, "Can't get uart clock\n");
return PTR_ERR(data->uart_clk); return PTR_ERR(data->uart_clk);
} }
err = clk_prepare_enable(data->uart_clk); err = clk_prepare_enable(data->uart_clk);
if (err) { if (err) {
dev_warn(&pdev->dev, "Can't prepare clock\n"); dev_warn(&pdev->dev, "Can't prepare clock\n");
clk_put(data->uart_clk);
return err; return err;
} }
p->uartclk = clk_get_rate(data->uart_clk); p->uartclk = clk_get_rate(data->uart_clk);
...@@ -215,7 +213,6 @@ static int mtk8250_remove(struct platform_device *pdev) ...@@ -215,7 +213,6 @@ static int mtk8250_remove(struct platform_device *pdev)
serial8250_unregister_port(data->line); serial8250_unregister_port(data->line);
clk_disable_unprepare(data->uart_clk); clk_disable_unprepare(data->uart_clk);
clk_put(data->uart_clk);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev); pm_runtime_put_noidle(&pdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment