linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] irqchip: mxs: fix function type for IRQCHIP_OF_DECLARE
Date: Mon, 12 May 2014 19:29:52 -0500	[thread overview]
Message-ID: <1399940993-1773-7-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1399940993-1773-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <robh@kernel.org>

Adding function type checking to IRQCHIP_OF_DECLARE found a type mismatch
with icoll_of_init. The function should return an error code or 0 on
success.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
 drivers/irqchip/irq-mxs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c
index 63b3d4e..4044ff2 100644
--- a/drivers/irqchip/irq-mxs.c
+++ b/drivers/irqchip/irq-mxs.c
@@ -96,7 +96,7 @@ static struct irq_domain_ops icoll_irq_domain_ops = {
 	.xlate = irq_domain_xlate_onecell,
 };
 
-static void __init icoll_of_init(struct device_node *np,
+static int __init icoll_of_init(struct device_node *np,
 			  struct device_node *interrupt_parent)
 {
 	icoll_base = of_iomap(np, 0);
@@ -110,6 +110,6 @@ static void __init icoll_of_init(struct device_node *np,
 
 	icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS,
 					     &icoll_irq_domain_ops, NULL);
-	WARN_ON(!icoll_domain);
+	return icoll_domain ? 0 : -ENODEV;
 }
 IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init);
-- 
1.9.1

  parent reply	other threads:[~2014-05-13  0:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-13  0:29 [PATCH 0/7] OF init section function prototype fixes Rob Herring
2014-05-13  0:29 ` [PATCH 1/7] ARM: imx: fix function type for CLK_OF_DECLARE Rob Herring
2014-05-13  2:10   ` Shawn Guo
2014-05-13  0:29 ` [PATCH 2/7] clk: rockchip: " Rob Herring
2014-05-13  0:29 ` [PATCH 3/7] clk: sunxi: avoid double DT matching Rob Herring
2014-05-13 15:12   ` Rob Herring
2014-05-13 16:57     ` Emilio López
2014-05-13  0:29 ` [PATCH 4/7] clk: sunxi: fix function type for CLK_OF_DECLARE Rob Herring
2014-05-13  0:29 ` [PATCH 5/7] irqchip: s3c24xx: fix function type for IRQCHIP_OF_DECLARE Rob Herring
2014-05-13 15:22   ` Jason Cooper
2014-05-13 17:02     ` Rob Herring
2014-05-13 19:19       ` Jason Cooper
2014-05-13  0:29 ` Rob Herring [this message]
2014-05-13  0:29 ` [PATCH 7/7] clk: ti: add missing semi-colon on CLK_OF_DECLARE Rob Herring

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=1399940993-1773-7-git-send-email-robherring2@gmail.com \
    --to=robherring2@gmail.com \
    --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 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).