Commit 7ccec3e7 authored Dec 18, 2009 by Albert Herranz Committed by Benjamin Herrenschmidt Dec 21, 2009

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: Albert Herranz <albert_herranz@yahoo.es>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 8beac08e

arch/powerpc/platforms/embedded6xx/hlwd-pic.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -132,9 +132,9 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
		struct irq_host *irq_host = get_irq_data(cascade_virq);
		unsigned int virq;

		spin_lock(&desc->lock);
		raw_spin_lock(&desc->lock);
		desc->chip->mask(cascade_virq); /* IRQ_LEVEL */
		spin_unlock(&desc->lock);
		raw_spin_unlock(&desc->lock);

		virq = __hlwd_pic_get_irq(irq_host);
		if (virq != NO_IRQ)
		@@ -142,11 +142,11 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
		else
		pr_err("spurious interrupt!\n");

		spin_lock(&desc->lock);
		raw_spin_lock(&desc->lock);
		desc->chip->ack(cascade_virq); /* IRQ_LEVEL */
		if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
		desc->chip->unmask(cascade_virq);
		spin_unlock(&desc->lock);
		raw_spin_unlock(&desc->lock);
		}

		/*