Unverified Commit 1fddf424 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: mediatek: remove snd_pcm_ops 



snd_pcm_ops is no longer needed.
Let's use component driver callback.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k19n90du.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9a0b72b7

sound/soc/mediatek/common/mtk-afe-platform-driver.c

+12 −16
Original line number Diff line number Diff line
@@ -77,11 +77,10 @@ int mtk_afe_add_sub_dai_control(struct snd_soc_component *component) 
}

EXPORT_SYMBOL_GPL(mtk_afe_add_sub_dai_control);



static snd_pcm_uframes_t mtk_afe_pcm_pointer

			 (struct snd_pcm_substream *substream)

snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component,

				      struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);

	struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];

	const struct mtk_base_memif_data *memif_data = memif->data;
@@ -111,18 +110,13 @@ static snd_pcm_uframes_t mtk_afe_pcm_pointer 
POINTER_RETURN_FRAMES:

	return bytes_to_frames(substream->runtime, pcm_ptr_bytes);

}

EXPORT_SYMBOL_GPL(mtk_afe_pcm_pointer);



const struct snd_pcm_ops mtk_afe_pcm_ops = {

	.ioctl = snd_pcm_lib_ioctl,

	.pointer = mtk_afe_pcm_pointer,

};

EXPORT_SYMBOL_GPL(mtk_afe_pcm_ops);



int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd)

int mtk_afe_pcm_new(struct snd_soc_component *component,

		    struct snd_soc_pcm_runtime *rtd)

{

	size_t size;

	struct snd_pcm *pcm = rtd->pcm;

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);



	size = afe->mtk_afe_hardware->buffer_bytes_max;
@@ -132,7 +126,8 @@ int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd) 
}

EXPORT_SYMBOL_GPL(mtk_afe_pcm_new);



void mtk_afe_pcm_free(struct snd_pcm *pcm)

void mtk_afe_pcm_free(struct snd_soc_component *component,

		      struct snd_pcm *pcm)

{

	snd_pcm_lib_preallocate_free_for_all(pcm);

}
@@ -140,9 +135,10 @@ EXPORT_SYMBOL_GPL(mtk_afe_pcm_free); 


const struct snd_soc_component_driver mtk_afe_pcm_platform = {

	.name		= AFE_PCM_NAME,

	.ops = &mtk_afe_pcm_ops,

	.pcm_new = mtk_afe_pcm_new,

	.pcm_free = mtk_afe_pcm_free,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.pointer	= mtk_afe_pcm_pointer,

	.pcm_construct	= mtk_afe_pcm_new,

	.pcm_destruct	= mtk_afe_pcm_free,

};

EXPORT_SYMBOL_GPL(mtk_afe_pcm_platform);

sound/soc/mediatek/common/mtk-afe-platform-driver.h

+6 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#define _MTK_AFE_PLATFORM_DRIVER_H_



#define AFE_PCM_NAME "mtk-afe-pcm"

extern const struct snd_pcm_ops mtk_afe_pcm_ops;

extern const struct snd_soc_component_driver mtk_afe_pcm_platform;



struct mtk_base_afe;
@@ -18,9 +17,12 @@ struct snd_pcm; 
struct snd_soc_component;

struct snd_soc_pcm_runtime;





int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd);

void mtk_afe_pcm_free(struct snd_pcm *pcm);

snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component,

				      struct snd_pcm_substream *substream);

int mtk_afe_pcm_new(struct snd_soc_component *component,

		    struct snd_soc_pcm_runtime *rtd);

void mtk_afe_pcm_free(struct snd_soc_component *component,

		      struct snd_pcm *pcm);



int mtk_afe_combine_sub_dai(struct mtk_base_afe *afe);

int mtk_afe_add_sub_dai_control(struct snd_soc_component *component);

sound/soc/mediatek/mt6797/mt6797-afe-pcm.c

+6 −5
Original line number Diff line number Diff line
@@ -711,10 +711,11 @@ static int mt6797_afe_component_probe(struct snd_soc_component *component) 


static const struct snd_soc_component_driver mt6797_afe_component = {

	.name		= AFE_PCM_NAME,

	.ops = &mtk_afe_pcm_ops,

	.pcm_new = mtk_afe_pcm_new,

	.pcm_free = mtk_afe_pcm_free,

	.probe		= mt6797_afe_component_probe,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.pointer	= mtk_afe_pcm_pointer,

	.pcm_construct	= mtk_afe_pcm_new,

	.pcm_destruct	= mtk_afe_pcm_free,

};



static int mt6797_dai_memif_register(struct mtk_base_afe *afe)

sound/soc/mediatek/mt8183/mt8183-afe-pcm.c

+6 −5
Original line number Diff line number Diff line
@@ -1049,10 +1049,11 @@ static int mt8183_afe_component_probe(struct snd_soc_component *component) 


static const struct snd_soc_component_driver mt8183_afe_component = {

	.name		= AFE_PCM_NAME,

	.ops = &mtk_afe_pcm_ops,

	.pcm_new = mtk_afe_pcm_new,

	.pcm_free = mtk_afe_pcm_free,

	.probe		= mt8183_afe_component_probe,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.pointer	= mtk_afe_pcm_pointer,

	.pcm_construct	= mtk_afe_pcm_new,

	.pcm_destruct	= mtk_afe_pcm_free,

};



static int mt8183_dai_memif_register(struct mtk_base_afe *afe)

CRA Git | Maintained and supported by SUSTech CRA and CCSE