ASoC: max98373-sdw: Switch to new snd_sdw_params_to_config helper

The conversion from hw_params to SoundWire config is pretty
standard as such most of the conversion can be handled by the new
snd_sdw_params_to_config helper function.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221123165432.594972-2-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c
index 899965b19d12da10ae5e9d725500b57501d96b91..3cd1be743d9eebdae5ac071e1ceaaa288f5e1fc2 100644 (file)
--- a/sound/soc/codecs/max98373-sdw.c
+++ b/sound/soc/codecs/max98373-sdw.c
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
+#include <sound/sdw.h>
 #include <sound/soc.h>
 #include <sound/tlv.h>
 #include <linux/of.h>
@@ -533,10 +534,8 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream,
        struct snd_soc_component *component = dai->component;
        struct max98373_priv *max98373 =
                snd_soc_component_get_drvdata(component);
-
-       struct sdw_stream_config stream_config;
-       struct sdw_port_config port_config;
-       enum sdw_data_direction direction;
+       struct sdw_stream_config stream_config = {0};
+       struct sdw_port_config port_config = {0};
        struct sdw_stream_data *stream;
        int ret, chan_sz, sampling_rate;
 
@@ -548,28 +547,20 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream,
        if (!max98373->slave)
                return -EINVAL;
 
+       snd_sdw_params_to_config(substream, params, &stream_config, &port_config);
+
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-               direction = SDW_DATA_DIR_RX;
                port_config.num = 1;
+
+               if (max98373->slot) {
+                       stream_config.ch_count = max98373->slot;
+                       port_config.ch_mask = max98373->rx_mask;
+               }
        } else {
-               direction = SDW_DATA_DIR_TX;
                port_config.num = 3;
-       }
 
-       stream_config.frame_rate = params_rate(params);
-       stream_config.bps = snd_pcm_format_width(params_format(params));
-       stream_config.direction = direction;
-
-       if (max98373->slot && direction == SDW_DATA_DIR_RX) {
-               stream_config.ch_count = max98373->slot;
-               port_config.ch_mask = max98373->rx_mask;
-       } else {
                /* only IV are supported by capture */
-               if (direction == SDW_DATA_DIR_TX)
-                       stream_config.ch_count = 2;
-               else
-                       stream_config.ch_count = params_channels(params);
-
+               stream_config.ch_count = 2;
                port_config.ch_mask = GENMASK((int)stream_config.ch_count - 1, 0);
        }