ASoC: mchp-spdiftx: use FIELD_PREP() where possible

Use directly FIELD_PREP() marco where possible. There is no need for
the extra wrappers.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230301113807.24036-2-claudiu.beznea@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c
index 20d135c718b070f479f60f91b23c6a5cbf1dbc21..bf4252412f9fdadbfe9d4567d8bbdd040b38fec1 100644 (file)
--- a/sound/soc/atmel/mchp-spdiftx.c
+++ b/sound/soc/atmel/mchp-spdiftx.c
@@ -72,11 +72,9 @@
 
 /* Valid Bits per Sample */
 #define SPDIFTX_MR_VBPS_MASK           GENMASK(13, 8)
-#define SPDIFTX_MR_VBPS(bps)           FIELD_PREP(SPDIFTX_MR_VBPS_MASK, bps)
 
 /* Chunk Size */
 #define SPDIFTX_MR_CHUNK_MASK          GENMASK(19, 16)
-#define SPDIFTX_MR_CHUNK(size)         FIELD_PREP(SPDIFTX_MR_CHUNK_MASK, size)
 
 /* Validity Bits for Channels 1 and 2 */
 #define SPDIFTX_MR_VALID1                      BIT(24)
@@ -89,7 +87,6 @@
 
 /* Bytes per Sample */
 #define SPDIFTX_MR_BPS_MASK            GENMASK(29, 28)
-#define SPDIFTX_MR_BPS(bytes)          FIELD_PREP(SPDIFTX_MR_BPS_MASK, (bytes - 1))
 
 /*
  * ---- Interrupt Enable/Disable/Mask/Status Register (Write/Read-only) ----
@@ -402,47 +399,47 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream,
                        params_channels(params));
                return -EINVAL;
        }
-       mr |= SPDIFTX_MR_CHUNK(dev->playback.maxburst);
+       mr |= FIELD_PREP(SPDIFTX_MR_CHUNK_MASK, dev->playback.maxburst);
 
        switch (params_format(params)) {
        case SNDRV_PCM_FORMAT_S8:
-               mr |= SPDIFTX_MR_VBPS(8);
+               mr |= FIELD_PREP(SPDIFTX_MR_VBPS_MASK, 8);
                break;
        case SNDRV_PCM_FORMAT_S16_BE:
                mr |= SPDIFTX_MR_ENDIAN_BIG;
                fallthrough;
        case SNDRV_PCM_FORMAT_S16_LE:
-               mr |= SPDIFTX_MR_VBPS(16);
+               mr |= FIELD_PREP(SPDIFTX_MR_VBPS_MASK, 16);
                break;
        case SNDRV_PCM_FORMAT_S18_3BE:
                mr |= SPDIFTX_MR_ENDIAN_BIG;
                fallthrough;
        case SNDRV_PCM_FORMAT_S18_3LE:
-               mr |= SPDIFTX_MR_VBPS(18);
+               mr |= FIELD_PREP(SPDIFTX_MR_VBPS_MASK, 18);
                break;
        case SNDRV_PCM_FORMAT_S20_3BE:
                mr |= SPDIFTX_MR_ENDIAN_BIG;
                fallthrough;
        case SNDRV_PCM_FORMAT_S20_3LE:
-               mr |= SPDIFTX_MR_VBPS(20);
+               mr |= FIELD_PREP(SPDIFTX_MR_VBPS_MASK, 20);
                break;
        case SNDRV_PCM_FORMAT_S24_3BE:
                mr |= SPDIFTX_MR_ENDIAN_BIG;
                fallthrough;
        case SNDRV_PCM_FORMAT_S24_3LE:
-               mr |= SPDIFTX_MR_VBPS(24);
+               mr |= FIELD_PREP(SPDIFTX_MR_VBPS_MASK, 24);
                break;
        case SNDRV_PCM_FORMAT_S24_BE:
                mr |= SPDIFTX_MR_ENDIAN_BIG;
                fallthrough;
        case SNDRV_PCM_FORMAT_S24_LE:
-               mr |= SPDIFTX_MR_VBPS(24);
+               mr |= FIELD_PREP(SPDIFTX_MR_VBPS_MASK, 24);
                break;
        case SNDRV_PCM_FORMAT_S32_BE:
                mr |= SPDIFTX_MR_ENDIAN_BIG;
                fallthrough;
        case SNDRV_PCM_FORMAT_S32_LE:
-               mr |= SPDIFTX_MR_VBPS(32);
+               mr |= FIELD_PREP(SPDIFTX_MR_VBPS_MASK, 32);
                break;
        default:
                dev_err(dev->dev, "unsupported PCM format: %d\n",
@@ -450,7 +447,7 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
 
-       mr |= SPDIFTX_MR_BPS(bps);
+       mr |= FIELD_PREP(SPDIFTX_MR_BPS_MASK, bps - 1);
 
        switch (params_rate(params)) {
        case 22050: