From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Stephen Warren <swarren@wwwdotorg.org>
Cc: Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org
Subject: Re: [PATCH 3/3] spi: switch to devm_spi_alloc_master
Date: Fri, 31 Jan 2014 23:49:18 +0100 [thread overview]
Message-ID: <20140131224918.GJ2950@lukather> (raw)
In-Reply-To: <52EBCCCD.301@wwwdotorg.org>
[-- Attachment #1.1: Type: text/plain, Size: 1458 bytes --]
On Fri, Jan 31, 2014 at 09:18:21AM -0700, Stephen Warren wrote:
> On 01/31/2014 03:23 AM, Maxime Ripard wrote:
> > Make the existing users of devm_spi_register_master use the
> > devm_spi_alloc_master function to avoid leaking memory.
>
> > diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
>
> > @@ -1087,14 +1085,13 @@ static int tegra_spi_probe(struct platform_device *pdev)
> > if (ret < 0) {
> > dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n",
> > tspi->irq);
> > - goto exit_free_master;
> > + return ret;
> > }
> >
> > tspi->clk = devm_clk_get(&pdev->dev, "spi");
> > if (IS_ERR(tspi->clk)) {
> > dev_err(&pdev->dev, "can not get clock\n");
> > - ret = PTR_ERR(tspi->clk);
> > - goto exit_free_irq;
> > + return PTR_ERR(tspi->clk);
> > }
> >
> > tspi->max_buf_size = SPI_FIFO_DEPTH << 2;
> > @@ -1152,8 +1149,6 @@ exit_rx_dma_free:
> > tegra_spi_deinit_dma_param(tspi, true);
> > exit_free_irq:
> > free_irq(spi_irq, tspi);
> > -exit_free_master:
> > - spi_master_put(master);
> > return ret;
>
> Doesn't that s/goto exit_free_irq/return/ leak spi_irq? It's only OK to
> replace goto free_master with a direct return.
>
> The other two Tegra drivers don't seem to have this problem.
Ah, right. Thanks for noticing.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] spi: switch to devm_spi_alloc_master
Date: Fri, 31 Jan 2014 23:49:18 +0100 [thread overview]
Message-ID: <20140131224918.GJ2950@lukather> (raw)
In-Reply-To: <52EBCCCD.301@wwwdotorg.org>
On Fri, Jan 31, 2014 at 09:18:21AM -0700, Stephen Warren wrote:
> On 01/31/2014 03:23 AM, Maxime Ripard wrote:
> > Make the existing users of devm_spi_register_master use the
> > devm_spi_alloc_master function to avoid leaking memory.
>
> > diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
>
> > @@ -1087,14 +1085,13 @@ static int tegra_spi_probe(struct platform_device *pdev)
> > if (ret < 0) {
> > dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n",
> > tspi->irq);
> > - goto exit_free_master;
> > + return ret;
> > }
> >
> > tspi->clk = devm_clk_get(&pdev->dev, "spi");
> > if (IS_ERR(tspi->clk)) {
> > dev_err(&pdev->dev, "can not get clock\n");
> > - ret = PTR_ERR(tspi->clk);
> > - goto exit_free_irq;
> > + return PTR_ERR(tspi->clk);
> > }
> >
> > tspi->max_buf_size = SPI_FIFO_DEPTH << 2;
> > @@ -1152,8 +1149,6 @@ exit_rx_dma_free:
> > tegra_spi_deinit_dma_param(tspi, true);
> > exit_free_irq:
> > free_irq(spi_irq, tspi);
> > -exit_free_master:
> > - spi_master_put(master);
> > return ret;
>
> Doesn't that s/goto exit_free_irq/return/ leak spi_irq? It's only OK to
> replace goto free_master with a direct return.
>
> The other two Tegra drivers don't seem to have this problem.
Ah, right. Thanks for noticing.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140131/282a6769/attachment.sig>
WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Stephen Warren <swarren@wwwdotorg.org>
Cc: Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/3] spi: switch to devm_spi_alloc_master
Date: Fri, 31 Jan 2014 23:49:18 +0100 [thread overview]
Message-ID: <20140131224918.GJ2950@lukather> (raw)
In-Reply-To: <52EBCCCD.301@wwwdotorg.org>
[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]
On Fri, Jan 31, 2014 at 09:18:21AM -0700, Stephen Warren wrote:
> On 01/31/2014 03:23 AM, Maxime Ripard wrote:
> > Make the existing users of devm_spi_register_master use the
> > devm_spi_alloc_master function to avoid leaking memory.
>
> > diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
>
> > @@ -1087,14 +1085,13 @@ static int tegra_spi_probe(struct platform_device *pdev)
> > if (ret < 0) {
> > dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n",
> > tspi->irq);
> > - goto exit_free_master;
> > + return ret;
> > }
> >
> > tspi->clk = devm_clk_get(&pdev->dev, "spi");
> > if (IS_ERR(tspi->clk)) {
> > dev_err(&pdev->dev, "can not get clock\n");
> > - ret = PTR_ERR(tspi->clk);
> > - goto exit_free_irq;
> > + return PTR_ERR(tspi->clk);
> > }
> >
> > tspi->max_buf_size = SPI_FIFO_DEPTH << 2;
> > @@ -1152,8 +1149,6 @@ exit_rx_dma_free:
> > tegra_spi_deinit_dma_param(tspi, true);
> > exit_free_irq:
> > free_irq(spi_irq, tspi);
> > -exit_free_master:
> > - spi_master_put(master);
> > return ret;
>
> Doesn't that s/goto exit_free_irq/return/ leak spi_irq? It's only OK to
> replace goto free_master with a direct return.
>
> The other two Tegra drivers don't seem to have this problem.
Ah, right. Thanks for noticing.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-01-31 22:49 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-31 10:23 [PATCH 0/3] spi: core: Introduce devm_spi_alloc_master Maxime Ripard
2014-01-31 10:23 ` Maxime Ripard
2014-01-31 10:23 ` [PATCH 1/3] spi: core: Add devm_spi_alloc_master Maxime Ripard
2014-01-31 10:23 ` Maxime Ripard
2014-01-31 10:23 ` [PATCH 2/3] spi: core: Update the devm_spi_register_master documentation Maxime Ripard
2014-01-31 10:23 ` Maxime Ripard
2014-01-31 10:23 ` Maxime Ripard
2014-01-31 10:23 ` [PATCH 3/3] spi: switch to devm_spi_alloc_master Maxime Ripard
2014-01-31 10:23 ` Maxime Ripard
[not found] ` <1391163792-21819-4-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2014-01-31 16:18 ` Stephen Warren
2014-01-31 16:18 ` Stephen Warren
2014-01-31 16:18 ` Stephen Warren
2014-01-31 22:49 ` Maxime Ripard [this message]
2014-01-31 22:49 ` Maxime Ripard
2014-01-31 22:49 ` Maxime Ripard
2014-02-02 12:33 ` Gerhard Sittig
2014-02-02 12:33 ` Gerhard Sittig
2014-02-02 12:33 ` Gerhard Sittig
[not found] ` <1391163792-21819-1-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2014-01-31 12:12 ` [PATCH 0/3] spi: core: Introduce devm_spi_alloc_master Mark Brown
2014-01-31 12:12 ` Mark Brown
2014-01-31 12:12 ` Mark Brown
2014-01-31 13:31 ` Maxime Ripard
2014-01-31 13:31 ` Maxime Ripard
2014-02-01 17:38 ` Mark Brown
2014-02-01 17:38 ` Mark Brown
2014-02-01 17:38 ` Mark Brown
2014-02-02 14:54 ` Maxime Ripard
2014-02-02 14:54 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140131224918.GJ2950@lukather \
--to=maxime.ripard@free-electrons.com \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=swarren@wwwdotorg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.