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

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

Merge branch 'topic/sh' of... 

Merge branch 'topic/sh' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
parents 0d7820d0 b23bd34c

sound/soc/sh/dma-sh7760.c

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static snd_pcm_uframes_t camelot_pos(struct snd_pcm_substream *substream) 
	return bytes_to_frames(runtime, pos);

}



static struct snd_pcm_ops camelot_pcm_ops = {

static const struct snd_pcm_ops camelot_pcm_ops = {

	.open		= camelot_pcm_open,

	.close		= camelot_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,
@@ -320,7 +320,7 @@ static int camelot_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static struct snd_soc_platform_driver sh7760_soc_platform = {

static const struct snd_soc_platform_driver sh7760_soc_platform = {

	.ops		= &camelot_pcm_ops,

	.pcm_new	= camelot_pcm_new,

};

sound/soc/sh/fsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1755,7 +1755,7 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream) 
	return fsi_sample2frame(fsi, io->buff_sample_pos);

}



static struct snd_pcm_ops fsi_pcm_ops = {

static const struct snd_pcm_ops fsi_pcm_ops = {

	.open		= fsi_pcm_open,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= fsi_hw_params,
@@ -1818,7 +1818,7 @@ static struct snd_soc_dai_driver fsi_soc_dai[] = { 
	},

};



static struct snd_soc_platform_driver fsi_soc_platform = {

static const struct snd_soc_platform_driver fsi_soc_platform = {

	.ops		= &fsi_pcm_ops,

	.pcm_new	= fsi_pcm_new,

};

sound/soc/sh/rcar/core.c

+2 −2
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ static snd_pcm_uframes_t rsnd_pointer(struct snd_pcm_substream *substream) 
	return pointer;

}



static struct snd_pcm_ops rsnd_pcm_ops = {

static const struct snd_pcm_ops rsnd_pcm_ops = {

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= rsnd_hw_params,

	.hw_free	= snd_pcm_lib_free_pages,
@@ -1318,7 +1318,7 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd) 
		PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);

}



static struct snd_soc_platform_driver rsnd_soc_platform = {

static const struct snd_soc_platform_driver rsnd_soc_platform = {

	.ops		= &rsnd_pcm_ops,

	.pcm_new	= rsnd_pcm_new,

};

sound/soc/sh/siu_pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static void siu_pcm_free(struct snd_pcm *pcm) 
	dev_dbg(pcm->card->dev, "%s\n", __func__);

}



static struct snd_pcm_ops siu_pcm_ops = {

static const struct snd_pcm_ops siu_pcm_ops = {

	.open		= siu_pcm_open,

	.close		= siu_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,