Unverified Commit bc3955c9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: topology: Change to resource managed memory" from Amadeusz... 

Merge series "ASoC: topology: Change to resource managed memory" from Amadeusz Sławiński<amadeuszx.slawinski@linux.intel.com>:

Almost all other allocations in ASoC API are resource managed, the only
exception is soc-topology.c.

This patchset clean ups few unnecessary functions in preparation for
change and then changes to devm_ functions for allocation.

Amadeusz Sławiński (6):
  ASoC: topology: Remove unused functions from topology API
  ASoC: topology: Remove multistep topology loading
  ASoC: topology: Unify all device references
  ASoC: topology: Change allocations to resource managed
  ASoC: topology: Remove empty functions
  ASoC: topology: Simplify remove_widget function

 include/sound/soc-topology.h           |  13 +-
 sound/soc/intel/skylake/skl-topology.c |   9 +-
 sound/soc/soc-topology.c               | 302 +++++--------------------
 sound/soc/sof/pcm.c                    |   2 +-
 sound/soc/sof/topology.c               |   4 +-
 5 files changed, 57 insertions(+), 273 deletions(-)

--
2.25.1
parents 860bfa6d 8d456654

include/sound/soc-topology.h

+2 −11
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ struct snd_soc_dai_driver; 
struct snd_soc_dai;

struct snd_soc_dapm_route;



/* object scan be loaded and unloaded in groups with identfying indexes */

#define SND_SOC_TPLG_INDEX_ALL	0	/* ID that matches all FW objects */



/* dynamic object type */

enum snd_soc_dobj_type {

	SND_SOC_DOBJ_NONE		= 0,	/* object is not dynamic */
@@ -181,14 +178,8 @@ static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr) 


/* Dynamic Object loading and removal for component drivers */

int snd_soc_tplg_component_load(struct snd_soc_component *comp,

	struct snd_soc_tplg_ops *ops, const struct firmware *fw,

	u32 index);

int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index);



/* Widget removal - widgets also removed wth component API */

void snd_soc_tplg_widget_remove(struct snd_soc_dapm_widget *w);

void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm,

	u32 index);

	struct snd_soc_tplg_ops *ops, const struct firmware *fw);

int snd_soc_tplg_component_remove(struct snd_soc_component *comp);



/* Binds event handlers to dynamic widgets */

int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w,

sound/soc/intel/skylake/skl-topology.c

+2 −7
Original line number Diff line number Diff line
@@ -3742,12 +3742,7 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus) 
	}



component_load:



	/*

	 * The complete tplg for SKL is loaded as index 0, we don't use

	 * any other index

	 */

	ret = snd_soc_tplg_component_load(component, &skl_tplg_ops, fw, 0);

	ret = snd_soc_tplg_component_load(component, &skl_tplg_ops, fw);

	if (ret < 0) {

		dev_err(bus->dev, "tplg component load failed%d\n", ret);

		goto err;
@@ -3777,5 +3772,5 @@ void skl_tplg_exit(struct snd_soc_component *component, struct hdac_bus *bus) 
		list_del(&ppl->node);



	/* clean up topology */

	snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);

	snd_soc_tplg_component_remove(component);

}

sound/soc/soc-topology.c

+51 −251

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/sof/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ static int sof_pcm_probe(struct snd_soc_component *component) 
static void sof_pcm_remove(struct snd_soc_component *component)

{

	/* remove topology */

	snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);

	snd_soc_tplg_component_remove(component);

}



void snd_sof_new_platform_drv(struct snd_sof_dev *sdev)

sound/soc/sof/topology.c

+1 −3
Original line number Diff line number Diff line
@@ -3734,9 +3734,7 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file) 
		return ret;

	}



	ret = snd_soc_tplg_component_load(scomp,

					  &sof_tplg_ops, fw,

					  SND_SOC_TPLG_INDEX_ALL);

	ret = snd_soc_tplg_component_load(scomp, &sof_tplg_ops, fw);

	if (ret < 0) {

		dev_err(scomp->dev, "error: tplg component load failed %d\n",

			ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE