]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: nau8821: Simplify conditional in nau8821_get_osr()
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Wed, 31 Dec 2025 20:04:19 +0000 (22:04 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 5 Jan 2026 13:25:49 +0000 (13:25 +0000)
Get rid of the unnecessary branch to address checkpatch complaint:

  WARNING: else is not generally useful after a break or return

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://patch.msgid.link/20251231-nau8821-cleanup-v1-5-6b0b76cbbb64@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/nau8821.c

index 6dffda69f1ff813fba90490607876ee68cc163f0..10e8c220c0e03fa6a8d0227a79f8cb881b98836e 100644 (file)
@@ -806,16 +806,20 @@ nau8821_get_osr(struct nau8821 *nau8821, int stream)
        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
                regmap_read(nau8821->regmap, NAU8821_R2C_DAC_CTRL1, &osr);
                osr &= NAU8821_DAC_OVERSAMPLE_MASK;
+
                if (osr >= ARRAY_SIZE(osr_dac_sel))
                        return NULL;
+
                return &osr_dac_sel[osr];
-       } else {
-               regmap_read(nau8821->regmap, NAU8821_R2B_ADC_RATE, &osr);
-               osr &= NAU8821_ADC_SYNC_DOWN_MASK;
-               if (osr >= ARRAY_SIZE(osr_adc_sel))
-                       return NULL;
-               return &osr_adc_sel[osr];
        }
+
+       regmap_read(nau8821->regmap, NAU8821_R2B_ADC_RATE, &osr);
+       osr &= NAU8821_ADC_SYNC_DOWN_MASK;
+
+       if (osr >= ARRAY_SIZE(osr_adc_sel))
+               return NULL;
+
+       return &osr_adc_sel[osr];
 }
 
 static int nau8821_dai_startup(struct snd_pcm_substream *substream,