From: Bartosz Golaszewski <bgolaszew...@baylibre.com>

Use WARN_ON() on eny error in cp-intc initialization and drop all
custom error messages.

Signed-off-by: Bartosz Golaszewski <bgolaszew...@baylibre.com>
Reviewed-by: David Lechner <da...@lechnology.com>
---
 arch/arm/mach-davinci/cp_intc.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
index f3787ae4cdbd..c1efb9390655 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -200,20 +200,16 @@ davinci_cp_intc_do_init(const struct 
davinci_cp_intc_config *config,
                        DAVINCI_CP_INTC_CHAN_MAP(offset));
 
        irq_base = irq_alloc_descs(-1, 0, config->num_irqs, 0);
-       if (irq_base < 0) {
-               pr_warn("Couldn't allocate IRQ numbers\n");
-               irq_base = 0;
-       }
+       if (WARN_ON(irq_base < 0))
+               return irq_base;
 
        /* create a legacy host */
        davinci_cp_intc_irq_domain = irq_domain_add_legacy(
                                        node, config->num_irqs, irq_base, 0,
                                        &davinci_cp_intc_irq_domain_ops, NULL);
 
-       if (!davinci_cp_intc_irq_domain) {
-               pr_err("cp_intc: failed to allocate irq host!\n");
+       if (WARN_ON(!davinci_cp_intc_irq_domain))
                return -EINVAL;
-       }
 
        set_handle_irq(davinci_cp_intc_handle_irq);
 
-- 
2.20.1

Reply via email to