Unverified Commit b92bc4d6 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-pcm: merge soc_pcm_hw_update_format/subformat() 



format() and subformat() should be handled in the same time, no need to
have each functions. Let's merge these

	soc_pcm_hw_update_format()
	soc_pcm_hw_update_subformat()

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/87v7soz664.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent de22dc76

sound/soc/soc-pcm.c

+2 −11
Original line number Diff line number Diff line
@@ -604,11 +604,6 @@ static void soc_pcm_hw_update_format(struct snd_pcm_hardware *hw, 
				     const struct snd_soc_pcm_stream *p)

{

	hw->formats	&= p->formats;

}



static void soc_pcm_hw_update_subformat(struct snd_pcm_hardware *hw,

					const struct snd_soc_pcm_stream *p)

{

	hw->subformats	&= p->subformats;

}
@@ -650,7 +645,6 @@ int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd, 
		soc_pcm_hw_update_chan(hw, cpu_stream);

		soc_pcm_hw_update_rate(hw, cpu_stream);

		soc_pcm_hw_update_format(hw, cpu_stream);

		soc_pcm_hw_update_subformat(hw, cpu_stream);

	}

	cpu_chan_min = hw->channels_min;

	cpu_chan_max = hw->channels_max;
@@ -672,7 +666,6 @@ int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd, 
		soc_pcm_hw_update_chan(hw, codec_stream);

		soc_pcm_hw_update_rate(hw, codec_stream);

		soc_pcm_hw_update_format(hw, codec_stream);

		soc_pcm_hw_update_subformat(hw, codec_stream);

	}



	/* Verify both a valid CPU DAI and a valid CODEC DAI were found */
@@ -1765,7 +1758,6 @@ static void dpcm_runtime_setup_fe(struct snd_pcm_substream *substream) 
		soc_pcm_hw_update_rate(hw, cpu_stream);

		soc_pcm_hw_update_chan(hw, cpu_stream);

		soc_pcm_hw_update_format(hw, cpu_stream);

		soc_pcm_hw_update_subformat(hw, cpu_stream);

	}



}
@@ -1803,7 +1795,6 @@ static void dpcm_runtime_setup_be_format(struct snd_pcm_substream *substream) 
			codec_stream = snd_soc_dai_get_pcm_stream(dai, stream);



			soc_pcm_hw_update_format(hw, codec_stream);

			soc_pcm_hw_update_subformat(hw, codec_stream);

		}

	}

}