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

ASoC: soc-dapm: remove snd_soc_dapm_nc_pin[_unlocked]() 



snd_soc_dapm_nc_pin() was added in commit 5817b52a ("ALSA: ASoC: Allow
machine drivers to mark pins as not connected") at 2008.
It is identical to snd_soc_dapm_disable_pin[_unlocked](). It was expected
to be updated, but were enough as-is for this 17 years.

We might update these, but renaming function name by define is enough
for now. We can re-create these if needed in the future. Let's remove it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87tt3whitj.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-dapm.h

+10 −2
Original line number Diff line number Diff line
@@ -498,8 +498,6 @@ int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin); 
int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm);
@@ -509,6 +507,16 @@ int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *p 
unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);

void dapm_mark_endpoints_dirty(struct snd_soc_card *card);



/*

 * Marks the specified pin as being not connected, disabling it along

 * any parent or child widgets.  At present this is identical to

 * snd_soc_dapm_disable_pin[_unlocked]() but in future it will be extended to do

 * additional things such as disabling controls which only affect

 * paths through the pin.

 */

#define snd_soc_dapm_nc_pin		snd_soc_dapm_disable_pin

#define snd_soc_dapm_nc_pin_unlocked	snd_soc_dapm_disable_pin_unlocked



/* dapm path query */

int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	struct snd_soc_dapm_widget_list **list,

sound/soc/soc-dapm.c

+0 −51
Original line number Diff line number Diff line
@@ -4772,57 +4772,6 @@ int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm, 
}

EXPORT_SYMBOL_GPL(snd_soc_dapm_disable_pin);



/**

 * snd_soc_dapm_nc_pin_unlocked - permanently disable pin.

 * @dapm: DAPM context

 * @pin: pin name

 *

 * Marks the specified pin as being not connected, disabling it along

 * any parent or child widgets.  At present this is identical to

 * snd_soc_dapm_disable_pin() but in future it will be extended to do

 * additional things such as disabling controls which only affect

 * paths through the pin.

 *

 * Requires external locking.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm,

			       const char *pin)

{

	return snd_soc_dapm_set_pin(dapm, pin, 0);

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin_unlocked);



/**

 * snd_soc_dapm_nc_pin - permanently disable pin.

 * @dapm: DAPM context

 * @pin: pin name

 *

 * Marks the specified pin as being not connected, disabling it along

 * any parent or child widgets.  At present this is identical to

 * snd_soc_dapm_disable_pin() but in future it will be extended to do

 * additional things such as disabling controls which only affect

 * paths through the pin.

 *

 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin)

{

	int ret;



	snd_soc_dapm_mutex_lock(dapm);



	ret = snd_soc_dapm_set_pin(dapm, pin, 0);



	snd_soc_dapm_mutex_unlock(dapm);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin);



/**

 * snd_soc_dapm_get_pin_status - get audio pin status

 * @dapm: DAPM context