diff options
author | Seungwhan Youn <sw.youn@samsung.com> | 2011-01-06 23:51:26 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-10 06:38:16 -0500 |
commit | f7f741810f14f971337b15892007622c3af1f109 (patch) | |
tree | fc402acb716937351dded7bbba2138c10059989c | |
parent | 4f644ea70d54bf851fc0ebc77fa0f66fce7cb7d2 (diff) |
ASoC: SAMSUNG: Clean-up DMA header file
This patch moves DMA specific definitions, they doesn't need to be
shared, into 'dma.c' from 'dma.h'. And remove unnecessery definitions
on 'dma.h'.
Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/samsung/dma.c | 3 | ||||
-rw-r--r-- | sound/soc/samsung/dma.h | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index 21240198c5d6..c2cdb4597e56 100644 --- a/sound/soc/samsung/dma.c +++ b/sound/soc/samsung/dma.c | |||
@@ -32,6 +32,9 @@ | |||
32 | 32 | ||
33 | #include "dma.h" | 33 | #include "dma.h" |
34 | 34 | ||
35 | #define ST_RUNNING (1<<0) | ||
36 | #define ST_OPENED (1<<1) | ||
37 | |||
35 | static const struct snd_pcm_hardware dma_hardware = { | 38 | static const struct snd_pcm_hardware dma_hardware = { |
36 | .info = SNDRV_PCM_INFO_INTERLEAVED | | 39 | .info = SNDRV_PCM_INFO_INTERLEAVED | |
37 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 40 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h index f8cd2b4223af..c50659269a40 100644 --- a/sound/soc/samsung/dma.h +++ b/sound/soc/samsung/dma.h | |||
@@ -12,9 +12,6 @@ | |||
12 | #ifndef _S3C_AUDIO_H | 12 | #ifndef _S3C_AUDIO_H |
13 | #define _S3C_AUDIO_H | 13 | #define _S3C_AUDIO_H |
14 | 14 | ||
15 | #define ST_RUNNING (1<<0) | ||
16 | #define ST_OPENED (1<<1) | ||
17 | |||
18 | struct s3c_dma_params { | 15 | struct s3c_dma_params { |
19 | struct s3c2410_dma_client *client; /* stream identifier */ | 16 | struct s3c2410_dma_client *client; /* stream identifier */ |
20 | int channel; /* Channel ID */ | 17 | int channel; /* Channel ID */ |
@@ -22,9 +19,4 @@ struct s3c_dma_params { | |||
22 | int dma_size; /* Size of the DMA transfer */ | 19 | int dma_size; /* Size of the DMA transfer */ |
23 | }; | 20 | }; |
24 | 21 | ||
25 | #define S3C24XX_DAI_I2S 0 | ||
26 | |||
27 | /* platform data */ | ||
28 | extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; | ||
29 | |||
30 | #endif | 22 | #endif |