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

Commit 48d365de authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'soundwire-4.21-rc1' of... 

Merge tag 'soundwire-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next

Vinod writes:

soundwire updates for 4.21-rc1

A single change:
 - constify snd_soc_dai_ops struct by Julia

* tag 'soundwire-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: intel: constify snd_soc_dai_ops structures
parents 754cac3f b1635596

drivers/soundwire/intel.c

+2 −2
Original line number Diff line number Diff line
@@ -654,14 +654,14 @@ static int intel_pdm_set_sdw_stream(struct snd_soc_dai *dai, 
	return cdns_set_sdw_stream(dai, stream, false, direction);

}



static struct snd_soc_dai_ops intel_pcm_dai_ops = {

static const struct snd_soc_dai_ops intel_pcm_dai_ops = {

	.hw_params = intel_hw_params,

	.hw_free = intel_hw_free,

	.shutdown = sdw_cdns_shutdown,

	.set_sdw_stream = intel_pcm_set_sdw_stream,

};



static struct snd_soc_dai_ops intel_pdm_dai_ops = {

static const struct snd_soc_dai_ops intel_pdm_dai_ops = {

	.hw_params = intel_hw_params,

	.hw_free = intel_hw_free,

	.shutdown = sdw_cdns_shutdown,