summaryrefslogtreecommitdiff
path: root/sound/soc/s3c24xx/s3c24xx-pcm.h
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2009-11-17 07:53:23 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-18 13:35:03 (GMT)
commitfaa31776e4c799d631d8cd3a13dd50cd95b0875e (patch)
treeb8f498d292688f0fe78974a21d29189a9084aaf7 /sound/soc/s3c24xx/s3c24xx-pcm.h
parent8df89bc35c188e389295eaf7917653f13c83ce70 (diff)
downloadlinux-faa31776e4c799d631d8cd3a13dd50cd95b0875e.tar.xz
ASoC: Rename s3c24xx_pcm prefix to s3c_dma
The s3c24xx_pcm prefix for the soc_platform is inappropriate when some Samsung SoCs have PCM controllers which will eventually have drivers and hence namespace ambiguities. To resolve naming ambiguities in future the following have been renamed in order 1) s3c24xx_pcm_dma_params -> s3c_dma_params 2) s3c24xx_pcm_preallocate_dma_buffer -> s3c_preallocate_dma_buffer 3) s3c24xx_pcm_dmamask -> s3c_dma_mask 4) s3c24xx_pcm_XXX -> s3c_dma_XXX Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/s3c24xx-pcm.h')
-rw-r--r--sound/soc/s3c24xx/s3c24xx-pcm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h
index 0088c79..8cbc071 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.h
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.h
@@ -9,13 +9,13 @@
* ALSA PCM interface for the Samsung S3C24xx CPU
*/
-#ifndef _S3C24XX_PCM_H
-#define _S3C24XX_PCM_H
+#ifndef _S3C_AUDIO_H
+#define _S3C_AUDIO_H
#define ST_RUNNING (1<<0)
#define ST_OPENED (1<<1)
-struct s3c24xx_pcm_dma_params {
+struct s3c_dma_params {
struct s3c2410_dma_client *client; /* stream identifier */
int channel; /* Channel ID */
dma_addr_t dma_addr;