linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv2] ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
@ 2014-01-20 21:52 Arnaud Ebalard
  2014-01-21  0:59 ` Jason Cooper
  0 siblings, 1 reply; 2+ messages in thread
From: Arnaud Ebalard @ 2014-01-20 21:52 UTC (permalink / raw)
  To: linux-arm-kernel


The following appears during compilation for an Armada 370 target
because 'irq_controller_lock' is used only when CONFIG_SMP is
enabled:

 drivers/irqchip/irq-armada-370-xp.c:62:8: warning: 'irq_controller_lock' defined but not used [-Wunused-variable]

Fix that warning by moving declaration of 'irq_controller_lock'
inside existing #ifdef.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---

Changes since v1:
 - moved declaration inside existing #ifdef as suggested by Arnd,
   instead of adding a new one.

 drivers/irqchip/irq-armada-370-xp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 433cc8568dec..9300bc32784e 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -59,8 +59,6 @@
 #define PCI_MSI_DOORBELL_END                    (32)
 #define PCI_MSI_DOORBELL_MASK                   0xFFFF0000
 
-static DEFINE_RAW_SPINLOCK(irq_controller_lock);
-
 static void __iomem *per_cpu_int_base;
 static void __iomem *main_int_base;
 static struct irq_domain *armada_370_xp_mpic_domain;
@@ -239,6 +237,8 @@ static inline int armada_370_xp_msi_init(struct device_node *node,
 #endif
 
 #ifdef CONFIG_SMP
+static DEFINE_RAW_SPINLOCK(irq_controller_lock);
+
 static int armada_xp_set_affinity(struct irq_data *d,
 				  const struct cpumask *mask_val, bool force)
 {
-- 
1.8.5.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCHv2] ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
  2014-01-20 21:52 [PATCHv2] ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP) Arnaud Ebalard
@ 2014-01-21  0:59 ` Jason Cooper
  0 siblings, 0 replies; 2+ messages in thread
From: Jason Cooper @ 2014-01-21  0:59 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jan 20, 2014 at 10:52:05PM +0100, Arnaud Ebalard wrote:
> 
> The following appears during compilation for an Armada 370 target
> because 'irq_controller_lock' is used only when CONFIG_SMP is
> enabled:
> 
>  drivers/irqchip/irq-armada-370-xp.c:62:8: warning: 'irq_controller_lock' defined but not used [-Wunused-variable]
> 
> Fix that warning by moving declaration of 'irq_controller_lock'
> inside existing #ifdef.
> 
> Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
> ---
> 
> Changes since v1:
>  - moved declaration inside existing #ifdef as suggested by Arnd,
>    instead of adding a new one.
> 
>  drivers/irqchip/irq-armada-370-xp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to mvebu/fixes

thx,

Jason.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-01-21  0:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-20 21:52 [PATCHv2] ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP) Arnaud Ebalard
2014-01-21  0:59 ` Jason Cooper

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).