From: Sascha Hauer Date: Mon, 27 Apr 2015 06:49:55 +0000 (+0200) Subject: tty: serial: 8250_mtk: Use devm_clk_get X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a5fd844599d635baa7e527549dc10896944aad77;p=openwrt%2Fstaging%2Fblogic.git 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: Sascha Hauer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index 1297827ca7dd..bcfaa8dcddd5 100644 --- a/drivers/tty/serial/8250/8250_mtk.c +++ b/drivers/tty/serial/8250/8250_mtk.c @@ -131,18 +131,16 @@ static int mtk8250_probe_of(struct platform_device *pdev, struct uart_port *p, struct mtk8250_data *data) { 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)) { - 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); } err = clk_prepare_enable(data->uart_clk); if (err) { dev_warn(&pdev->dev, "Can't prepare clock\n"); - clk_put(data->uart_clk); return err; } p->uartclk = clk_get_rate(data->uart_clk); @@ -215,7 +213,6 @@ static int mtk8250_remove(struct platform_device *pdev) serial8250_unregister_port(data->line); clk_disable_unprepare(data->uart_clk); - clk_put(data->uart_clk); pm_runtime_disable(&pdev->dev); pm_runtime_put_noidle(&pdev->dev);