1 files changed, 4 insertions, 12 deletions

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 20b677dd0b27..61d6d3c80fee 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -464,23 +464,15 @@ int irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base,
                                 /*
                                  * If map() returns -EPERM, this interrupt is protected
                                  * by the firmware or some other service and shall not
-                                 * be mapped.
-                                 *
-                                 * Since on some platforms we blindly try to map everything
-                                 * we end up with a log full of backtraces.
-                                 *
-                                 * So instead, we silently fail on -EPERM, it is the
-                                 * responsibility of the PIC driver to display a relevant
-                                 * message if needed.
+                                 * be mapped. Don't bother telling the user about it.
                                  */
                                 if (ret != -EPERM) {
-                                        pr_err("irq-%i==>hwirq-0x%lx mapping failed: %d\n",
-                                               virq, hwirq, ret);
-                                        WARN_ON(1);
+                                        pr_info("%s didn't like hwirq-0x%lx to VIRQ%i mapping (rc=%d)\n",
+                                               of_node_full_name(domain->of_node), hwirq, virq, ret);
                                 }
                                 irq_data->domain = NULL;
                                 irq_data->hwirq = 0;
-                                goto err_unmap;
+                                continue;
                         }
                 }