From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757618AbbDWIwN (ORCPT ); Thu, 23 Apr 2015 04:52:13 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:53179 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754294AbbDWIwI (ORCPT ); Thu, 23 Apr 2015 04:52:08 -0400 From: Sascha Hauer To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, Matthias Brugger , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, Alan Cox , Sascha Hauer Subject: [PATCH 1/4] tty: serial: 8250_mtk: Use devm_clk_get Date: Thu, 23 Apr 2015 10:51:03 +0200 Message-Id: <1429779066-21406-2-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1429779066-21406-1-git-send-email-s.hauer@pengutronix.de> References: <1429779066-21406-1-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just because of_clk_get() doesn't mean it should be used. Use devm_clk_get which is the correct function when a struct device * is available. Also since it's a devm function we can drop the calls to clk_put(). While at it also fix a wrong debug message. Signed-off-by: Sascha Hauer --- drivers/tty/serial/8250/8250_mtk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index 7a11fac..c6901dc 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); @@ -216,7 +214,6 @@ static int mtk8250_remove(struct platform_device *pdev) serial8250_unregister_port(data->line); if (!IS_ERR(data->uart_clk)) { clk_disable_unprepare(data->uart_clk); - clk_put(data->uart_clk); } pm_runtime_disable(&pdev->dev); -- 2.1.4