Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753813AbaFWMrK (ORCPT ); Mon, 23 Jun 2014 08:47:10 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:47917 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752542AbaFWMrJ (ORCPT ); Mon, 23 Jun 2014 08:47:09 -0400 Message-ID: <53A821B7.2000702@linaro.org> Date: Mon, 23 Jun 2014 13:46:47 +0100 From: Daniel Thompson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Tushar Behera , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, jslaby@suse.cz, gregkh@linuxfoundation.org, linux@arm.linux.org.uk CC: trblinux@gmail.com Subject: Re: [PATCH 2/2] serial: amba-pl010: Use devres APIs References: <1403503151-4166-1-git-send-email-tushar.b@samsung.com> <1403503151-4166-3-git-send-email-tushar.b@samsung.com> In-Reply-To: <1403503151-4166-3-git-send-email-tushar.b@samsung.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23/06/14 06:59, Tushar Behera wrote: > Migrating to use devres managed APIs devm_kzalloc, devm_ioremap and > devm_clk_get. > > Signed-off-by: Tushar Behera > --- > drivers/tty/serial/amba-pl010.c | 46 ++++++++++++++------------------------- > 1 file changed, 16 insertions(+), 30 deletions(-) > > diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c > index 971af1e..af8deba 100644 > --- a/drivers/tty/serial/amba-pl010.c > +++ b/drivers/tty/serial/amba-pl010.c > @@ -46,6 +46,7 @@ > #include > #include > #include > +#include > > #include Adding makes including redundant. > @@ -688,28 +689,22 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id) > if (amba_ports[i] == NULL) > break; > > - if (i == ARRAY_SIZE(amba_ports)) { > - ret = -EBUSY; > - goto out; > - } > + if (i == ARRAY_SIZE(amba_ports)) > + return -EBUSY; > > - uap = kzalloc(sizeof(struct uart_amba_port), GFP_KERNEL); > - if (!uap) { > - ret = -ENOMEM; > - goto out; > - } > + uap = devm_kzalloc(&dev->dev, sizeof(struct uart_amba_port), > + GFP_KERNEL); > + if (!uap) > + return -ENOMEM; > > - base = ioremap(dev->res.start, resource_size(&dev->res)); > - if (!base) { > - ret = -ENOMEM; > - goto free; > - } > + base = devm_ioremap(&dev->dev, dev->res.start, > + resource_size(&dev->res)); > + if (!base) > + return -ENOMEM; > > - uap->clk = clk_get(&dev->dev, NULL); > - if (IS_ERR(uap->clk)) { > - ret = PTR_ERR(uap->clk); > - goto unmap; > - } > + uap->clk = devm_clk_get(&dev->dev, NULL); > + if (IS_ERR(uap->clk)) > + return PTR_ERR(uap->clk); > > uap->port.dev = &dev->dev; > uap->port.mapbase = dev->res.start; > @@ -727,15 +722,9 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id) > > amba_set_drvdata(dev, uap); > ret = uart_add_one_port(&amba_reg, &uap->port); > - if (ret) { > + if (ret) > amba_ports[i] = NULL; > - clk_put(uap->clk); > - unmap: > - iounmap(base); > - free: > - kfree(uap); > - } > - out: > + > return ret; > } > > @@ -750,9 +739,6 @@ static int pl010_remove(struct amba_device *dev) > if (amba_ports[i] == uap) > amba_ports[i] = NULL; > > - iounmap(uap->port.membase); > - clk_put(uap->clk); > - kfree(uap); > return 0; > } Reviewed-by: Daniel Thompson -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/