ASoC: topology: Fix function name

[platform/kernel/linux-starfive.git] / sound / soc / soc-topology.c

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index c3be24b..1fe4fa8 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -44,9 +44,8 @@
 #define SOC_TPLG_PASS_WIDGET           3
 #define SOC_TPLG_PASS_PCM_DAI          4
 #define SOC_TPLG_PASS_GRAPH            5
-#define SOC_TPLG_PASS_PINS             6
-#define SOC_TPLG_PASS_BE_DAI           7
-#define SOC_TPLG_PASS_LINK             8
+#define SOC_TPLG_PASS_BE_DAI           6
+#define SOC_TPLG_PASS_LINK             7
 
 #define SOC_TPLG_PASS_START    SOC_TPLG_PASS_MANIFEST
 #define SOC_TPLG_PASS_END      SOC_TPLG_PASS_LINK
@@ -186,7 +185,7 @@ static const struct soc_tplg_map dapm_map[] = {
        {SND_SOC_TPLG_DAPM_DECODER, snd_soc_dapm_decoder},
 };
 
-static int tplc_chan_get_reg(struct soc_tplg *tplg,
+static int tplg_chan_get_reg(struct soc_tplg *tplg,
        struct snd_soc_tplg_channel *chan, int map)
 {
        int i;
@@ -199,7 +198,7 @@ static int tplc_chan_get_reg(struct soc_tplg *tplg,
        return -EINVAL;
 }
 
-static int tplc_chan_get_shift(struct soc_tplg *tplg,
+static int tplg_chan_get_shift(struct soc_tplg *tplg,
        struct snd_soc_tplg_channel *chan, int map)
 {
        int i;
@@ -780,10 +779,10 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, size_t size)
        kc.access = le32_to_cpu(mc->hdr.access);
 
        /* we only support FL/FR channel mapping atm */
-       sm->reg = tplc_chan_get_reg(tplg, mc->channel, SNDRV_CHMAP_FL);
-       sm->rreg = tplc_chan_get_reg(tplg, mc->channel, SNDRV_CHMAP_FR);
-       sm->shift = tplc_chan_get_shift(tplg, mc->channel, SNDRV_CHMAP_FL);
-       sm->rshift = tplc_chan_get_shift(tplg, mc->channel, SNDRV_CHMAP_FR);
+       sm->reg = tplg_chan_get_reg(tplg, mc->channel, SNDRV_CHMAP_FL);
+       sm->rreg = tplg_chan_get_reg(tplg, mc->channel, SNDRV_CHMAP_FR);
+       sm->shift = tplg_chan_get_shift(tplg, mc->channel, SNDRV_CHMAP_FL);
+       sm->rshift = tplg_chan_get_shift(tplg, mc->channel, SNDRV_CHMAP_FR);
 
        sm->max = le32_to_cpu(mc->max);
        sm->min = le32_to_cpu(mc->min);
@@ -927,10 +926,10 @@ static int soc_tplg_denum_create(struct soc_tplg *tplg, size_t size)
        kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
        kc.access = le32_to_cpu(ec->hdr.access);
 
-       se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL);
-       se->shift_l = tplc_chan_get_shift(tplg, ec->channel,
+       se->reg = tplg_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL);
+       se->shift_l = tplg_chan_get_shift(tplg, ec->channel,
                SNDRV_CHMAP_FL);
-       se->shift_r = tplc_chan_get_shift(tplg, ec->channel,
+       se->shift_r = tplg_chan_get_shift(tplg, ec->channel,
                SNDRV_CHMAP_FL);
 
        se->mask = le32_to_cpu(ec->mask);
@@ -1161,13 +1160,13 @@ static int soc_tplg_dapm_widget_dmixer_create(struct soc_tplg *tplg, struct snd_
        kc->access = le32_to_cpu(mc->hdr.access);
 
        /* we only support FL/FR channel mapping atm */
-       sm->reg = tplc_chan_get_reg(tplg, mc->channel,
+       sm->reg = tplg_chan_get_reg(tplg, mc->channel,
                                    SNDRV_CHMAP_FL);
-       sm->rreg = tplc_chan_get_reg(tplg, mc->channel,
+       sm->rreg = tplg_chan_get_reg(tplg, mc->channel,
                                     SNDRV_CHMAP_FR);
-       sm->shift = tplc_chan_get_shift(tplg, mc->channel,
+       sm->shift = tplg_chan_get_shift(tplg, mc->channel,
                                        SNDRV_CHMAP_FL);
-       sm->rshift = tplc_chan_get_shift(tplg, mc->channel,
+       sm->rshift = tplg_chan_get_shift(tplg, mc->channel,
                                         SNDRV_CHMAP_FR);
 
        sm->max = le32_to_cpu(mc->max);
@@ -1233,10 +1232,10 @@ static int soc_tplg_dapm_widget_denum_create(struct soc_tplg *tplg, struct snd_k
        kc->access = le32_to_cpu(ec->hdr.access);
 
        /* we only support FL/FR channel mapping atm */
-       se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL);
-       se->shift_l = tplc_chan_get_shift(tplg, ec->channel,
+       se->reg = tplg_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL);
+       se->shift_l = tplg_chan_get_shift(tplg, ec->channel,
                                          SNDRV_CHMAP_FL);
-       se->shift_r = tplc_chan_get_shift(tplg, ec->channel,
+       se->shift_r = tplg_chan_get_shift(tplg, ec->channel,
                                          SNDRV_CHMAP_FR);
 
        se->items = le32_to_cpu(ec->items);
@@ -2390,7 +2389,7 @@ static int soc_tplg_manifest_load(struct soc_tplg *tplg,
 }
 
 /* validate header magic, size and type */
-static int soc_valid_header(struct soc_tplg *tplg,
+static int soc_tplg_valid_header(struct soc_tplg *tplg,
        struct snd_soc_tplg_hdr *hdr)
 {
        if (soc_tplg_get_hdr_offset(tplg) >= tplg->fw->size)
@@ -2404,7 +2403,7 @@ static int soc_valid_header(struct soc_tplg *tplg,
                return -EINVAL;
        }
 
-       if (soc_tplg_get_hdr_offset(tplg) + hdr->payload_size >= tplg->fw->size) {
+       if (soc_tplg_get_hdr_offset(tplg) + le32_to_cpu(hdr->payload_size) >= tplg->fw->size) {
                dev_err(tplg->dev,
                        "ASoC: invalid header of type %d at offset %ld payload_size %d\n",
                        le32_to_cpu(hdr->type), soc_tplg_get_hdr_offset(tplg),
@@ -2527,7 +2526,7 @@ static int soc_tplg_process_headers(struct soc_tplg *tplg)
                while (!soc_tplg_is_eof(tplg)) {
 
                        /* make sure header is valid before loading */
-                       ret = soc_valid_header(tplg, hdr);
+                       ret = soc_tplg_valid_header(tplg, hdr);
                        if (ret < 0) {
                                dev_err(tplg->dev,
                                        "ASoC: topology: invalid header: %d\n", ret);