diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-29 19:44:00 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-29 19:44:00 (GMT) |
| commit | 609555213a36359dcadf7f84412d0489961ab085 (patch) | |
| tree | ed7761e69b7d708e8b8602fe98312d89e5f1f59b /sound/soc/intel | |
| parent | 4a2447b483e17c580ed1d7c9cde3267d9c3a380f (diff) | |
| parent | 115c7254882ceb965deb05510128464fef06fbfb (diff) | |
| download | linux-609555213a36359dcadf7f84412d0489961ab085.tar.xz | |
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/haswell/sst-haswell-pcm.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/skylake/skl-pcm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 52ed434..25c6d87 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -670,7 +670,7 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer return str_info->buffer_ptr; } -static struct snd_pcm_ops sst_platform_ops = { +static const struct snd_pcm_ops sst_platform_ops = { .open = sst_platform_open, .ioctl = snd_pcm_lib_ioctl, .trigger = sst_platform_pcm_trigger, diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c index 3154525..9e4094e 100644 --- a/sound/soc/intel/haswell/sst-haswell-pcm.c +++ b/sound/soc/intel/haswell/sst-haswell-pcm.c @@ -871,7 +871,7 @@ out: return ret; } -static struct snd_pcm_ops hsw_pcm_ops = { +static const struct snd_pcm_ops hsw_pcm_ops = { .open = hsw_pcm_open, .close = hsw_pcm_close, .ioctl = snd_pcm_lib_ioctl, diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index c7cdcba..58c7286 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -1094,7 +1094,7 @@ static int skl_get_time_info(struct snd_pcm_substream *substream, return 0; } -static struct snd_pcm_ops skl_platform_ops = { +static const struct snd_pcm_ops skl_platform_ops = { .open = skl_platform_open, .ioctl = snd_pcm_lib_ioctl, .trigger = skl_platform_pcm_trigger, |