Merge remote-tracking branch 'asoc/topic/core' into asoc-next (9914574d) · Commits · e / devices / android_kernel_teracube_emerald

sound/soc/soc-core.c

+21 −55

Original line number	Diff line number	Diff line
		@@ -221,14 +221,14 @@ static const struct attribute_group soc_dapm_dev_group = {
		.is_visible = soc_dev_attr_is_visible,
		};

		static const struct attribute_group soc_dev_roup = {
		static const struct attribute_group soc_dev_group = {
		.attrs = soc_dev_attrs,
		.is_visible = soc_dev_attr_is_visible,
		};

		static const struct attribute_group *soc_dev_attr_groups[] = {
		&soc_dapm_dev_group,
		&soc_dev_roup,
		&soc_dev_group,
		NULL
		};

		@@ -349,7 +349,7 @@ static void soc_init_codec_debugfs(struct snd_soc_component *component)
		"ASoC: Failed to create codec register debugfs file\n");
		}

		static int codec_list_seq_show(struct seq_file m, void v)
		static int codec_list_show(struct seq_file m, void v)
		{
		struct snd_soc_codec *codec;

		@@ -362,20 +362,9 @@ static int codec_list_seq_show(struct seq_file m, void v)

		return 0;
		}
		DEFINE_SHOW_ATTRIBUTE(codec_list);

		static int codec_list_seq_open(struct inode inode, struct file file)
		{
		return single_open(file, codec_list_seq_show, NULL);
		}

		static const struct file_operations codec_list_fops = {
		.open = codec_list_seq_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = single_release,
		};

		static int dai_list_seq_show(struct seq_file m, void v)
		static int dai_list_show(struct seq_file m, void v)
		{
		struct snd_soc_component *component;
		struct snd_soc_dai *dai;
		@@ -390,20 +379,9 @@ static int dai_list_seq_show(struct seq_file m, void v)

		return 0;
		}
		DEFINE_SHOW_ATTRIBUTE(dai_list);

		static int dai_list_seq_open(struct inode inode, struct file file)
		{
		return single_open(file, dai_list_seq_show, NULL);
		}

		static const struct file_operations dai_list_fops = {
		.open = dai_list_seq_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = single_release,
		};

		static int platform_list_seq_show(struct seq_file m, void v)
		static int platform_list_show(struct seq_file m, void v)
		{
		struct snd_soc_platform *platform;

		@@ -416,18 +394,7 @@ static int platform_list_seq_show(struct seq_file m, void v)

		return 0;
		}

		static int platform_list_seq_open(struct inode inode, struct file file)
		{
		return single_open(file, platform_list_seq_show, NULL);
		}

		static const struct file_operations platform_list_fops = {
		.open = platform_list_seq_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = single_release,
		};
		DEFINE_SHOW_ATTRIBUTE(platform_list);

		static void soc_init_card_debugfs(struct snd_soc_card *card)
		{
		@@ -1100,7 +1067,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
		cpu_dai_component.dai_name = dai_link->cpu_dai_name;
		rtd->cpu_dai = snd_soc_find_dai(&cpu_dai_component);
		if (!rtd->cpu_dai) {
		dev_err(card->dev, "ASoC: CPU DAI %s not registered\n",
		dev_info(card->dev, "ASoC: CPU DAI %s not registered\n",
		dai_link->cpu_dai_name);
		goto _err_defer;
		}
		@@ -1619,21 +1586,20 @@ static int soc_probe_link_components(struct snd_soc_card *card,

		static int soc_probe_dai(struct snd_soc_dai *dai, int order)
		{
		int ret;
		if (dai->probed \|\|
		dai->driver->probe_order != order)
		return 0;

		if (!dai->probed && dai->driver->probe_order == order) {
		if (dai->driver->probe) {
		ret = dai->driver->probe(dai);
		int ret = dai->driver->probe(dai);
		if (ret < 0) {
		dev_err(dai->dev,
		"ASoC: failed to probe DAI %s: %d\n",
		dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n",
		dai->name, ret);
		return ret;
		}
		}

		dai->probed = 1;
		}

		return 0;
		}