diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-07 08:10:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-07 08:10:22 +0100 |
| commit | 48d365de7746a000afd7f9f7cc1821cbb6fe9b45 (patch) | |
| tree | 1cbf5604b5125c8e98f8b1b5959996f82358cce6 | |
| parent | 754cac3f1c270794bb55513680b52a6193afda55 (diff) | |
| parent | b1635596860dd3229645e41276f6c83ca788e4c1 (diff) | |
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
| -rw-r--r-- | drivers/soundwire/intel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index c5ee97ee7886..fd8d034cfec1 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -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, |