aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/pcm_memory.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-06 13:56:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-06 13:56:51 -0400
commit920f2ecdf6c3b3526f60fbd38c68597953cad3ee (patch)
tree18188922ba38a5c53ee8d17032eb5c46dffc7fa2 /sound/core/pcm_memory.c
parent9ced560b82606b35adb33a27012a148d418a4c1f (diff)
parentfc18282cdcba984ab89c74d7e844c10114ae0795 (diff)
Merge tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This development cycle resulted in a fair amount of changes in both core and driver sides. The most significant change in ALSA core is about PCM. Also the support of of-graph card and the new DAPM widget for DSP are noteworthy changes in ASoC core. And there're lots of small changes splat over the tree, as you can see in diffstat. Below are a few highlights: ALSA core: - Removal of set_fs() hackery from PCM core stuff, and the code reorganization / optimization thereafter - Improved support of PCM ack ops, and a new ABI for improved control/status mmap handling - Lots of constifications in various codes ASoC core: - The support of of-graph card, which may work as a better generic device for a replacement of simple-card - New widget types intended mainly for use with DSPs ASoC drivers: - New drivers for Allwinner V3s SoCs - Ensonic ES8316 codec support - More Intel SKL and KBL works - More device support for Intel SST Atom (mostly for cheap tablets and 2-in-1 devices) - Support for Rockchip PDM controllers - Support for STM32 I2S and S/PDIF controllers - Support for ZTE AUD96P22 codecs HD-audio: - Support of new Realtek codecs (ALC215/ALC285/ALC289), more quirks for HP and Dell machines - A few more fixes for i915 component binding" * tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (418 commits) ALSA: hda - Fix unbalance of i915 module refcount ASoC: Intel: Skylake: Remove driver debugfs exit ASoC: Intel: Skylake: explicitly add the headers sst-dsp.h ALSA: hda/realtek - Remove GPIO_MASK ALSA: hda/realtek - Fix typo of pincfg for Dell quirk ALSA: pcm: add a documentation for tracepoints ALSA: atmel: ac97c: fix error return code in atmel_ac97c_probe() ALSA: x86: fix error return code in hdmi_lpe_audio_probe() ASoC: Intel: Skylake: Add support to read firmware registers ASoC: Intel: Skylake: Add sram address to sst_addr structure ASoC: Intel: Skylake: Debugfs facility to dump module config ASoC: Intel: Skylake: Add debugfs support ASoC: fix semicolon.cocci warnings ASoC: rt5645: Add quirk override by module option ASoC: rsnd: make arrays path and cmd_case static const ASoC: audio-graph-card: add widgets and routing for external amplifier support ASoC: audio-graph-card: update bindings for amplifier support ASoC: rt5665: calibration should be done before jack detection ASoC: rsnd: constify dev_pm_ops structures. ASoC: nau8825: change crosstalk-bypass property to bool type ...
Diffstat (limited to 'sound/core/pcm_memory.c')
-rw-r--r--sound/core/pcm_memory.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index b45f6aa32264..ae33e456708c 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -120,7 +120,6 @@ int snd_pcm_lib_preallocate_free_for_all(struct snd_pcm *pcm)
120 snd_pcm_lib_preallocate_free(substream); 120 snd_pcm_lib_preallocate_free(substream);
121 return 0; 121 return 0;
122} 122}
123
124EXPORT_SYMBOL(snd_pcm_lib_preallocate_free_for_all); 123EXPORT_SYMBOL(snd_pcm_lib_preallocate_free_for_all);
125 124
126#ifdef CONFIG_SND_VERBOSE_PROCFS 125#ifdef CONFIG_SND_VERBOSE_PROCFS
@@ -263,7 +262,6 @@ int snd_pcm_lib_preallocate_pages(struct snd_pcm_substream *substream,
263 substream->dma_buffer.dev.dev = data; 262 substream->dma_buffer.dev.dev = data;
264 return snd_pcm_lib_preallocate_pages1(substream, size, max); 263 return snd_pcm_lib_preallocate_pages1(substream, size, max);
265} 264}
266
267EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages); 265EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages);
268 266
269/** 267/**
@@ -292,7 +290,6 @@ int snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm,
292 return err; 290 return err;
293 return 0; 291 return 0;
294} 292}
295
296EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages_for_all); 293EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages_for_all);
297 294
298#ifdef CONFIG_SND_DMA_SGBUF 295#ifdef CONFIG_SND_DMA_SGBUF
@@ -314,7 +311,6 @@ struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigne
314 return NULL; 311 return NULL;
315 return sgbuf->page_table[idx]; 312 return sgbuf->page_table[idx];
316} 313}
317
318EXPORT_SYMBOL(snd_pcm_sgbuf_ops_page); 314EXPORT_SYMBOL(snd_pcm_sgbuf_ops_page);
319#endif /* CONFIG_SND_DMA_SGBUF */ 315#endif /* CONFIG_SND_DMA_SGBUF */
320 316
@@ -370,7 +366,6 @@ int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size)
370 runtime->dma_bytes = size; 366 runtime->dma_bytes = size;
371 return 1; /* area was changed */ 367 return 1; /* area was changed */
372} 368}
373
374EXPORT_SYMBOL(snd_pcm_lib_malloc_pages); 369EXPORT_SYMBOL(snd_pcm_lib_malloc_pages);
375 370
376/** 371/**
@@ -398,7 +393,6 @@ int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream)
398 snd_pcm_set_runtime_buffer(substream, NULL); 393 snd_pcm_set_runtime_buffer(substream, NULL);
399 return 0; 394 return 0;
400} 395}
401
402EXPORT_SYMBOL(snd_pcm_lib_free_pages); 396EXPORT_SYMBOL(snd_pcm_lib_free_pages);
403 397
404int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream, 398int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,