diff options
Diffstat (limited to 'sound/soc/nuc900/nuc900-pcm.c')
-rw-r--r-- | sound/soc/nuc900/nuc900-pcm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c index d589ef14e917..ae8d6806966b 100644 --- a/sound/soc/nuc900/nuc900-pcm.c +++ b/sound/soc/nuc900/nuc900-pcm.c | |||
@@ -227,7 +227,7 @@ static int nuc900_dma_trigger(struct snd_pcm_substream *substream, int cmd) | |||
227 | return ret; | 227 | return ret; |
228 | } | 228 | } |
229 | 229 | ||
230 | int nuc900_dma_getposition(struct snd_pcm_substream *substream, | 230 | static int nuc900_dma_getposition(struct snd_pcm_substream *substream, |
231 | dma_addr_t *src, dma_addr_t *dst) | 231 | dma_addr_t *src, dma_addr_t *dst) |
232 | { | 232 | { |
233 | struct snd_pcm_runtime *runtime = substream->runtime; | 233 | struct snd_pcm_runtime *runtime = substream->runtime; |
@@ -268,7 +268,7 @@ static int nuc900_dma_open(struct snd_pcm_substream *substream) | |||
268 | nuc900_audio = nuc900_ac97_data; | 268 | nuc900_audio = nuc900_ac97_data; |
269 | 269 | ||
270 | if (request_irq(nuc900_audio->irq_num, nuc900_dma_interrupt, | 270 | if (request_irq(nuc900_audio->irq_num, nuc900_dma_interrupt, |
271 | IRQF_DISABLED, "nuc900-dma", substream)) | 271 | 0, "nuc900-dma", substream)) |
272 | return -EBUSY; | 272 | return -EBUSY; |
273 | 273 | ||
274 | runtime->private_data = nuc900_audio; | 274 | runtime->private_data = nuc900_audio; |
@@ -318,7 +318,6 @@ static u64 nuc900_pcm_dmamask = DMA_BIT_MASK(32); | |||
318 | static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd) | 318 | static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd) |
319 | { | 319 | { |
320 | struct snd_card *card = rtd->card->snd_card; | 320 | struct snd_card *card = rtd->card->snd_card; |
321 | struct snd_soc_dai *dai = rtd->cpu_dai; | ||
322 | struct snd_pcm *pcm = rtd->pcm; | 321 | struct snd_pcm *pcm = rtd->pcm; |
323 | 322 | ||
324 | if (!card->dev->dma_mask) | 323 | if (!card->dev->dma_mask) |