Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/psc-ac97' and 'asoc/topic/pxa' into asoc-next
This commit is contained in:
commit
bf3cc310a2
|
@ -474,7 +474,7 @@ static int au1xpsc_ac97_drvresume(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct dev_pm_ops au1xpscac97_pmops = {
|
||||
static const struct dev_pm_ops au1xpscac97_pmops = {
|
||||
.suspend = au1xpsc_ac97_drvsuspend,
|
||||
.resume = au1xpsc_ac97_drvresume,
|
||||
};
|
||||
|
|
|
@ -162,7 +162,7 @@ static int omap_pcm_mmap(struct snd_pcm_substream *substream,
|
|||
runtime->dma_addr, runtime->dma_bytes);
|
||||
}
|
||||
|
||||
static struct snd_pcm_ops omap_pcm_ops = {
|
||||
static const struct snd_pcm_ops omap_pcm_ops = {
|
||||
.open = omap_pcm_open,
|
||||
.close = snd_dmaengine_pcm_close_release_chan,
|
||||
.ioctl = snd_pcm_lib_ioctl,
|
||||
|
@ -243,7 +243,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_platform_driver omap_soc_platform = {
|
||||
static const struct snd_soc_platform_driver omap_soc_platform = {
|
||||
.ops = &omap_pcm_ops,
|
||||
.pcm_new = omap_pcm_new,
|
||||
.pcm_free = omap_pcm_free_dma_buffers,
|
||||
|
|
|
@ -131,7 +131,7 @@ static int mmp_pcm_mmap(struct snd_pcm_substream *substream,
|
|||
vma->vm_end - vma->vm_start, vma->vm_page_prot);
|
||||
}
|
||||
|
||||
static struct snd_pcm_ops mmp_pcm_ops = {
|
||||
static const struct snd_pcm_ops mmp_pcm_ops = {
|
||||
.open = mmp_pcm_open,
|
||||
.close = snd_dmaengine_pcm_close_release_chan,
|
||||
.ioctl = snd_pcm_lib_ioctl,
|
||||
|
@ -211,7 +211,7 @@ err:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_platform_driver mmp_soc_platform = {
|
||||
static const struct snd_soc_platform_driver mmp_soc_platform = {
|
||||
.ops = &mmp_pcm_ops,
|
||||
.pcm_new = mmp_pcm_new,
|
||||
.pcm_free = mmp_pcm_free_dma_buffers,
|
||||
|
|
|
@ -380,7 +380,7 @@ static int mmp_sspa_probe(struct snd_soc_dai *dai)
|
|||
SNDRV_PCM_FMTBIT_S24_LE | \
|
||||
SNDRV_PCM_FMTBIT_S32_LE)
|
||||
|
||||
static struct snd_soc_dai_ops mmp_sspa_dai_ops = {
|
||||
static const struct snd_soc_dai_ops mmp_sspa_dai_ops = {
|
||||
.startup = mmp_sspa_startup,
|
||||
.shutdown = mmp_sspa_shutdown,
|
||||
.trigger = mmp_sspa_trigger,
|
||||
|
|
|
@ -45,7 +45,7 @@ static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_pcm_ops pxa2xx_pcm_ops = {
|
||||
static const struct snd_pcm_ops pxa2xx_pcm_ops = {
|
||||
.open = __pxa2xx_pcm_open,
|
||||
.close = __pxa2xx_pcm_close,
|
||||
.ioctl = snd_pcm_lib_ioctl,
|
||||
|
@ -84,7 +84,7 @@ static int pxa2xx_soc_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_platform_driver pxa2xx_soc_platform = {
|
||||
static const struct snd_soc_platform_driver pxa2xx_soc_platform = {
|
||||
.ops = &pxa2xx_pcm_ops,
|
||||
.pcm_new = pxa2xx_soc_pcm_new,
|
||||
.pcm_free = pxa2xx_pcm_free_dma_buffers,
|
||||
|
|
Loading…
Reference in New Issue