Unverified Commit 45bbc14f authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: remove unused rt dmic rtd_init 



Some Realtek SDW DMIC codecs use the generic rt_dmic_rtd_init callback now.
Remove unused rtd_init callbacks.

Reviewed-by: default avatarChao Song <chao.song@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240326160429.13560-26-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ snd-soc-sof-sdw-objs += sof_sdw.o \ 
			sof_sdw_maxim.o sof_sdw_rt_amp.o	\

			sof_sdw_rt5682.o sof_sdw_rt700.o	\

			sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o	\

			sof_sdw_rt712_sdca.o sof_sdw_rt715.o	\

			sof_sdw_rt715_sdca.o sof_sdw_rt722_sdca.o	\

			sof_sdw_rt712_sdca.o sof_sdw_rt722_sdca.o	\

			sof_sdw_rt_dmic.o			\

			sof_sdw_cs42l42.o sof_sdw_cs42l43.o	\

			sof_sdw_cs_amp.o			\

sound/soc/intel/boards/sof_sdw_common.h

+0 −3
Original line number Diff line number Diff line
@@ -193,10 +193,7 @@ int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd); 
int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt712_sdca_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt715_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt715_sdca_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd);

sound/soc/intel/boards/sof_sdw_rt712_sdca.c

+0 −24
Original line number Diff line number Diff line
@@ -66,27 +66,3 @@ int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	return ret;

}

static const char * const dmics[] = {

	"rt712-sdca-dmic"

};



int rt712_sdca_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dai *codec_dai;

	struct snd_soc_component *component;



	codec_dai = get_codec_dai_by_name(rtd, dmics, ARRAY_SIZE(dmics));

	if (!codec_dai)

		return -EINVAL;



	component = codec_dai->component;

	card->components = devm_kasprintf(card->dev, GFP_KERNEL,

					  "%s mic:%s",

					  card->components, component->name_prefix);

	if (!card->components)

		return -ENOMEM;



	return 0;

}

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);

sound/soc/intel/boards/sof_sdw_rt715.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// Copyright (c) 2020 Intel Corporation



/*

 *  sof_sdw_rt715 - Helpers to handle RT715 from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include "sof_sdw_common.h"



int rt715_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;



	card->components = devm_kasprintf(card->dev, GFP_KERNEL,

					  "%s mic:rt715",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	return 0;

}

sound/soc/intel/boards/sof_sdw_rt715_sdca.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// Copyright (c) 2020 Intel Corporation



/*

 *  sof_sdw_rt715_sdca - Helpers to handle RT715-SDCA from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include "sof_sdw_common.h"



int rt715_sdca_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;



	card->components = devm_kasprintf(card->dev, GFP_KERNEL,

					  "%s mic:rt715-sdca",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	return 0;

}