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

Commit d7346278 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/component' of... 

Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
parents 7dd5d0d9 e0dac41b

include/sound/soc.h

+5 −0
Original line number Diff line number Diff line
@@ -468,6 +468,11 @@ int snd_soc_register_codec(struct device *dev, 
		const struct snd_soc_codec_driver *codec_drv,

		struct snd_soc_dai_driver *dai_drv, int num_dai);

void snd_soc_unregister_codec(struct device *dev);

int snd_soc_add_component(struct device *dev,

		struct snd_soc_component *component,

		const struct snd_soc_component_driver *component_driver,

		struct snd_soc_dai_driver *dai_drv,

		int num_dai);

int snd_soc_register_component(struct device *dev,

			 const struct snd_soc_component_driver *component_driver,

			 struct snd_soc_dai_driver *dai_drv, int num_dai);

sound/soc/soc-core.c

+23 −11
Original line number Diff line number Diff line
@@ -3404,20 +3404,14 @@ static void snd_soc_component_del_unlocked(struct snd_soc_component *component) 
	list_del(&component->list);

}



int snd_soc_register_component(struct device *dev,

int snd_soc_add_component(struct device *dev,

			struct snd_soc_component *component,

			const struct snd_soc_component_driver *component_driver,

			struct snd_soc_dai_driver *dai_drv,

			int num_dai)

{

	struct snd_soc_component *component;

	int ret;



	component = kzalloc(sizeof(*component), GFP_KERNEL);

	if (!component) {

		dev_err(dev, "ASoC: Failed to allocate memory\n");

		return -ENOMEM;

	}



	ret = snd_soc_component_initialize(component, component_driver, dev);

	if (ret)

		goto err_free;
@@ -3441,6 +3435,24 @@ int snd_soc_register_component(struct device *dev, 
	kfree(component);

	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_add_component);



int snd_soc_register_component(struct device *dev,

			const struct snd_soc_component_driver *component_driver,

			struct snd_soc_dai_driver *dai_drv,

			int num_dai)

{

	struct snd_soc_component *component;



	component = kzalloc(sizeof(*component), GFP_KERNEL);

	if (!component) {

		dev_err(dev, "ASoC: Failed to allocate memory\n");

		return -ENOMEM;

	}



	return snd_soc_add_component(dev, component, component_driver,

				     dai_drv, num_dai);

}

EXPORT_SYMBOL_GPL(snd_soc_register_component);



/**