Commit 7ccec3e7 authored by Albert Herranz's avatar Albert Herranz Committed by Benjamin Herrenschmidt

powerpc/gc/wii: hlwd-pic: convert irq_desc.lock to raw_spinlock

Fix the following build failures:

arch/powerpc/platforms/embedded6xx/hlwd-pic.c: In function 'hlwd_pic_irq_cascade':
arch/powerpc/platforms/embedded6xx/hlwd-pic.c:135: error: passing argument 1 of 'spin_lock' from incompatible pointer type
arch/powerpc/platforms/embedded6xx/hlwd-pic.c:137: error: passing argument 1 of 'spin_unlock' from incompatible pointer type
arch/powerpc/platforms/embedded6xx/hlwd-pic.c:145: error: passing argument 1 of 'spin_lock' from incompatible pointer type
arch/powerpc/platforms/embedded6xx/hlwd-pic.c:149: error: passing argument 1 of 'spin_unlock' from incompatible pointer type

These failures are caused by the changes introduced in commit
"genirq: Convert irq_desc.lock to raw_spinlock". The reason this driver
was not updated is that it wasn't merged yet.
Signed-off-by: default avatarAlbert Herranz <albert_herranz@yahoo.es>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 8beac08e
...@@ -132,9 +132,9 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq, ...@@ -132,9 +132,9 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
struct irq_host *irq_host = get_irq_data(cascade_virq); struct irq_host *irq_host = get_irq_data(cascade_virq);
unsigned int virq; unsigned int virq;
spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
desc->chip->mask(cascade_virq); /* IRQ_LEVEL */ desc->chip->mask(cascade_virq); /* IRQ_LEVEL */
spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
virq = __hlwd_pic_get_irq(irq_host); virq = __hlwd_pic_get_irq(irq_host);
if (virq != NO_IRQ) if (virq != NO_IRQ)
...@@ -142,11 +142,11 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq, ...@@ -142,11 +142,11 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
else else
pr_err("spurious interrupt!\n"); pr_err("spurious interrupt!\n");
spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
desc->chip->ack(cascade_virq); /* IRQ_LEVEL */ desc->chip->ack(cascade_virq); /* IRQ_LEVEL */
if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask) if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
desc->chip->unmask(cascade_virq); desc->chip->unmask(cascade_virq);
spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment