OSDN Git Service

ASoC: pcm3168a: cleanup unintuitive mask usage
authorNikita Yushchenko <nikita.yoush@cogentembedded.com>
Tue, 8 Feb 2022 08:42:17 +0000 (11:42 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 14 Feb 2022 12:52:52 +0000 (12:52 +0000)
When checking if the requested parameters are supported, the driver uses
PCM3168A_FMT_DSP_MASK to check for PCM3168A_FMT_DSP_* values.

However, formally not only PCM3168A_FMT_DSP_* values match that
condition, PCM3168A_FMT_I2S_TDM and PCM3168A_FMT_LEFT_J_TDM also do.

The check still gives correct result because those extra values can't
be in 'fmt' at the check location. Still, to make the code less cryptic,
better to compare 'fmt' with PCM3168A_FMT_DSP_* values explicitly.

Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Link: https://lore.kernel.org/r/20220208084220.1289836-2-nikita.yoush@cogentembedded.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/pcm3168a.c

index fdf92c8..987c584 100644 (file)
@@ -33,7 +33,6 @@
 #define PCM3168A_FMT_DSP_B             0x5
 #define PCM3168A_FMT_I2S_TDM           0x6
 #define PCM3168A_FMT_LEFT_J_TDM                0x7
-#define PCM3168A_FMT_DSP_MASK          0x4
 
 #define PCM3168A_NUM_SUPPLIES 6
 static const char *const pcm3168a_supply_names[PCM3168A_NUM_SUPPLIES] = {
@@ -511,7 +510,8 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
                fmt = PCM3168A_FMT_RIGHT_J_16;
                break;
        case 24:
-               if (master_mode || (fmt & PCM3168A_FMT_DSP_MASK)) {
+               if (master_mode || (fmt == PCM3168A_FMT_DSP_A) ||
+                                  (fmt == PCM3168A_FMT_DSP_B)) {
                        dev_err(component->dev, "24-bit slots not supported in master mode, or slave mode using DSP\n");
                        return -EINVAL;
                }