Received-SPF: pass (google.com: domain of linux-kernel+bounces-169865-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Jinjie Ruan <ruanjinjie@huawei.com>
To: <tglx@linutronix.de>, <linux-kernel@vger.kernel.org>
CC: <ruanjinjie@huawei.com>
Subject: [PATCH 5/5] genirq/irqdomain: Clean up for irq_domain_xlate_*
Date: Mon, 6 May 2024 21:02:23 +0800
Message-ID: <20240506130223.317265-6-ruanjinjie@huawei.com>
In-Reply-To: <20240506130223.317265-1-ruanjinjie@huawei.com>
References: <20240506130223.317265-1-ruanjinjie@huawei.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain

As irq_domain_xlate_onecell() and irq_domain_xlate_onetwocell() have
almost the same logic, introduce irq_domain_xlate_common() to do it and
use a new xlate_type enum variable to distinguish them.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 kernel/irq/irqdomain.c | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 2ef53697d877..4dd53d76f7ef 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -985,6 +985,29 @@ struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,
 }
 EXPORT_SYMBOL_GPL(__irq_resolve_mapping);
 
+enum xlate_type {
+	ONE_CELL	= 0,
+	ONE_TWO_CELL,
+};
+
+static inline int irq_domain_xlate_common(const u32 *intspec,
+					  unsigned int intsize,
+					  unsigned long *out_hwirq,
+					  unsigned int *out_type,
+					  enum xlate_type type)
+{
+	if (WARN_ON(intsize < 1))
+		return -EINVAL;
+
+	*out_hwirq = intspec[0];
+	*out_type = IRQ_TYPE_NONE;
+
+	if (type == ONE_TWO_CELL && intsize > 1)
+		*out_type = intspec[1] & IRQ_TYPE_SENSE_MASK;
+
+	return 0;
+}
+
 /**
  * irq_domain_xlate_onecell() - Generic xlate for direct one cell bindings
  *
@@ -995,11 +1018,8 @@ int irq_domain_xlate_onecell(struct irq_domain *d, struct device_node *ctrlr,
 			     const u32 *intspec, unsigned int intsize,
 			     unsigned long *out_hwirq, unsigned int *out_type)
 {
-	if (WARN_ON(intsize < 1))
-		return -EINVAL;
-	*out_hwirq = intspec[0];
-	*out_type = IRQ_TYPE_NONE;
-	return 0;
+	return irq_domain_xlate_common(intspec, intsize, out_hwirq,
+				       out_type, ONE_CELL);
 }
 EXPORT_SYMBOL_GPL(irq_domain_xlate_onecell);
 
@@ -1037,14 +1057,8 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d,
 				const u32 *intspec, unsigned int intsize,
 				unsigned long *out_hwirq, unsigned int *out_type)
 {
-	if (WARN_ON(intsize < 1))
-		return -EINVAL;
-	*out_hwirq = intspec[0];
-	if (intsize > 1)
-		*out_type = intspec[1] & IRQ_TYPE_SENSE_MASK;
-	else
-		*out_type = IRQ_TYPE_NONE;
-	return 0;
+	return irq_domain_xlate_common(intspec, intsize, out_hwirq,
+				       out_type, ONE_TWO_CELL);
 }
 EXPORT_SYMBOL_GPL(irq_domain_xlate_onetwocell);
 
-- 
2.34.1