From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932171AbbD0GdQ (ORCPT ); Mon, 27 Apr 2015 02:33:16 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:37764 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932121AbbD0GdF (ORCPT ); Mon, 27 Apr 2015 02:33:05 -0400 Date: Mon, 27 Apr 2015 08:33:01 +0200 From: Sascha Hauer To: Matthias Brugger Cc: Greg KH , "linux-kernel@vger.kernel.org" , linux-mediatek@lists.infradead.org, linux-serial@vger.kernel.org, "linux-arm-kernel@lists.infradead.org" , Alan Cox Subject: Re: [PATCH 1/4] tty: serial: 8250_mtk: Use devm_clk_get Message-ID: <20150427063301.GW6325@pengutronix.de> References: <1429779066-21406-1-git-send-email-s.hauer@pengutronix.de> <1429779066-21406-2-git-send-email-s.hauer@pengutronix.de> <20150424103151.GP6325@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:10:55 up 41 days, 18:02, 69 users, load average: 0.33, 0.18, 0.16 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 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 On Fri, Apr 24, 2015 at 12:53:08PM +0200, Matthias Brugger wrote: > 2015-04-24 12:31 GMT+02:00 Sascha Hauer : > > On Fri, Apr 24, 2015 at 12:28:33PM +0200, Matthias Brugger wrote: > >> 2015-04-23 10:51 GMT+02:00 Sascha Hauer : > >> > 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); > >> > } > >> > >> Please delete the braces. > > > > The if() is removed completly in the next patch anyway. > > You are right. I propose to merge patch 2 and 3, so you get a clean code. Patches 1 and 2 are different topics, I see no reason merging them. I changed the order of the two patches, maybe this makes it better readable. > On the way, can you have a look on the commit message? For me it is > not clear what you want to say. Changed to: 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. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |