ASoC: samsung: remove unused DMA data
The s3c_dma_client structures and the 'ch' and 'ops' members in s3c_dma_params were only used by the legacy DMA driver and serve no function any more. This removes any reference to them. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
8f501c7b44
commit
dd2380e31c
|
@ -38,30 +38,15 @@ struct s3c_ac97_info {
|
||||||
};
|
};
|
||||||
static struct s3c_ac97_info s3c_ac97;
|
static struct s3c_ac97_info s3c_ac97;
|
||||||
|
|
||||||
static struct s3c_dma_client s3c_dma_client_out = {
|
|
||||||
.name = "AC97 PCMOut"
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct s3c_dma_client s3c_dma_client_in = {
|
|
||||||
.name = "AC97 PCMIn"
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct s3c_dma_client s3c_dma_client_micin = {
|
|
||||||
.name = "AC97 MicIn"
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct s3c_dma_params s3c_ac97_pcm_out = {
|
static struct s3c_dma_params s3c_ac97_pcm_out = {
|
||||||
.client = &s3c_dma_client_out,
|
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct s3c_dma_params s3c_ac97_pcm_in = {
|
static struct s3c_dma_params s3c_ac97_pcm_in = {
|
||||||
.client = &s3c_dma_client_in,
|
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct s3c_dma_params s3c_ac97_mic_in = {
|
static struct s3c_dma_params s3c_ac97_mic_in = {
|
||||||
.client = &s3c_dma_client_micin,
|
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,17 +14,10 @@
|
||||||
|
|
||||||
#include <sound/dmaengine_pcm.h>
|
#include <sound/dmaengine_pcm.h>
|
||||||
|
|
||||||
struct s3c_dma_client {
|
|
||||||
char *name;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct s3c_dma_params {
|
struct s3c_dma_params {
|
||||||
struct s3c_dma_client *client; /* stream identifier */
|
|
||||||
int channel; /* Channel ID */
|
int channel; /* Channel ID */
|
||||||
dma_addr_t dma_addr;
|
dma_addr_t dma_addr;
|
||||||
int dma_size; /* Size of the DMA transfer */
|
int dma_size; /* Size of the DMA transfer */
|
||||||
unsigned ch;
|
|
||||||
struct samsung_dma_ops *ops;
|
|
||||||
char *ch_name;
|
char *ch_name;
|
||||||
struct snd_dmaengine_dai_dma_data dma_data;
|
struct snd_dmaengine_dai_dma_data dma_data;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1216,11 +1216,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
pri_dai->dma_playback.dma_addr = regs_base + I2STXD;
|
pri_dai->dma_playback.dma_addr = regs_base + I2STXD;
|
||||||
pri_dai->dma_capture.dma_addr = regs_base + I2SRXD;
|
pri_dai->dma_capture.dma_addr = regs_base + I2SRXD;
|
||||||
pri_dai->dma_playback.client =
|
|
||||||
(struct s3c_dma_client *)&pri_dai->dma_playback;
|
|
||||||
pri_dai->dma_playback.ch_name = "tx";
|
pri_dai->dma_playback.ch_name = "tx";
|
||||||
pri_dai->dma_capture.client =
|
|
||||||
(struct s3c_dma_client *)&pri_dai->dma_capture;
|
|
||||||
pri_dai->dma_capture.ch_name = "rx";
|
pri_dai->dma_capture.ch_name = "rx";
|
||||||
pri_dai->dma_playback.dma_size = 4;
|
pri_dai->dma_playback.dma_size = 4;
|
||||||
pri_dai->dma_capture.dma_size = 4;
|
pri_dai->dma_capture.dma_size = 4;
|
||||||
|
@ -1238,8 +1234,6 @@ static int samsung_i2s_probe(struct platform_device *pdev)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
|
sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
|
||||||
sec_dai->dma_playback.client =
|
|
||||||
(struct s3c_dma_client *)&sec_dai->dma_playback;
|
|
||||||
sec_dai->dma_playback.ch_name = "tx-sec";
|
sec_dai->dma_playback.ch_name = "tx-sec";
|
||||||
|
|
||||||
if (!np) {
|
if (!np) {
|
||||||
|
|
|
@ -131,32 +131,20 @@ struct s3c_pcm_info {
|
||||||
struct s3c_dma_params *dma_capture;
|
struct s3c_dma_params *dma_capture;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct s3c_dma_client s3c_pcm_dma_client_out = {
|
|
||||||
.name = "PCM Stereo out"
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct s3c_dma_client s3c_pcm_dma_client_in = {
|
|
||||||
.name = "PCM Stereo in"
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct s3c_dma_params s3c_pcm_stereo_out[] = {
|
static struct s3c_dma_params s3c_pcm_stereo_out[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
.client = &s3c_pcm_dma_client_out,
|
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.client = &s3c_pcm_dma_client_out,
|
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct s3c_dma_params s3c_pcm_stereo_in[] = {
|
static struct s3c_dma_params s3c_pcm_stereo_in[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
.client = &s3c_pcm_dma_client_in,
|
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.client = &s3c_pcm_dma_client_in,
|
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
#include <sound/soc.h>
|
#include <sound/soc.h>
|
||||||
#include <sound/pcm_params.h>
|
#include <sound/pcm_params.h>
|
||||||
|
|
||||||
#include <mach/dma.h>
|
|
||||||
|
|
||||||
#include "regs-i2s-v2.h"
|
#include "regs-i2s-v2.h"
|
||||||
#include "s3c-i2s-v2.h"
|
#include "s3c-i2s-v2.h"
|
||||||
#include "dma.h"
|
#include "dma.h"
|
||||||
|
|
|
@ -34,16 +34,12 @@
|
||||||
#include "s3c2412-i2s.h"
|
#include "s3c2412-i2s.h"
|
||||||
|
|
||||||
static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = {
|
static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = {
|
||||||
.client =
|
|
||||||
(struct s3c_dma_client *)&s3c2412_i2s_pcm_stereo_out,
|
|
||||||
.channel = DMACH_I2S_OUT,
|
.channel = DMACH_I2S_OUT,
|
||||||
.ch_name = "tx",
|
.ch_name = "tx",
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = {
|
static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = {
|
||||||
.client =
|
|
||||||
(struct s3c_dma_client *)&s3c2412_i2s_pcm_stereo_in,
|
|
||||||
.channel = DMACH_I2S_IN,
|
.channel = DMACH_I2S_IN,
|
||||||
.ch_name = "rx",
|
.ch_name = "rx",
|
||||||
.dma_size = 4,
|
.dma_size = 4,
|
||||||
|
|
|
@ -32,16 +32,12 @@
|
||||||
#include "s3c24xx-i2s.h"
|
#include "s3c24xx-i2s.h"
|
||||||
|
|
||||||
static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_out = {
|
static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_out = {
|
||||||
.client =
|
|
||||||
(struct s3c_dma_client *)&s3c24xx_i2s_pcm_stereo_out,
|
|
||||||
.channel = DMACH_I2S_OUT,
|
.channel = DMACH_I2S_OUT,
|
||||||
.ch_name = "tx",
|
.ch_name = "tx",
|
||||||
.dma_size = 2,
|
.dma_size = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_in = {
|
static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_in = {
|
||||||
.client =
|
|
||||||
(struct s3c_dma_client *)&s3c24xx_i2s_pcm_stereo_in,
|
|
||||||
.channel = DMACH_I2S_IN,
|
.channel = DMACH_I2S_IN,
|
||||||
.ch_name = "rx",
|
.ch_name = "rx",
|
||||||
.dma_size = 2,
|
.dma_size = 2,
|
||||||
|
|
|
@ -93,10 +93,6 @@ struct samsung_spdif_info {
|
||||||
struct s3c_dma_params *dma_playback;
|
struct s3c_dma_params *dma_playback;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct s3c_dma_client spdif_dma_client_out = {
|
|
||||||
.name = "S/PDIF Stereo out",
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct s3c_dma_params spdif_stereo_out;
|
static struct s3c_dma_params spdif_stereo_out;
|
||||||
static struct samsung_spdif_info spdif_info;
|
static struct samsung_spdif_info spdif_info;
|
||||||
|
|
||||||
|
@ -435,7 +431,6 @@ static int spdif_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
spdif_stereo_out.dma_size = 2;
|
spdif_stereo_out.dma_size = 2;
|
||||||
spdif_stereo_out.client = &spdif_dma_client_out;
|
|
||||||
spdif_stereo_out.dma_addr = mem_res->start + DATA_OUTBUF;
|
spdif_stereo_out.dma_addr = mem_res->start + DATA_OUTBUF;
|
||||||
spdif_stereo_out.channel = dma_res->start;
|
spdif_stereo_out.channel = dma_res->start;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue