From fda1357e10853894b45b3b3c7535651af9608406 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Mon, 10 Jul 2006 04:44:33 -0700
Subject: [PATCH] --- yaml --- r: 32255 b: refs/heads/master c:
 4a14cf4508a77d03436f34a1f6a9bc3eee12fc08 h: refs/heads/master i:   32253:
 be9b474ebe00be3446514679e0085ee40777ed8f   32251:
 92e37d1abf63f695fda3d730dafcdf52bb9ae577   32247:
 86dd2b0f50b98c27855e3b508cb569ccc31c3eb1   32239:
 0b08612ff9a1cac527ab9857db4d70b62eb6e6f3   32223:
 5636997b2cae02f240e90894ac057a93bef8deb3   32191:
 772dbcc8cffa8afecc93c211c657d25c70ffe84d   32127:
 2045542ab268ce59c905ca75b3432a8fc473fdbb   31999:
 ed5d4772605f2e11f599c622af7b6e457e443ad3   31743:
 8db48ef2c16457e95e3cefb6a1479b47272df6e6 v: v3

---
 [refs]                                        | 2 +-
 trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index cb5512ad7281..c108ba8ffe60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e154ff3d2c5ad313ef0c66e6217502361cad2799
+refs/heads/master: 4a14cf4508a77d03436f34a1f6a9bc3eee12fc08
diff --git a/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index 01c0724335a3..4f0c17eddece 100644
--- a/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -129,9 +129,6 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 	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_dev *macio,
 		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++) {