]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: soc-core: reuse rtdcom at snd_soc_rtdcom_add()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 7 Aug 2019 01:30:47 +0000 (10:30 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 7 Aug 2019 13:25:54 +0000 (14:25 +0100)
snd_soc_rtdcom_add() is using both "rtdcom" and "new_rtdcom" as
variable name, but these are not used at same time.
Let's reuse rtdcom.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h86tahp2.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index e176b972e4e62e1cd9c9dfe8e1fdbcf73d8ccf0c..d12054ab87418887bd21f353b5c659aae85900d0 100644 (file)
@@ -274,7 +274,6 @@ static int snd_soc_rtdcom_add(struct snd_soc_pcm_runtime *rtd,
                              struct snd_soc_component *component)
 {
        struct snd_soc_rtdcom_list *rtdcom;
-       struct snd_soc_rtdcom_list *new_rtdcom;
 
        for_each_rtdcom(rtd, rtdcom) {
                /* already connected */
@@ -282,14 +281,14 @@ static int snd_soc_rtdcom_add(struct snd_soc_pcm_runtime *rtd,
                        return 0;
        }
 
-       new_rtdcom = kmalloc(sizeof(*new_rtdcom), GFP_KERNEL);
-       if (!new_rtdcom)
+       rtdcom = kmalloc(sizeof(*rtdcom), GFP_KERNEL);
+       if (!rtdcom)
                return -ENOMEM;
 
-       new_rtdcom->component = component;
-       INIT_LIST_HEAD(&new_rtdcom->list);
+       rtdcom->component = component;
+       INIT_LIST_HEAD(&rtdcom->list);
 
-       list_add_tail(&new_rtdcom->list, &rtd->component_list);
+       list_add_tail(&rtdcom->list, &rtd->component_list);
 
        return 0;
 }