ASoC: amd: refactoring dai_hw_params() callback

Removed api config_pdm_stream_params().
Modified switch case for channel check.
Default case should return -EINVAL.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/20200519143422.18255-2-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/renoir/acp3x-pdm-dma.c b/sound/soc/amd/renoir/acp3x-pdm-dma.c
index b33c7aec7481c360b9e31879a09b677d617770a7..623dfd3ea70517377dfde0c08c345141c100d3c7 100644 (file)
--- a/sound/soc/amd/renoir/acp3x-pdm-dma.c
+++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c
@@ -72,14 +72,6 @@ static void init_pdm_ring_buffer(u32 physical_addr,
        rn_writel(0x01, acp_base + ACPAXI2AXI_ATU_CTRL);
 }
 
-static void config_pdm_stream_params(unsigned int ch_mask,
-                                    void __iomem *acp_base)
-{
-       rn_writel(ch_mask, acp_base + ACP_WOV_PDM_NO_OF_CHANNELS);
-       rn_writel(PDM_DECIMATION_FACTOR, acp_base +
-                 ACP_WOV_PDM_DECIMATION_FACTOR);
-}
-
 static void enable_pdm_clock(void __iomem *acp_base)
 {
        u32 pdm_clk_enable, pdm_ctrl;
@@ -332,11 +324,14 @@ static int acp_pdm_dai_hw_params(struct snd_pcm_substream *substream,
        rtd = substream->runtime->private_data;
        switch (params_channels(params)) {
        case TWO_CH:
-       default:
                ch_mask = 0x00;
                break;
+       default:
+               return -EINVAL;
        }
-       config_pdm_stream_params(ch_mask, rtd->acp_base);
+       rn_writel(ch_mask, rtd->acp_base + ACP_WOV_PDM_NO_OF_CHANNELS);
+       rn_writel(PDM_DECIMATION_FACTOR, rtd->acp_base +
+                 ACP_WOV_PDM_DECIMATION_FACTOR);
        return 0;
 }