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 --- sound/soc/fsl/fsl_sai.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index d79cb7eb3b262..56311a0f23b95 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -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,