From: Bjorn Helgaas <helgaas@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] PCI: xilinx: Fix return value in case of error
Date: Mon, 25 Jul 2016 17:29:33 +0000 [thread overview]
Message-ID: <20160725172933.GB12484@localhost> (raw)
In-Reply-To: <1468491046-1427-1-git-send-email-christophe.jaillet@wanadoo.fr>
On Thu, Jul 14, 2016 at 12:10:46PM +0200, Christophe JAILLET wrote:
> In function 'xilinx_pcie_init_irq_domain', the pattern used to check and
> return error is:
>
> if (!var) {
> dev_err(...);
> return PTR_ERR(var);
> }
>
> So the returned value in case of error is always 0, which means 'success'.
> Change it to return -ENODEV instead.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied with Sören's ack to pci/host-xilinx for v4.8, thanks!
> ---
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
> index 4703aa3..a30e016 100644
> --- a/drivers/pci/host/pcie-xilinx.c
> +++ b/drivers/pci/host/pcie-xilinx.c
> @@ -550,7 +550,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> pcie_intc_node = of_get_next_child(node, NULL);
> if (!pcie_intc_node) {
> dev_err(dev, "No PCIe Intc node found\n");
> - return PTR_ERR(pcie_intc_node);
> + return -ENODEV;
> }
>
> port->irq_domain = irq_domain_add_linear(pcie_intc_node, 4,
> @@ -558,7 +558,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> port);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a INTx IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> /* Setup MSI */
> @@ -569,7 +569,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> &xilinx_pcie_msi_chip);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a MSI IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> xilinx_pcie_enable_msi(port);
> --
> 2.7.4
>
>
> ---
> L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
> https://www.avast.com/antivirus
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Helgaas <helgaas@kernel.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: bhelgaas@google.com, michal.simek@xilinx.com,
soren.brinkmann@xilinx.com, bharat.kumar.gogada@xilinx.com,
rgummal@xilinx.com, arnd@arndb.de, jiang.liu@linux.intel.com,
grygorii.strashko@ti.com, russell.joyce@york.ac.uk,
lorenzo.pieralisi@arm.com, linux-pci@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] PCI: xilinx: Fix return value in case of error
Date: Mon, 25 Jul 2016 12:29:33 -0500 [thread overview]
Message-ID: <20160725172933.GB12484@localhost> (raw)
In-Reply-To: <1468491046-1427-1-git-send-email-christophe.jaillet@wanadoo.fr>
On Thu, Jul 14, 2016 at 12:10:46PM +0200, Christophe JAILLET wrote:
> In function 'xilinx_pcie_init_irq_domain', the pattern used to check and
> return error is:
>
> if (!var) {
> dev_err(...);
> return PTR_ERR(var);
> }
>
> So the returned value in case of error is always 0, which means 'success'.
> Change it to return -ENODEV instead.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied with Sören's ack to pci/host-xilinx for v4.8, thanks!
> ---
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
> index 4703aa3..a30e016 100644
> --- a/drivers/pci/host/pcie-xilinx.c
> +++ b/drivers/pci/host/pcie-xilinx.c
> @@ -550,7 +550,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> pcie_intc_node = of_get_next_child(node, NULL);
> if (!pcie_intc_node) {
> dev_err(dev, "No PCIe Intc node found\n");
> - return PTR_ERR(pcie_intc_node);
> + return -ENODEV;
> }
>
> port->irq_domain = irq_domain_add_linear(pcie_intc_node, 4,
> @@ -558,7 +558,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> port);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a INTx IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> /* Setup MSI */
> @@ -569,7 +569,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> &xilinx_pcie_msi_chip);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a MSI IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> xilinx_pcie_enable_msi(port);
> --
> 2.7.4
>
>
> ---
> L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
> https://www.avast.com/antivirus
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: helgaas@kernel.org (Bjorn Helgaas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] PCI: xilinx: Fix return value in case of error
Date: Mon, 25 Jul 2016 12:29:33 -0500 [thread overview]
Message-ID: <20160725172933.GB12484@localhost> (raw)
In-Reply-To: <1468491046-1427-1-git-send-email-christophe.jaillet@wanadoo.fr>
On Thu, Jul 14, 2016 at 12:10:46PM +0200, Christophe JAILLET wrote:
> In function 'xilinx_pcie_init_irq_domain', the pattern used to check and
> return error is:
>
> if (!var) {
> dev_err(...);
> return PTR_ERR(var);
> }
>
> So the returned value in case of error is always 0, which means 'success'.
> Change it to return -ENODEV instead.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied with S?ren's ack to pci/host-xilinx for v4.8, thanks!
> ---
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
> index 4703aa3..a30e016 100644
> --- a/drivers/pci/host/pcie-xilinx.c
> +++ b/drivers/pci/host/pcie-xilinx.c
> @@ -550,7 +550,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> pcie_intc_node = of_get_next_child(node, NULL);
> if (!pcie_intc_node) {
> dev_err(dev, "No PCIe Intc node found\n");
> - return PTR_ERR(pcie_intc_node);
> + return -ENODEV;
> }
>
> port->irq_domain = irq_domain_add_linear(pcie_intc_node, 4,
> @@ -558,7 +558,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> port);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a INTx IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> /* Setup MSI */
> @@ -569,7 +569,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> &xilinx_pcie_msi_chip);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a MSI IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> xilinx_pcie_enable_msi(port);
> --
> 2.7.4
>
>
> ---
> L'absence de virus dans ce courrier ?lectronique a ?t? v?rifi?e par le logiciel antivirus Avast.
> https://www.avast.com/antivirus
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-07-25 17:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-14 10:10 [PATCH] PCI: xilinx: Fix return value in case of error Christophe JAILLET
2016-07-14 10:10 ` Christophe JAILLET
2016-07-14 10:10 ` Christophe JAILLET
2016-07-14 13:12 ` Sören Brinkmann
2016-07-14 13:12 ` Sören Brinkmann
2016-07-14 13:12 ` Sören Brinkmann
2016-07-25 17:29 ` Bjorn Helgaas [this message]
2016-07-25 17:29 ` Bjorn Helgaas
2016-07-25 17:29 ` Bjorn Helgaas
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=20160725172933.GB12484@localhost \
--to=helgaas@kernel.org \
--cc=linux-arm-kernel@lists.infradead.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.