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

Commit 9b08f30c authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: Remove unused now unused struct s3c_dma_params 



There is no user of this data structure now, all users have been converted
to use struct snd_dmaengine_dai_dma_data instead.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2feb6165

sound/soc/samsung/dma.h

+3 −17
Original line number Diff line number Diff line 
/*

 *  dma.h --

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your
@@ -9,27 +7,15 @@ 
 *  ALSA PCM interface for the Samsung SoC

 */



#ifndef _S3C_AUDIO_H

#define _S3C_AUDIO_H

#ifndef _SAMSUNG_DMA_H

#define _SAMSUNG_DMA_H



#include <sound/dmaengine_pcm.h>

#include <linux/dmaengine.h>



struct s3c_dma_params {

	void *slave;				/* Channel ID */

	dma_addr_t dma_addr;

	int dma_size;			/* Size of the DMA transfer */

	char *ch_name;

	struct snd_dmaengine_dai_dma_data dma_data;

};



void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,

				struct s3c_dma_params *playback,

				struct s3c_dma_params *capture);

/*

 * @tx, @rx arguments can be NULL if the DMA channel names are "tx", "rx",

 * otherwise actual DMA channel names must be passed to this function.

 */

int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,

				       const char *tx, const char *rx);

#endif
 
#endif /* _SAMSUNG_DMA_H */

sound/soc/samsung/dmaengine.c

+0 −31
Original line number Diff line number Diff line
@@ -16,49 +16,18 @@ 
 */



#include <linux/module.h>

#include <linux/amba/pl08x.h>

#include <linux/platform_data/dma-s3c24xx.h>



#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/dmaengine_pcm.h>

#include <sound/soc.h>

#include <sound/soc-dai.h>



#include "dma.h"



void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,

				struct s3c_dma_params *playback,

				struct s3c_dma_params *capture)

{

	struct snd_dmaengine_dai_dma_data *playback_data = NULL;

	struct snd_dmaengine_dai_dma_data *capture_data = NULL;



	if (playback) {

		playback_data = &playback->dma_data;

		playback_data->filter_data = playback->slave;

		playback_data->chan_name = playback->ch_name;

		playback_data->addr = playback->dma_addr;

		playback_data->addr_width = playback->dma_size;

	}

	if (capture) {

		capture_data = &capture->dma_data;

		capture_data->filter_data = capture->slave;

		capture_data->chan_name = capture->ch_name;

		capture_data->addr = capture->dma_addr;

		capture_data->addr_width = capture->dma_size;

	}



	snd_soc_dai_init_dma_data(dai, playback_data, capture_data);

}

EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);



int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,

				       const char *tx, const char *rx)

{

	unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT;



	struct snd_dmaengine_pcm_config *pcm_conf;



	pcm_conf = devm_kzalloc(dev, sizeof(*pcm_conf), GFP_KERNEL);

sound/soc/samsung/idma.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include "i2s.h"

#include "idma.h"

#include "dma.h"

#include "i2s-regs.h"



#define ST_RUNNING		(1<<0)

sound/soc/samsung/s3c-i2s-v2.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include "regs-i2s-v2.h"

#include "s3c-i2s-v2.h"

#include "dma.h"



#undef S3C_IIS_V2_SUPPORTED

sound/soc/samsung/smdk_wm8580pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <asm/mach-types.h>



#include "../codecs/wm8580.h"

#include "dma.h"

#include "pcm.h"



/*