From: Frank Rowand <frowand.list@gmail.com>
To: David Daney <ddaney.cavm@gmail.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Rob Herring <robh+dt@kernel.org>,
Grant Likely <grant.likely@linaro.org>
Subject: Re: [PATCH v2] of_pci_irq: Silence bogus "of_irq_parse_pci() failed ..." messages.
Date: Wed, 09 Sep 2015 10:37:47 -0700 [thread overview]
Message-ID: <55F06E6B.3020500@gmail.com> (raw)
In-Reply-To: <1441736911-2445-1-git-send-email-ddaney.cavm@gmail.com>
On 9/8/2015 11:28 AM, David Daney wrote:
> From: David Daney <david.daney@cavium.com>
>
> It is perfectly legitimate for a PCI device to have an
> PCI_INTERRUPT_PIN value of zero. This happens if the device doesn't
> use interrupts, or on PCIe devices, where only MSI/MSI-X are
> supported.
>
> Silence the annoying "of_irq_parse_pci() failed with rc=-19" error
> messages by moving the printing code into of_irq_parse_pci(), and only
> emitting the message for cases where PCI_INTERRUPT_PIN == 0 is not the
> cause for an early exit.
>
> Signed-off-by: David Daney <david.daney@cavium.com>
> ---
> Changes in v2: Move the print function in to of_irq_parse_pci() at a
> common error exit point (as suggested by Frank Rowand).
>
>
> drivers/of/of_pci_irq.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c
> index 1710d9d..0be8b65 100644
> --- a/drivers/of/of_pci_irq.c
> +++ b/drivers/of/of_pci_irq.c
> @@ -38,8 +38,8 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
> */
> rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);
> if (rc != 0)
> - return rc;
> - /* No pin, exit */
> + goto err;
> + /* No pin, exit with no error message. */
> if (pin == 0)
> return -ENODEV;
>
> @@ -53,8 +53,10 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
> ppnode = pci_bus_to_OF_node(pdev->bus);
>
> /* No node for host bridge ? give up */
> - if (ppnode == NULL)
> - return -EINVAL;
> + if (ppnode == NULL) {
> + rc = -EINVAL;
> + goto err;
> + }
> } else {
> /* We found a P2P bridge, check if it has a node */
> ppnode = pci_device_to_OF_node(ppdev);
> @@ -87,6 +89,9 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
> laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8));
> laddr[1] = laddr[2] = cpu_to_be32(0);
> return of_irq_parse_raw(laddr, out_irq);
should be:
rc = of_irq_parse_raw(laddr, out_irq);
if (rc)
goto err;
return 0;
> +err:
> + dev_err(&pdev->dev, "of_irq_parse_pci() failed with rc=%d\n", rc);
> + return rc;
> }
> EXPORT_SYMBOL_GPL(of_irq_parse_pci);
>
> @@ -105,10 +110,8 @@ int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
> int ret;
>
> ret = of_irq_parse_pci(dev, &oirq);
> - if (ret) {
> - dev_err(&dev->dev, "of_irq_parse_pci() failed with rc=%d\n", ret);
> + if (ret)
> return 0; /* Proper return code 0 == NO_IRQ */
> - }
>
> return irq_create_of_mapping(&oirq);
> }
>
next prev parent reply other threads:[~2015-09-09 17:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 18:28 [PATCH v2] of_pci_irq: Silence bogus "of_irq_parse_pci() failed ..." messages David Daney
2015-09-08 18:28 ` David Daney
2015-09-09 17:37 ` Frank Rowand [this message]
2015-09-09 17:44 ` Frank Rowand
2015-09-09 17:53 ` David Daney
2015-09-09 17:53 ` David Daney
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=55F06E6B.3020500@gmail.com \
--to=frowand.list@gmail.com \
--cc=ddaney.cavm@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@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 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.