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

Commit 60955521 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 4a2447b4 115c7254

sound/soc/amd/acp-pcm-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ static int acp_dma_close(struct snd_pcm_substream *substream) 
	return 0;

}



static struct snd_pcm_ops acp_dma_ops = {

static const struct snd_pcm_ops acp_dma_ops = {

	.open = acp_dma_open,

	.close = acp_dma_close,

	.ioctl = snd_pcm_lib_ioctl,

sound/soc/atmel/atmel-pcm-pdc.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int atmel_pcm_close(struct snd_pcm_substream *substream) 
	return 0;

}



static struct snd_pcm_ops atmel_pcm_ops = {

static const struct snd_pcm_ops atmel_pcm_ops = {

	.open		= atmel_pcm_open,

	.close		= atmel_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,

sound/soc/codecs/rt5514-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static snd_pcm_uframes_t rt5514_spi_pcm_pointer( 
	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,

	.hw_params	= rt5514_spi_hw_params,

	.hw_free	= rt5514_spi_hw_free,

sound/soc/fsl/fsl_asrc_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



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,

	.hw_params	= fsl_asrc_dma_hw_params,

	.hw_free	= fsl_asrc_dma_hw_free,

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -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,