Commit 5491799a authored by David S. Miller's avatar David S. Miller

[SOUND SPARC]: Update for irqreturn_t.

parent 4a12ca73
......@@ -497,7 +497,7 @@ static void __amd7930_update_map(amd7930_t *amd)
__amd7930_write_map(amd);
}
static void snd_amd7930_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
amd7930_t *amd = dev_id;
unsigned int elapsed;
......@@ -536,6 +536,8 @@ static void snd_amd7930_interrupt(int irq, void *dev_id, struct pt_regs *regs)
snd_pcm_period_elapsed(amd->playback_substream);
else
snd_pcm_period_elapsed(amd->capture_substream);
return IRQ_HANDLED;
}
static int snd_amd7930_trigger(amd7930_t *amd, unsigned int flag, int cmd)
......
......@@ -1228,7 +1228,7 @@ static void snd_cs4231_generic_interrupt(cs4231_t *chip)
}
#ifdef SBUS_SUPPORT
static void snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
cs4231_t *chip = snd_magic_cast(cs4231_t, dev_id, return);
u32 csr;
......@@ -1240,12 +1240,14 @@ static void snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *reg
APC_GENL_INT |
APC_XINT_PEMP |
APC_XINT_CEMP)))
return;
return IRQ_NONE;
/* ACK the APC interrupt. */
sbus_writel(csr, chip->port + APCCSR);
snd_cs4231_generic_interrupt(chip);
return IRQ_HANDLED;
}
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment