2 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index 51a97ac8bfbf..83f708e5db59 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -136,6 +136,11 @@ do {									\
         (root)->rnode = NULL;                                           \
 } while (0)
 
+static inline bool radix_tree_empty(struct radix_tree_root *root)
+{
+        return root->rnode == NULL;
+}
+
 /**
  * Radix-tree synchronization
  *
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index d65f6f31a5b3..8798b6c9e945 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -139,12 +139,7 @@ void irq_domain_remove(struct irq_domain *domain)
 {
         mutex_lock(&irq_domain_mutex);
 
-        /*
-         * radix_tree_delete() takes care of destroying the root
-         * node when all entries are removed. Shout if there are
-         * any mappings left.
-         */
-        WARN_ON(domain->revmap_tree.height);
+        WARN_ON(!radix_tree_empty(&domain->revmap_tree));
 
         list_del(&domain->link);