Skip to contentSkip to conversation

irqchip: armada: suppress unused-function warning

PATCH RESEND Applied Arnd Bergmann 3 participants 3 messages Mar 22, 2024 – Mar 26, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 irqchip: armada: suppress unused-function warning

From: Arnd Bergmann <[email protected]>

armada_370_xp_msi_reenable_percpu is only defined when CONFIG_PCI_MSI is enabled, and only called when SMP is enabled.

Without CONFIG_SMP, there are no callers, so we get a build time warning instead:

drivers/irqchip/irq-armada-370-xp.c:319:13: error: 'armada_370_xp_msi_reenable_percpu' defined but not used [-Werror=unused-function]
319 | static void armada_370_xp_msi_reenable_percpu(void) {}

      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Mark the function as __maybe_unused to avoid adding more complexity to the #ifdefs.

Fixes 8ca61cde32c1 ("irqchip/armada-370-xp: Enable MSI affinity configuration")

---
I noticed this never got applied, and the warning still remains.

---
 drivers/irqchip/irq-armada-370-xp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-armada-370-xp.c +1 -1
index a55528469278..4b021a67bdfe 100644
@@ -316,7 +316,7 @@ static int armada_370_xp_msi_init(struct device_node *node,
 	return 0;
 }
 #else
-static void armada_370_xp_msi_reenable_percpu(void) {}
+static __maybe_unused void armada_370_xp_msi_reenable_percpu(void) {}
 
 static inline int armada_370_xp_msi_init(struct device_node *node,
 					 phys_addr_t main_int_phys_base)
Signature · 1 line
2.39.2
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

armada_370_xp_msi_reenable_percpu is only defined when CONFIG_PCI_MSI is enabled, and only called when SMP is enabled.

Without CONFIG_SMP, there are no callers, so we get a build time warning instead:

drivers/irqchip/irq-armada-370-xp.c:319:13: error: 'armada_370_xp_msi_reenable_percpu' defined but not used [-Werror=unused-function]
319 | static void armada_370_xp_msi_reenable_percpu(void) {}

Quoted 8 lines
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Mark the function as __maybe_unused to avoid adding more complexity to the #ifdefs.

Fixes 8ca61cde32c1 ("irqchip/armada-370-xp: Enable MSI affinity configuration")

Andrew

merge bot Applied
#2 lore raw

[tip: irq/urgent] irqchip/armada-370-xp: Suppress unused-function warning

In reply to Arnd Bergmann
The following commit has been merged into the irq/urgent branch of tip:

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     9e81e329508576b499b5c47ab106b5fa45ce96d9
Gitweb:        https://git.kernel.org/tip/9e81e329508576b499b5c47ab106b5fa45ce96d9
Author:        Arnd Bergmann <[email protected]>
AuthorDate:    Fri, 22 Mar 2024 13:58:25 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 26 Mar 2024 02:12:16 +01:00

irqchip/armada-370-xp: Suppress unused-function warning

armada_370_xp_msi_reenable_percpu() is only defined when CONFIG_PCI_MSI is enabled, and only called when SMP is enabled.

Without CONFIG_SMP, there are no callers, which results in a build time warning instead:

drivers/irqchip/irq-armada-370-xp.c:319:13: error: 'armada_370_xp_msi_reenable_percpu' defined but not used [-Werror=unused-function]
319 | static void armada_370_xp_msi_reenable_percpu(void) {}

      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Mark the function as __maybe_unused to avoid adding more complexity to the #ifdefs.

Fixes 8ca61cde32c1 ("irqchip/armada-370-xp: Enable MSI affinity configuration")
---
 drivers/irqchip/irq-armada-370-xp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-armada-370-xp.c +1 -1
index a555284..4b021a6 100644
@@ -316,7 +316,7 @@ static int armada_370_xp_msi_init(struct device_node *node,
 	return 0;
 }
 #else
-static void armada_370_xp_msi_reenable_percpu(void) {}
+static __maybe_unused void armada_370_xp_msi_reenable_percpu(void) {}
 
 static inline int armada_370_xp_msi_init(struct device_node *node,
 					 phys_addr_t main_int_phys_base)