ASoC: topology: Change topology device to card device

Topology needs device for prints and resource allocation. So far,
component->dev is used. However, this may lead to high memory use in
model where card is an independent driver which can be reloaded and
topology is loaded from component's probe() method. Every time machine
driver is reloaded topology is being loaded anew, each time allocating
new memory. Said memory will only be freed when component itself is
being freed.

Address the problem by tying topology to component->card->dev instead,
so memory occupied by the topology is freed whenever related machine
device gets removed.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20211015161257.27052-6-cezary.rojewski@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 f7311429651a572c560849cec981c4bb0623b0b2..557e22c5254c76d32e31be17544f2af79abed2a8 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -2668,17 +2668,17 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp,
        /*
         * check if we have sane parameters:
         * comp - needs to exist to keep and reference data while parsing
-        * comp->dev - used for resource management and prints
         * comp->card - used for setting card related parameters
+        * comp->card->dev - used for resource management and prints
         * fw - we need it, as it is the very thing we parse
         */
-       if (!comp || !comp->dev || !comp->card || !fw)
+       if (!comp || !comp->card || !comp->card->dev || !fw)
                return -EINVAL;
 
        /* setup parsing context */
        memset(&tplg, 0, sizeof(tplg));
        tplg.fw = fw;
-       tplg.dev = comp->dev;
+       tplg.dev = comp->card->dev;
        tplg.comp = comp;
        if (ops) {
                tplg.ops = ops;