[irqchip: irq/irqchip-next] irqchip/mbigen: Fix compile warning when CONFIG_ACPI is disabled
From: irqchip-bot for Yang Yingliang
Date: Sun Jun 06 2021 - 09:07:46 EST
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: c96d6abbec52d6723bef6b50846f40f7fb27e93c
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/c96d6abbec52d6723bef6b50846f40f7fb27e93c
Author: Yang Yingliang <yangyingliang@xxxxxxxxxx>
AuthorDate: Wed, 19 May 2021 13:04:55 +08:00
Committer: Marc Zyngier <maz@xxxxxxxxxx>
CommitterDate: Sun, 06 Jun 2021 13:59:09 +01:00
irqchip/mbigen: Fix compile warning when CONFIG_ACPI is disabled
Fix the following compile warning:
drivers/irqchip/irq-mbigen.c:372:36: warning: ‘mbigen_acpi_match’ defined but not used [-Wunused-const-variable=]
static const struct acpi_device_id mbigen_acpi_match[] = {
Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20210519050455.1693953-1-yangyingliang@xxxxxxxxxx
---
drivers/irqchip/irq-mbigen.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index 2cb45c6..f565317 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -273,6 +273,12 @@ static int mbigen_of_create_domain(struct platform_device *pdev,
}
#ifdef CONFIG_ACPI
+static const struct acpi_device_id mbigen_acpi_match[] = {
+ { "HISI0152", 0 },
+ {}
+};
+MODULE_DEVICE_TABLE(acpi, mbigen_acpi_match);
+
static int mbigen_acpi_create_domain(struct platform_device *pdev,
struct mbigen_device *mgn_chip)
{
@@ -369,12 +375,6 @@ static const struct of_device_id mbigen_of_match[] = {
};
MODULE_DEVICE_TABLE(of, mbigen_of_match);
-static const struct acpi_device_id mbigen_acpi_match[] = {
- { "HISI0152", 0 },
- {}
-};
-MODULE_DEVICE_TABLE(acpi, mbigen_acpi_match);
-
static struct platform_driver mbigen_platform_driver = {
.driver = {
.name = "Hisilicon MBIGEN-V2",