OSDN Git Service

ASoC: SOF: topology: make process type optional
authorKeyon Jie <yang.jie@linux.intel.com>
Fri, 4 Sep 2020 13:27:44 +0000 (16:27 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 7 Sep 2020 14:16:47 +0000 (15:16 +0100)
As components can be now identified with a UUID based mechanism, the
process type is no longer required. For new DSP components, process and
its component type can be set to SOF_PROCESS_NONE and SOF_COMP_NONE.
Allow this combination in topology load, modify the load time check for
process type to reflect this.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Curtis Malainey <curtis@malainey.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200904132744.1699575-17-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/topology.c

index 69865df..49fae48 100644 (file)
@@ -2197,12 +2197,6 @@ static int sof_process_load(struct snd_soc_component *scomp, int index,
        int ret;
        int i;
 
-       if (type == SOF_COMP_NONE) {
-               dev_err(scomp->dev, "error: invalid process comp type %d\n",
-                       type);
-               return -EINVAL;
-       }
-
        /* allocate struct for widget control data sizes and types */
        if (widget->num_kcontrols) {
                wdata = kcalloc(widget->num_kcontrols,