Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57bf7726 authored Aug 19, 2014 by Lars-Peter Clausen Committed by Mark Brown Aug 19, 2014

ASoC: Pass component instead of DAPM context to AUX dev init callback

Given that the component is the containing structure it makes more sense to pass
the component rather than the DAPM context to the AUX dev init callback.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 65d9361f

include/sound/soc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1022,7 +1022,7 @@ struct snd_soc_aux_dev {
		const struct device_node *codec_of_node;

		/* codec/machine specific init - e.g. add machine controls */
		int (init)(struct snd_soc_dapm_context dapm);
		int (init)(struct snd_soc_component component);
		};

		/* SoC card */

sound/soc/samsung/speyside.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -228,10 +228,12 @@ static struct snd_soc_dai_link speyside_dai[] = {
		},
		};

		static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm)
		static int speyside_wm9081_init(struct snd_soc_component *component)
		{
		struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

		/* At any time the WM9081 is active it will have this clock */
		return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0,
		return snd_soc_codec_set_sysclk(codec, WM9081_SYSCLK_MCLK, 0,
		MCLK_AUDIO_RATE, 0);
		}

sound/soc/soc-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1632,7 +1632,7 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num)

		/* do machine specific initialization */
		if (aux_dev->init) {
		ret = aux_dev->init(snd_soc_component_get_dapm(rtd->component));
		ret = aux_dev->init(rtd->component);
		if (ret < 0) {
		dev_err(card->dev, "ASoC: failed to init %s: %d\n",
		aux_dev->name, ret);