Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd2380e3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 8f501c7b
Loading
Loading
Loading
Loading
+0 −15
Original line number Diff line number Diff line
@@ -38,30 +38,15 @@ struct s3c_ac97_info {
};
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 = {
	.client		= &s3c_dma_client_out,
	.dma_size	= 4,
};

static struct s3c_dma_params s3c_ac97_pcm_in = {
	.client		= &s3c_dma_client_in,
	.dma_size	= 4,
};

static struct s3c_dma_params s3c_ac97_mic_in = {
	.client		= &s3c_dma_client_micin,
	.dma_size	= 4,
};

+0 −7
Original line number Diff line number Diff line
@@ -14,17 +14,10 @@

#include <sound/dmaengine_pcm.h>

struct s3c_dma_client {
	char *name;
};

struct s3c_dma_params {
	struct s3c_dma_client *client;	/* stream identifier */
	int channel;				/* Channel ID */
	dma_addr_t dma_addr;
	int dma_size;			/* Size of the DMA transfer */
	unsigned ch;
	struct samsung_dma_ops *ops;
	char *ch_name;
	struct snd_dmaengine_dai_dma_data dma_data;
};
+0 −6
Original line number Diff line number Diff line
@@ -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_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_capture.client =
		(struct s3c_dma_client *)&pri_dai->dma_capture;
	pri_dai->dma_capture.ch_name = "rx";
	pri_dai->dma_playback.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;
		}
		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";

		if (!np) {
+0 −12
Original line number Diff line number Diff line
@@ -131,32 +131,20 @@ struct s3c_pcm_info {
	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[] = {
	[0] = {
		.client		= &s3c_pcm_dma_client_out,
		.dma_size	= 4,
	},
	[1] = {
		.client		= &s3c_pcm_dma_client_out,
		.dma_size	= 4,
	},
};

static struct s3c_dma_params s3c_pcm_stereo_in[] = {
	[0] = {
		.client		= &s3c_pcm_dma_client_in,
		.dma_size	= 4,
	},
	[1] = {
		.client		= &s3c_pcm_dma_client_in,
		.dma_size	= 4,
	},
};
+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@
#include <sound/soc.h>
#include <sound/pcm_params.h>

#include <mach/dma.h>

#include "regs-i2s-v2.h"
#include "s3c-i2s-v2.h"
#include "dma.h"
Loading