[PATCH] Fix snd-aoa irq conversion

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

Signed-off-by: Andreas Schwab <schwab@suse.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Jaroslav Kysela <perex@suse.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index 01c0724335a3..4f0c17eddece 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/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++) {