if (ac97->num >= 4)
return;
- mutex_lock(&aaci->ac97_sem);
+ down(&aaci->ac97_sem);
aaci_ac97_select_codec(aaci, ac97);
v = readl(aaci->base + AACI_SLFR);
} while (v & (SLFR_1TXB|SLFR_2TXB));
- mutex_unlock(&aaci->ac97_sem);
+ up(&aaci->ac97_sem);
}
/*
if (ac97->num >= 4)
return ~0;
- mutex_lock(&aaci->ac97_sem);
+ down(&aaci->ac97_sem);
aaci_ac97_select_codec(aaci, ac97);
v = ~0;
}
- mutex_unlock(&aaci->ac97_sem);
+ up(&aaci->ac97_sem);
return v;
}
if (ret)
goto out;
- ret = request_irq(aaci->dev->irq[0], aaci_irq, IRQF_SHARED|IRQF_DISABLED,
+ ret = request_irq(aaci->dev->irq[0], aaci_irq, SA_SHIRQ|SA_INTERRUPT,
DRIVER_NAME, aaci);
if (ret)
goto out;
strlcpy(card->driver, DRIVER_NAME, sizeof(card->driver));
strlcpy(card->shortname, "ARM AC'97 Interface", sizeof(card->shortname));
snprintf(card->longname, sizeof(card->longname),
- "%s at 0x%016llx, irq %d",
- card->shortname, (unsigned long long)dev->res.start,
- dev->irq[0]);
+ "%s at 0x%08lx, irq %d",
+ card->shortname, dev->res.start, dev->irq[0]);
aaci = card->private_data;
- mutex_init(&aaci->ac97_sem);
+ init_MUTEX(&aaci->ac97_sem);
spin_lock_init(&aaci->lock);
aaci->card = card;
aaci->dev = dev;