The patch titled
Fix snd-aoa irq conversion
has been added to the -mm tree. Its filename is
fix-snd-aoa-irq-conversion.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix snd-aoa irq conversion
From: Andreas Schwab <schwab@xxxxxxx>
Use proper irq mapping interface for snd-aoa-i2sbus.
Signed-off-by: Andreas Schwab <schwab@xxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/aoa/soundbus/i2sbus/i2sbus-core.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff -puN sound/aoa/soundbus/i2sbus/i2sbus-core.c~fix-snd-aoa-irq-conversion sound/aoa/soundbus/i2sbus/i2sbus-core.c
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c~fix-snd-aoa-irq-conversion
+++ a/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++) {
_
Patches currently in -mm which might be from schwab@xxxxxxx are
fix-snd-aoa-irq-conversion.patch
git-klibc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
