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

Commit 1649923d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Constify pin names for DAPM pin status APIs 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ca9c1aae

include/sound/soc-dapm.h

+4 −4
Original line number Diff line number Diff line
@@ -260,10 +260,10 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, 
int snd_soc_dapm_sys_add(struct device *dev);



/* dapm audio pin control and status */

int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, char *pin);

int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_sync(struct snd_soc_codec *codec);



/* dapm widget types */

sound/soc/soc-dapm.c

+5 −5
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static void dapm_free_widgets(struct snd_soc_codec *codec) 
}



static int snd_soc_dapm_set_pin(struct snd_soc_codec *codec,

	char *pin, int status)

				const char *pin, int status)

{

	struct snd_soc_dapm_widget *w;
@@ -1643,7 +1643,7 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, 
 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, char *pin)

int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin)

{

	return snd_soc_dapm_set_pin(codec, pin, 1);

}
@@ -1658,7 +1658,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin); 
 * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to

 * do any widget power switching.

 */

int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, char *pin)

int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin)

{

	return snd_soc_dapm_set_pin(codec, pin, 0);

}
@@ -1678,7 +1678,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_disable_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_codec *codec, char *pin)

int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin)

{

	return snd_soc_dapm_set_pin(codec, pin, 0);

}
@@ -1693,7 +1693,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin); 
 *

 * Returns 1 for connected otherwise 0.

 */

int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, char *pin)

int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin)

{

	struct snd_soc_dapm_widget *w;