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

ASoC: soc-core: remove legacy style of aux_dev 



Now all drivers are using snd_soc_dai_link_component for aux_dev.
Let's remove legacy style

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


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

include/sound/soc.h

+0 −9
Original line number Diff line number Diff line
@@ -963,19 +963,10 @@ struct snd_soc_codec_conf { 
};



struct snd_soc_aux_dev {

	const char *name;		/* Codec name */



	/*

	 * specify multi-codec either by device name, or by

	 * DT/OF node, but not both.

	 */

	const char *codec_name;

	struct device_node *codec_of_node;



	/*

	 * name, codec_name, codec_of_node will be replaced

	 * into dlc. don't use both in the same time

	 */

	struct snd_soc_dai_link_component dlc;



	/* codec/machine specific init - e.g. add machine controls */

sound/soc/soc-core.c

+0 −6
Original line number Diff line number Diff line
@@ -1538,12 +1538,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) 
	struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];

	struct snd_soc_component *component;



	/* remove me */

	if (aux_dev->codec_name)

		aux_dev->dlc.name = aux_dev->codec_name;

	if (aux_dev->codec_of_node)

		aux_dev->dlc.of_node = aux_dev->codec_of_node;



	/* codecs, usually analog devices */

	component = soc_find_component(&aux_dev->dlc);

	if (!component)

CRA Git | Maintained and supported by SUSTech CRA and CCSE