From mboxrd@z Thu Jan 1 00:00:00 1970 From: Domenico Andreoli Subject: Re: [PATCH RESEND] serial/amba-pl011: use devm_* managed resources Date: Tue, 16 Oct 2012 06:34:30 +0200 Message-ID: <20121016043430.GA24258@glitch> References: <1350300961-7036-1-git-send-email-linus.walleij@stericsson.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-wi0-f172.google.com ([209.85.212.172]:43179 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755655Ab2JPEef (ORCPT ); Tue, 16 Oct 2012 00:34:35 -0400 Received: by mail-wi0-f172.google.com with SMTP id hq12so2981605wib.1 for ; Mon, 15 Oct 2012 21:34:34 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1350300961-7036-1-git-send-email-linus.walleij@stericsson.com> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: Linus Walleij Cc: linux-serial@vger.kernel.org, Greg Kroah-Hartman , Anmar Oueja , Linus Walleij , linux-arm-kernel@lists.infradead.org On Mon, Oct 15, 2012 at 01:36:01PM +0200, Linus Walleij wrote: > From: Linus Walleij > > This switches a bunch of allocation and remapping to use the > devm_* garbage collected methods and cleans up the error > path and remove() paths consequently. > > devm_ioremap() is only in so fix up the > erroneous include as well. > > Signed-off-by: Linus Walleij > --- > drivers/tty/serial/amba-pl011.c | 25 +++++++++---------------- > 1 file changed, 9 insertions(+), 16 deletions(-) > > diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c > index d7e1ede..7fca402 100644 > --- a/drivers/tty/serial/amba-pl011.c > +++ b/drivers/tty/serial/amba-pl011.c > @@ -56,8 +56,7 @@ > #include > #include > #include > - > -#include > +#include > > #define UART_NR 14 > > @@ -1973,7 +1972,8 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) > goto out; > } > > - uap = kzalloc(sizeof(struct uart_amba_port), GFP_KERNEL); > + uap = devm_kzalloc(&dev->dev, sizeof(struct uart_amba_port), > + GFP_KERNEL); > if (uap == NULL) { > ret = -ENOMEM; > goto out; > @@ -1981,16 +1981,17 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) > > i = pl011_probe_dt_alias(i, &dev->dev); > > - base = ioremap(dev->res.start, resource_size(&dev->res)); > + base = devm_ioremap(&dev->dev, dev->res.start, > + resource_size(&dev->res)); > if (!base) { > ret = -ENOMEM; > - goto free; > + goto out; > } > > uap->pinctrl = devm_pinctrl_get(&dev->dev); > if (IS_ERR(uap->pinctrl)) { > ret = PTR_ERR(uap->pinctrl); > - goto unmap; > + goto out; > } > uap->pins_default = pinctrl_lookup_state(uap->pinctrl, > PINCTRL_STATE_DEFAULT); > @@ -2002,10 +2003,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) > if (IS_ERR(uap->pins_sleep)) > dev_dbg(&dev->dev, "could not get sleep pinstate\n"); > > - uap->clk = clk_get(&dev->dev, NULL); > + uap->clk = devm_clk_get(&dev->dev, NULL); > if (IS_ERR(uap->clk)) { > ret = PTR_ERR(uap->clk); > - goto unmap; > + goto out; > } > > uap->vendor = vendor; > @@ -2038,11 +2039,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) > amba_set_drvdata(dev, NULL); > amba_ports[i] = NULL; > pl011_dma_remove(uap); > - clk_put(uap->clk); > - unmap: > - iounmap(base); > - free: > - kfree(uap); > } > out: > return ret; > @@ -2062,9 +2058,6 @@ static int pl011_remove(struct amba_device *dev) > amba_ports[i] = NULL; > > pl011_dma_remove(uap); > - iounmap(uap->port.membase); > - clk_put(uap->clk); > - kfree(uap); > return 0; > } > Tested-by: Domenico Andreoli Thanks, Domenido