Re: [PATCH] x86 apic: only compile local function if used

[Suresh Siddha <suresh.b.siddha@intel.com>]

On Mon, 2012-05-07 at 15:12 +0200, Ingo Molnar wrote:
> * Németh Márton <nm127@freemail.hu> wrote:
> 
> > From: Márton Németh <nm127@freemail.hu>
> > 
> > The local function io_apic_level_ack_pending() is only called from
> > io_apic_level_ack_pending(). The later function is only compiled
> > if CONFIG_GENERIC_PENDING_IRQ is defined. Use this define around
> > io_apic_level_ack_pending() function as well.
> > 
> > This will remove the following warning message during compiling
> > without CONFIG_GENERIC_PENDING_IRQ defined:
> >  * arch/x86/kernel/apic/io_apic.c:382: warning: ‘io_apic_level_ack_pending’ defined but not used
> > 
> > Signed-off-by: Márton Németh <nm127@freemail.hu>
> > ---
> > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> > index e88300d..9b85009 100644
> > --- a/arch/x86/kernel/apic/io_apic.c
> > +++ b/arch/x86/kernel/apic/io_apic.c
> > @@ -379,6 +379,7 @@ static void __io_apic_modify(unsigned int apic, unsigned int reg, unsigned int v
> >  	writel(value, &io_apic->data);
> >  }
> > 
> > +#ifdef CONFIG_GENERIC_PENDING_IRQ
> >  static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
> >  {
> >  	struct irq_pin_list *entry;
> > @@ -401,6 +402,7 @@ static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
> > 
> >  	return false;
> >  }
> > +#endif
> > 
> >  union entry_union {
> >  	struct { u32 w1, w2; };
> 
> it would be better/cleaner to just move this function into the 
> already existing #ifdef CONFIG_GENERIC_PENDING_IRQ block.

Sorry missed this patch to review before. Appended the modified patch
with an updated changelog.
---

From: Márton Németh <nm127@freemail.hu>
Subject: x86, ioapic: Fix the warning with !CONFIG_GENERIC_PENDING_IRQ

The local function io_apic_level_ack_pending() is only called from
io_apic_level_ack_pending(). The later function is only compiled
if CONFIG_GENERIC_PENDING_IRQ is defined. Move the
io_apic_level_ack_pending() to the existing #ifdef CONFIG_GENERIC_PENDING_IRQ
code block.

This will remove the following warning message during compiling
without CONFIG_GENERIC_PENDING_IRQ defined:
 * arch/x86/kernel/apic/io_apic.c:382: warning: ‘io_apic_level_ack_pending’ defined but not used

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
---
 arch/x86/kernel/apic/io_apic.c |   46 ++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 4b7a795..ffdc152 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -362,29 +362,6 @@ void native_io_apic_modify(unsigned int apic, unsigned int reg, unsigned int val
 	writel(value, &io_apic->data);
 }
 
-static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
-{
-	struct irq_pin_list *entry;
-	unsigned long flags;
-
-	raw_spin_lock_irqsave(&ioapic_lock, flags);
-	for_each_irq_pin(entry, cfg->irq_2_pin) {
-		unsigned int reg;
-		int pin;
-
-		pin = entry->pin;
-		reg = io_apic_read(entry->apic, 0x10 + pin*2);
-		/* Is the remote IRR bit set? */
-		if (reg & IO_APIC_REDIR_REMOTE_IRR) {
-			raw_spin_unlock_irqrestore(&ioapic_lock, flags);
-			return true;
-		}
-	}
-	raw_spin_unlock_irqrestore(&ioapic_lock, flags);
-
-	return false;
-}
-
 union entry_union {
 	struct { u32 w1, w2; };
 	struct IO_APIC_route_entry entry;
@@ -2406,6 +2383,29 @@ static void ack_apic_edge(struct irq_data *data)
 atomic_t irq_mis_count;
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
+static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
+{
+	struct irq_pin_list *entry;
+	unsigned long flags;
+
+	raw_spin_lock_irqsave(&ioapic_lock, flags);
+	for_each_irq_pin(entry, cfg->irq_2_pin) {
+		unsigned int reg;
+		int pin;
+
+		pin = entry->pin;
+		reg = io_apic_read(entry->apic, 0x10 + pin*2);
+		/* Is the remote IRR bit set? */
+		if (reg & IO_APIC_REDIR_REMOTE_IRR) {
+			raw_spin_unlock_irqrestore(&ioapic_lock, flags);
+			return true;
+		}
+	}
+	raw_spin_unlock_irqrestore(&ioapic_lock, flags);
+
+	return false;
+}
+
 static inline bool ioapic_irqd_mask(struct irq_data *data, struct irq_cfg *cfg)
 {
 	/* If we are moving the irq we need to mask it */