Skip to contentSkip to conversation

Fix snd-aoa irq conversion

PATCH In review Andreas Schwab 2 participants 2 messages Jul 5, 2006

Subsystems (2)
Sound Aoa (Apple Onboard Audio) ALSA driver
lore
Share & tools
lore

Andreas Schwab

author
#0 lore raw

PATCH 1/1 Fix snd-aoa irq conversion

Use proper irq mapping interface for snd-aoa-i2sbus.

Signed-off-by Andreas Schwab <[email protected]>
---
 sound/aoa/soundbus/i2sbus/i2sbus-core.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
sound/aoa/soundbus/i2sbus/i2sbus-core.c +3 -6
Index: linux-2.6.17-git24/sound/aoa/soundbus/i2sbus/i2sbus-core.c
===================================================================
@@ -129,9 +129,6 @@ static int i2sbus_add_dev(struct macio_d
 	if (strncmp(np->name, "i2s-", 4))
 		return 0;
 
-	if (macio_irq_count(macio) != 3)
-		return 0;
-
 	dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL);
 	if (!dev)
 		return 0;

@@ -183,10 +180,10 @@ static int i2sbus_add_dev(struct macio_d
 		snprintf(dev->rnames[i], sizeof(dev->rnames[i]), rnames[i], np->name);
 	}
 	for (i=0;i<3;i++) {
-		if (request_irq(macio_irq(macio, i), ints[i], 0,
-				dev->rnames[i], dev))
+		int irq = irq_of_parse_and_map(np, i);
+		if (request_irq(irq, ints[i], 0, dev->rnames[i], dev))
 			goto err;
-		dev->interrupts[i] = macio_irq(macio, i);
+		dev->interrupts[i] = irq;
 	}
 
 	for (i=0;i<3;i++) {

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Andreas Schwab

Use proper irq mapping interface for snd-aoa-i2sbus.

Signed-off-by Andreas Schwab <[email protected]>
Acked-by Benjamin Herrenschmidt <[email protected]>

One could argue that the "proper" fix is to update macio_asic.c to register the sub-nodes i2s-X as individual devices. That would also allow to move the various resource workarounds there along with others and simplify the code in snd-aoa.

Ben.