2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00

Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next

This commit is contained in:
Mark Brown 2016-09-29 12:44:00 -07:00
commit 609555213a
10 changed files with 10 additions and 10 deletions

View File

@ -897,7 +897,7 @@ static int acp_dma_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static struct snd_pcm_ops acp_dma_ops = { static const struct snd_pcm_ops acp_dma_ops = {
.open = acp_dma_open, .open = acp_dma_open,
.close = acp_dma_close, .close = acp_dma_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,

View File

@ -381,7 +381,7 @@ static int atmel_pcm_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static struct snd_pcm_ops atmel_pcm_ops = { static const struct snd_pcm_ops atmel_pcm_ops = {
.open = atmel_pcm_open, .open = atmel_pcm_open,
.close = atmel_pcm_close, .close = atmel_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,

View File

@ -236,7 +236,7 @@ static snd_pcm_uframes_t rt5514_spi_pcm_pointer(
return bytes_to_frames(runtime, rt5514_dsp->dma_offset); return bytes_to_frames(runtime, rt5514_dsp->dma_offset);
} }
static struct snd_pcm_ops rt5514_spi_pcm_ops = { static const struct snd_pcm_ops rt5514_spi_pcm_ops = {
.open = rt5514_spi_pcm_open, .open = rt5514_spi_pcm_open,
.hw_params = rt5514_spi_hw_params, .hw_params = rt5514_spi_hw_params,
.hw_free = rt5514_spi_hw_free, .hw_free = rt5514_spi_hw_free,

View File

@ -322,7 +322,7 @@ static snd_pcm_uframes_t fsl_asrc_dma_pcm_pointer(struct snd_pcm_substream *subs
return bytes_to_frames(substream->runtime, pair->pos); return bytes_to_frames(substream->runtime, pair->pos);
} }
static struct snd_pcm_ops fsl_asrc_dma_pcm_ops = { static const struct snd_pcm_ops fsl_asrc_dma_pcm_ops = {
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = fsl_asrc_dma_hw_params, .hw_params = fsl_asrc_dma_hw_params,
.hw_free = fsl_asrc_dma_hw_free, .hw_free = fsl_asrc_dma_hw_free,

View File

@ -670,7 +670,7 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer
return str_info->buffer_ptr; 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, .open = sst_platform_open,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.trigger = sst_platform_pcm_trigger, .trigger = sst_platform_pcm_trigger,

View File

@ -871,7 +871,7 @@ out:
return ret; return ret;
} }
static struct snd_pcm_ops hsw_pcm_ops = { static const struct snd_pcm_ops hsw_pcm_ops = {
.open = hsw_pcm_open, .open = hsw_pcm_open,
.close = hsw_pcm_close, .close = hsw_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,

View File

@ -1094,7 +1094,7 @@ static int skl_get_time_info(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static struct snd_pcm_ops skl_platform_ops = { static const struct snd_pcm_ops skl_platform_ops = {
.open = skl_platform_open, .open = skl_platform_open,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.trigger = skl_platform_pcm_trigger, .trigger = skl_platform_pcm_trigger,

View File

@ -242,7 +242,7 @@ static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream
return count; return count;
} }
static struct snd_pcm_ops kirkwood_dma_ops = { static const struct snd_pcm_ops kirkwood_dma_ops = {
.open = kirkwood_dma_open, .open = kirkwood_dma_open,
.close = kirkwood_dma_close, .close = kirkwood_dma_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,

View File

@ -372,7 +372,7 @@ static int lpass_platform_pcmops_mmap(struct snd_pcm_substream *substream,
runtime->dma_bytes); runtime->dma_bytes);
} }
static struct snd_pcm_ops lpass_platform_pcm_ops = { static const struct snd_pcm_ops lpass_platform_pcm_ops = {
.open = lpass_platform_pcmops_open, .open = lpass_platform_pcmops_open,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = lpass_platform_pcmops_hw_params, .hw_params = lpass_platform_pcmops_hw_params,

View File

@ -80,7 +80,7 @@ static int dummy_dma_open(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static struct snd_pcm_ops dummy_dma_ops = { static const struct snd_pcm_ops dummy_dma_ops = {
.open = dummy_dma_open, .open = dummy_dma_open,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
}; };