ASoC: topology: Clean up route loading

Instead of using very long macro name, assign it to shorter variable
and use it instead. While doing that, we can reduce multiple if checks
using this define to one.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20240603102818.36165-5-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 1db540aaad451f22a6225e67423dbd6fe236d130..2ac442644ed4f966138eec44ba1ebc15841f5d88 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1021,6 +1021,7 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg,
        struct snd_soc_tplg_hdr *hdr)
 {
        struct snd_soc_dapm_context *dapm = &tplg->comp->dapm;
+       const size_t maxlen = SNDRV_CTL_ELEM_ID_NAME_MAXLEN;
        struct snd_soc_tplg_dapm_graph_elem *elem;
        struct snd_soc_dapm_route *route;
        int count, i;
@@ -1044,38 +1045,27 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg,
                tplg->pos += sizeof(struct snd_soc_tplg_dapm_graph_elem);
 
                /* validate routes */
-               if (strnlen(elem->source, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
-                           SNDRV_CTL_ELEM_ID_NAME_MAXLEN) {
-                       ret = -EINVAL;
-                       break;
-               }
-               if (strnlen(elem->sink, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
-                           SNDRV_CTL_ELEM_ID_NAME_MAXLEN) {
-                       ret = -EINVAL;
-                       break;
-               }
-               if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
-                           SNDRV_CTL_ELEM_ID_NAME_MAXLEN) {
+               if ((strnlen(elem->source, maxlen) == maxlen) ||
+                   (strnlen(elem->sink, maxlen) == maxlen) ||
+                   (strnlen(elem->control, maxlen) == maxlen)) {
                        ret = -EINVAL;
                        break;
                }
 
                route->source = devm_kmemdup(tplg->dev, elem->source,
-                                            min(strlen(elem->source),
-                                                SNDRV_CTL_ELEM_ID_NAME_MAXLEN),
+                                            min(strlen(elem->source), maxlen),
                                             GFP_KERNEL);
                route->sink = devm_kmemdup(tplg->dev, elem->sink,
-                                          min(strlen(elem->sink), SNDRV_CTL_ELEM_ID_NAME_MAXLEN),
+                                          min(strlen(elem->sink), maxlen),
                                           GFP_KERNEL);
                if (!route->source || !route->sink) {
                        ret = -ENOMEM;
                        break;
                }
 
-               if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) != 0) {
+               if (strnlen(elem->control, maxlen) != 0) {
                        route->control = devm_kmemdup(tplg->dev, elem->control,
-                                                     min(strlen(elem->control),
-                                                         SNDRV_CTL_ELEM_ID_NAME_MAXLEN),
+                                                     min(strlen(elem->control), maxlen),
                                                      GFP_KERNEL);
                        if (!route->control) {
                                ret = -ENOMEM;