Gitlab 现已全面支持 git over ssh 与 git over https。通过 HTTPS 访问请配置带有 read_repository / write_repository 权限的 Personal access token。通过 SSH 端口访问请使用 22 端口或 13389 端口。如果使用CAS注册了账户但不知道密码，可以自行至设置中更改；如有其他问题，请发邮件至 service@cra.moe 寻求协助。

Unverified Commit b3dea624 authored May 15, 2020 by Kuninori Morimoto Committed by Mark Brown May 18, 2020

ASoC: use snd_soc_xxx_active()



We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/8736826n44.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 5552f8d7

sound/soc/soc-compress.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -231,10 +231,10 @@ static int soc_compr_free(struct snd_compr_stream *cstream)

		snd_soc_dai_digital_mute(codec_dai, 1, cstream->direction);

		if (!cpu_dai->active)
		if (!snd_soc_dai_active(cpu_dai))
		cpu_dai->rate = 0;

		if (!codec_dai->active)
		if (!snd_soc_dai_active(codec_dai))
		codec_dai->rate = 0;

		if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)

sound/soc/soc-core.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -372,7 +372,8 @@ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd)
		dev_dbg(rtd->dev,
		"ASoC: pop wq checking: %s status: %s waiting: %s\n",
		codec_dai->driver->playback.stream_name,
		codec_dai->stream_active[playback] ? "active" : "inactive",
		snd_soc_dai_stream_active(codec_dai, playback) ?
		"active" : "inactive",
		rtd->pop_wait ? "yes" : "no");

		/* are we waiting on this codec DAI stream */
		@@ -546,7 +547,7 @@ int snd_soc_suspend(struct device *dev)
		continue;

		for_each_rtd_codec_dais(rtd, i, dai) {
		if (dai->stream_active[playback])
		if (snd_soc_dai_stream_active(dai, playback))
		snd_soc_dai_digital_mute(dai, 1, playback);
		}
		}
		@@ -688,7 +689,7 @@ static void soc_resume_deferred(struct work_struct *work)
		continue;

		for_each_rtd_codec_dais(rtd, i, dai) {
		if (dai->stream_active[playback])
		if (snd_soc_dai_stream_active(dai, playback))
		snd_soc_dai_digital_mute(dai, 0, playback);
		}
		}
		@@ -718,7 +719,7 @@ int snd_soc_resume(struct device *dev)

		/* activate pins from sleep state */
		for_each_card_components(card, component)
		if (component->active)
		if (snd_soc_component_active(component))
		pinctrl_pm_select_default_state(component->dev);

		dev_dbg(dev, "ASoC: Scheduling resume work\n");
		@@ -1943,7 +1944,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)

		/* deactivate pins to sleep state */
		for_each_card_components(card, component)
		if (!component->active)
		if (!snd_soc_component_active(component))
		pinctrl_pm_select_sleep_state(component->dev);

		probe_end:

sound/soc/soc-pcm.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -750,7 +750,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
		}

		for_each_rtd_components(rtd, i, component)
		if (!component->active)
		if (!snd_soc_component_active(component))
		pinctrl_pm_select_sleep_state(component->dev);

		return 0;
		@@ -844,7 +844,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)

		/* Symmetry only applies if we've already got an active stream. */
		for_each_rtd_dais(rtd, i, dai) {
		if (dai->active) {
		if (snd_soc_dai_active(dai)) {
		ret = soc_pcm_apply_symmetry(substream, dai);
		if (ret != 0)
		goto config_err;
		@@ -882,7 +882,7 @@ component_err:
		}

		for_each_rtd_components(rtd, i, component)
		if (!component->active)
		if (!snd_soc_component_active(component))
		pinctrl_pm_select_sleep_state(component->dev);

		return ret;
		@@ -1136,9 +1136,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)

		/* clear the corresponding DAIs parameters when going to be inactive */
		for_each_rtd_dais(rtd, i, dai) {
		int active = dai->stream_active[substream->stream];
		int active = snd_soc_dai_stream_active(dai, substream->stream);

		if (dai->active == 1) {
		if (snd_soc_dai_active(dai) == 1) {
		dai->rate = 0;
		dai->channels = 0;
		dai->sample_bits = 0;
		@@ -1907,7 +1907,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,

		for_each_rtd_cpu_dais (fe, i, fe_cpu_dai) {
		/* Symmetry only applies if we've got an active stream. */
		if (fe_cpu_dai->active) {
		if (snd_soc_dai_active(fe_cpu_dai)) {
		err = soc_pcm_apply_symmetry(fe_substream, fe_cpu_dai);
		if (err < 0)
		return err;
		@@ -1936,7 +1936,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,

		/* Symmetry only applies if we've got an active stream. */
		for_each_rtd_dais(rtd, i, dai) {
		if (dai->active) {
		if (snd_soc_dai_active(dai)) {
		err = soc_pcm_apply_symmetry(fe_substream, dai);
		if (err < 0)
		return err;
		@@ -2709,7 +2709,7 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
		return 0;

		/* only check active links */
		if (!asoc_rtd_to_cpu(fe, 0)->active)
		if (!snd_soc_dai_active(asoc_rtd_to_cpu(fe, 0)))
		return 0;

		/* DAPM sync will call this to update DSP paths */
		@@ -2724,8 +2724,8 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
		continue;

		/* skip if FE isn't currently playing/capturing */
		if (!asoc_rtd_to_cpu(fe, 0)->stream_active[stream] \|\|
		!asoc_rtd_to_codec(fe, 0)->stream_active[stream])
		if (!snd_soc_dai_stream_active(asoc_rtd_to_cpu(fe, 0), stream) \|\|
		!snd_soc_dai_stream_active(asoc_rtd_to_codec(fe, 0), stream))
		continue;

		paths = dpcm_path_get(fe, stream, &list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE