Merge remote-tracking branch 'asoc/topic/component' into asoc-next (73e13d0f) · Commits · 戴 / test

include/sound/soc.h

+7 −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);
		@@ -1487,6 +1492,8 @@ int snd_soc_component_set_sysclk(struct snd_soc_component *component,
		int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id,
		int source, unsigned int freq_in,
		unsigned int freq_out);
		int snd_soc_component_set_jack(struct snd_soc_component *component,
		struct snd_soc_jack jack, void data);

		#ifdef CONFIG_REGMAP

+23 −11

Original line number	Diff line number	Diff line
		@@ -3371,20 +3371,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;
		@@ -3408,6 +3402,24 @@ err_free:
		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);

		/**