Commit 50014499 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: use devm_xxx for component related resource

dai / component related resources are created when component is
registered, and it will be freed when component was unregistered.
These resources are not re-used after that.
This means, we can use devm_xxx for dai / component, without
thinking about kfree().
This patch uses devm_xxx for these.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/8736gbbu1a.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f23f718
...@@ -2506,7 +2506,7 @@ static char *fmt_single_name(struct device *dev, int *id) ...@@ -2506,7 +2506,7 @@ static char *fmt_single_name(struct device *dev, int *id)
*id = 0; *id = 0;
} }
return kstrdup(name, GFP_KERNEL); return devm_kstrdup(dev, name, GFP_KERNEL);
} }
/* /*
...@@ -2523,7 +2523,7 @@ static inline char *fmt_multiple_name(struct device *dev, ...@@ -2523,7 +2523,7 @@ static inline char *fmt_multiple_name(struct device *dev,
return NULL; return NULL;
} }
return kstrdup(dai_drv->name, GFP_KERNEL); return devm_kstrdup(dev, dai_drv->name, GFP_KERNEL);
} }
/** /**
...@@ -2539,8 +2539,6 @@ static void snd_soc_unregister_dais(struct snd_soc_component *component) ...@@ -2539,8 +2539,6 @@ static void snd_soc_unregister_dais(struct snd_soc_component *component)
dev_dbg(component->dev, "ASoC: Unregistered DAI '%s'\n", dev_dbg(component->dev, "ASoC: Unregistered DAI '%s'\n",
dai->name); dai->name);
list_del(&dai->list); list_del(&dai->list);
kfree(dai->name);
kfree(dai);
} }
} }
...@@ -2554,7 +2552,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, ...@@ -2554,7 +2552,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component,
dev_dbg(dev, "ASoC: dynamically register DAI %s\n", dev_name(dev)); dev_dbg(dev, "ASoC: dynamically register DAI %s\n", dev_name(dev));
dai = kzalloc(sizeof(struct snd_soc_dai), GFP_KERNEL); dai = devm_kzalloc(dev, sizeof(*dai), GFP_KERNEL);
if (dai == NULL) if (dai == NULL)
return NULL; return NULL;
...@@ -2576,10 +2574,8 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, ...@@ -2576,10 +2574,8 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component,
else else
dai->id = component->num_dai; dai->id = component->num_dai;
} }
if (dai->name == NULL) { if (!dai->name)
kfree(dai);
return NULL; return NULL;
}
dai->component = component; dai->component = component;
dai->dev = dev; dai->dev = dev;
...@@ -2765,7 +2761,6 @@ static void snd_soc_component_add(struct snd_soc_component *component) ...@@ -2765,7 +2761,6 @@ static void snd_soc_component_add(struct snd_soc_component *component)
static void snd_soc_component_cleanup(struct snd_soc_component *component) static void snd_soc_component_cleanup(struct snd_soc_component *component)
{ {
snd_soc_unregister_dais(component); snd_soc_unregister_dais(component);
kfree(component->name);
} }
static void snd_soc_component_del_unlocked(struct snd_soc_component *component) static void snd_soc_component_del_unlocked(struct snd_soc_component *component)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment