From 5491799a1556ff237763070402b44221beb05f6e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 20 Apr 2003 09:41:00 -0700 Subject: [PATCH] [SOUND SPARC]: Update for irqreturn_t. --- sound/sparc/amd7930.c | 4 +++- sound/sparc/cs4231.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index 38cd35321dfe8..828846242db21 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c @@ -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) diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index ee9b28117ac23..06a29afb1e410 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -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 -- 2.53.0