From: Simon Horman <horms@verge.net.au>
To: SF Markus Elfring <elfring@users.sourceforge.net>
Cc: linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] PCI: rcar: Use common error handling code in rcar_pcie_enable_msi()
Date: Wed, 1 Nov 2017 09:18:31 +0100 [thread overview]
Message-ID: <20171101081831.ssnuqp5b75lbfu5p@verge.net.au> (raw)
In-Reply-To: <c598933b-b14f-91a1-c7a3-f4a46ec98e77@users.sourceforge.net>
On Mon, Oct 30, 2017 at 08:35:30AM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 30 Oct 2017 08:28:06 +0100
>
> Adjust a jump target so that a specific error message is stored only once
> at the end of this function implementation.
> Replace two calls of the function "dev_err" by goto statements.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
This is fine by me except that the change in the name of the goto label
seems spurious. If think it should be left as-is. But if you really want to
change it then as it is an error path I should suggest it describe that its
an error and what unwinding is done, f.e. err_remove_domain.
> ---
> drivers/pci/host/pcie-rcar.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 12796eccb2be..38101f8bebf1 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -873,18 +873,14 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
> err = devm_request_irq(dev, msi->irq1, rcar_pcie_msi_irq,
> IRQF_SHARED | IRQF_NO_THREAD,
> rcar_msi_irq_chip.name, pcie);
> - if (err < 0) {
> - dev_err(dev, "failed to request IRQ: %d\n", err);
> - goto err;
> - }
> + if (err < 0)
> + goto report_request_failure;
>
> err = devm_request_irq(dev, msi->irq2, rcar_pcie_msi_irq,
> IRQF_SHARED | IRQF_NO_THREAD,
> rcar_msi_irq_chip.name, pcie);
> - if (err < 0) {
> - dev_err(dev, "failed to request IRQ: %d\n", err);
> - goto err;
> - }
> + if (err < 0)
> + goto report_request_failure;
>
> /* setup MSI data target */
> msi->pages = __get_free_pages(GFP_KERNEL, 0);
> @@ -898,7 +894,8 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
>
> return 0;
>
> -err:
> +report_request_failure:
> + dev_err(dev, "failed to request IRQ: %d\n", err);
> irq_domain_remove(msi->domain);
> return err;
> }
> --
> 2.14.3
>
next prev parent reply other threads:[~2017-11-01 8:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 7:35 [PATCH] PCI: rcar: Use common error handling code in rcar_pcie_enable_msi() SF Markus Elfring
2017-11-01 8:18 ` Simon Horman [this message]
2017-11-01 8:57 ` SF Markus Elfring
2017-11-02 8:12 ` Simon Horman
2017-11-02 13:00 ` [PATCH v2] " SF Markus Elfring
2017-11-02 19:25 ` Geert Uytterhoeven
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=20171101081831.ssnuqp5b75lbfu5p@verge.net.au \
--to=horms@verge.net.au \
--cc=bhelgaas@google.com \
--cc=elfring@users.sourceforge.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.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 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).