Skip to content

Commit

Permalink
ASoC: fsl_sai: simplify irq return value
Browse files Browse the repository at this point in the history
Instead of using a boolean "irq_none" to describe the interrupt
handlers return value use a variable of type irqreturn_t and return
it directly. No functional change.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.kernel.org/r/20220302083428.3804687-3-s.hauer@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Sascha Hauer authored and Mark Brown committed Mar 7, 2022
1 parent bd393e2 commit cb00b4c
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions sound/soc/fsl/fsl_sai.c
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ static irqreturn_t fsl_sai_isr(int irq, void *devid)
unsigned int ofs = sai->soc_data->reg_offset;
struct device *dev = &sai->pdev->dev;
u32 flags, xcsr, mask;
bool irq_none = true;
irqreturn_t iret = IRQ_NONE;

/*
* Both IRQ status bits and IRQ mask bits are in the xCSR but
@@ -76,7 +76,7 @@ static irqreturn_t fsl_sai_isr(int irq, void *devid)
flags = xcsr & mask;

if (flags)
irq_none = false;
iret = IRQ_HANDLED;
else
goto irq_rx;

@@ -110,7 +110,7 @@ static irqreturn_t fsl_sai_isr(int irq, void *devid)
flags = xcsr & mask;

if (flags)
irq_none = false;
iret = IRQ_HANDLED;
else
goto out;

@@ -139,10 +139,7 @@ static irqreturn_t fsl_sai_isr(int irq, void *devid)
regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), flags | xcsr);

out:
if (irq_none)
return IRQ_NONE;
else
return IRQ_HANDLED;
return iret;
}

static int fsl_sai_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask,

0 comments on commit cb00b4c

Please sign in to comment.