projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.0' into for-3.1
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
blackfin
/
bf5xx-i2s-pcm.c
diff --git
a/sound/soc/blackfin/bf5xx-i2s-pcm.c
b/sound/soc/blackfin/bf5xx-i2s-pcm.c
index f1fd95bb6416ce0b44e750e356d4ddc95346f31c..61ddf942fd4d0269c499c936d631d0959d261453 100644
(file)
--- a/
sound/soc/blackfin/bf5xx-i2s-pcm.c
+++ b/
sound/soc/blackfin/bf5xx-i2s-pcm.c
@@
-168,7
+168,7
@@
static int bf5xx_pcm_open(struct snd_pcm_substream *substream)
snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware);
snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware);
- ret = snd_pcm_hw_constraint_integer(runtime,
\
+ ret = snd_pcm_hw_constraint_integer(runtime,
SNDRV_PCM_HW_PARAM_PERIODS);
if (ret < 0)
goto out;
SNDRV_PCM_HW_PARAM_PERIODS);
if (ret < 0)
goto out;
@@
-257,9
+257,11
@@
static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
-int bf5xx_pcm_i2s_new(struct snd_card *card, struct snd_soc_dai *dai,
- struct snd_pcm *pcm)
+int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
{
{
+ struct snd_card *card = rtd->card->snd_card;
+ struct snd_soc_dai *dai = rtd->cpu_dai;
+ struct snd_pcm *pcm = rtd->pcm;
int ret = 0;
pr_debug("%s enter\n", __func__);
int ret = 0;
pr_debug("%s enter\n", __func__);
@@
-304,8
+306,8
@@
static int __devexit bfin_i2s_soc_platform_remove(struct platform_device *pdev)
static struct platform_driver bfin_i2s_pcm_driver = {
.driver = {
static struct platform_driver bfin_i2s_pcm_driver = {
.driver = {
-
.name = "bfin-i2s-pcm-audio",
-
.owner = THIS_MODULE,
+ .name = "bfin-i2s-pcm-audio",
+ .owner = THIS_MODULE,
},
.probe = bfin_i2s_soc_platform_probe,
},
.probe = bfin_i2s_soc_platform_probe,