From: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
To: "christophe.leroy@c-s.fr" <christophe.leroy@c-s.fr>,
"broonie@kernel.org" <broonie@kernel.org>
Cc: "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"lkp@intel.com" <lkp@intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>,
"geert@linux-m68k.org" <geert@linux-m68k.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH v3] spi: fsl: simplify error path in of_fsl_spi_probe()
Date: Tue, 14 Jan 2020 16:26:18 +0000 [thread overview]
Message-ID: <b6d01fa02e659db911df63a79d825080f03dfcb8.camel@infinera.com> (raw)
In-Reply-To: <2a4a7e11b37cfa0558d68f0d35e90d6da858b059.1579017697.git.christophe.leroy@c-s.fr>
On Tue, 2020-01-14 at 16:02 +0000, Christophe Leroy wrote:
> CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
>
> No need to 'goto err;' for just doing a return.
> return directly from where the error happens.
>
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
> v3: rebase on today's spi/for-next and using PTR_ERR_OR_ZERO() in one place.
> ---
> drivers/spi/spi-fsl-spi.c | 27 ++++++++-------------------
> 1 file changed, 8 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
> index fb4159ad6bf6..3b81772fea0d 100644
> --- a/drivers/spi/spi-fsl-spi.c
> +++ b/drivers/spi/spi-fsl-spi.c
> @@ -706,8 +706,8 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)
> struct device_node *np = ofdev->dev.of_node;
> struct spi_master *master;
> struct resource mem;
> - int irq = 0, type;
> - int ret = -ENOMEM;
> + int irq, type;
> + int ret;
>
> ret = of_mpc8xxx_spi_probe(ofdev);
> if (ret)
> @@ -722,10 +722,8 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)
>
> if (spisel_boot) {
> pinfo->immr_spi_cs = ioremap(get_immrbase() + IMMR_SPI_CS_OFFSET, 4);
> - if (!pinfo->immr_spi_cs) {
> - ret = -ENOMEM;
> - goto err;
> - }
> + if (!pinfo->immr_spi_cs)
> + return -ENOMEM;
> }
> #endif
> /*
> @@ -744,24 +742,15 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)
>
> ret = of_address_to_resource(np, 0, &mem);
> if (ret)
> - goto err;
> + return ret;
>
> irq = platform_get_irq(ofdev, 0);
> - if (irq < 0) {
> - ret = irq;
> - goto err;
> - }
> + if (irq < 0)
> + return irq;
>
> master = fsl_spi_probe(dev, &mem, irq);
> - if (IS_ERR(master)) {
> - ret = PTR_ERR(master);
> - goto err;
> - }
> -
Don't you need to "undo" ioremap, irq etc. in case of later errors?
> - return 0;
>
> -err:
> - return ret;
> + return PTR_ERR_OR_ZERO(master);
> }
>
> static int of_fsl_spi_remove(struct platform_device *ofdev)
> --
> 2.13.3
>
next prev parent reply other threads:[~2020-01-14 16:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 16:02 [PATCH v3] spi: fsl: simplify error path in of_fsl_spi_probe() Christophe Leroy
2020-01-14 16:09 ` Applied "spi: fsl: simplify error path in of_fsl_spi_probe()" to the spi tree Mark Brown
2020-01-14 16:26 ` Joakim Tjernlund [this message]
2020-01-14 16:57 ` [PATCH v3] spi: fsl: simplify error path in of_fsl_spi_probe() Mark Brown
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=b6d01fa02e659db911df63a79d825080f03dfcb8.camel@infinera.com \
--to=joakim.tjernlund@infinera.com \
--cc=broonie@kernel.org \
--cc=christophe.leroy@c-s.fr \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lkp@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).