Unverified Commit 19aed2d6 authored by Akihiko Odaki's avatar Akihiko Odaki Committed by Mark Brown
Browse files

ASoC: soc-card: Create jack kcontrol without pins 



snd_soc_card_jack_new() allowed to create jack kcontrol without pins,
but did not create kcontrols. The jack would not have kcontrols if pins
were not going to be added.

This renames the old snd_soc_card_jack_new() to
snd_soc_card_jack_new_pins() for use when pins are provided or will be
added later. The new snd_soc_card_jack_new() appropriately creates a
jack for use without pins and adds a kcontrol.

Signed-off-by: default avatarAkihiko Odaki <akihiko.odaki@gmail.com>
Link: https://lore.kernel.org/r/20220408041114.6024-1-akihiko.odaki@gmail.com


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

drivers/staging/greybus/audio_codec.c

+7 −5
Original line number Diff line number Diff line
@@ -702,7 +702,8 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, 


	headset->pin = module->jack_name;

	headset->mask = module->jack_mask;

	ret = snd_soc_card_jack_new(card, module->jack_name, module->jack_mask,

	ret = snd_soc_card_jack_new_pins(card, module->jack_name,

					 module->jack_mask,

					 &module->headset.jack, headset, 1);

	if (ret) {

		dev_err(module->dev, "Failed to create new jack\n");
@@ -725,8 +726,9 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, 


	button->pin = module->button_name;

	button->mask = module->button_mask;

	ret = snd_soc_card_jack_new(card, module->button_name,

				    module->button_mask, &module->button.jack,

	ret = snd_soc_card_jack_new_pins(card, module->button_name,

					 module->button_mask,

					 &module->button.jack,

					 button, 1);

	if (ret) {

		dev_err(module->dev, "Failed to create button jack\n");

include/sound/soc-card.h

+5 −2
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ enum snd_soc_card_subclass { 
struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name);

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

			  struct snd_soc_jack *jack,

			  struct snd_soc_jack_pin *pins, unsigned int num_pins);

			  struct snd_soc_jack *jack);

int snd_soc_card_jack_new_pins(struct snd_soc_card *card, const char *id,

			       int type, struct snd_soc_jack *jack,

			       struct snd_soc_jack_pin *pins,

			       unsigned int num_pins);



int snd_soc_card_suspend_pre(struct snd_soc_card *card);

int snd_soc_card_suspend_post(struct snd_soc_card *card);

sound/soc/amd/acp-da7219-max98357a.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) 
				SND_JACK_HEADSET | SND_JACK_LINEOUT |

				SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				SND_JACK_BTN_2 | SND_JACK_BTN_3,

				&cz_jack, NULL, 0);

				&cz_jack);

	if (ret) {

		dev_err(card->dev, "HP jack creation failed %d\n", ret);

		return ret;
@@ -151,7 +151,7 @@ static int cz_rt5682_init(struct snd_soc_pcm_runtime *rtd) 
				    SND_JACK_HEADSET | SND_JACK_LINEOUT |

				    SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				    SND_JACK_BTN_2 | SND_JACK_BTN_3,

				    &cz_jack, NULL, 0);

				    &cz_jack);

	if (ret) {

		dev_err(card->dev, "HP jack creation failed %d\n", ret);

		return ret;

sound/soc/amd/acp-rt5645.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int cz_init(struct snd_soc_pcm_runtime *rtd) 
				SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |

				SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				SND_JACK_BTN_2 | SND_JACK_BTN_3,

				&cz_jack, NULL, 0);

				&cz_jack);

	if (ret) {

		dev_err(card->dev, "HP jack creation failed %d\n", ret);

		return ret;

sound/soc/amd/acp/acp-mach-common.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int acp_card_rt5682_init(struct snd_soc_pcm_runtime *rtd) 
				    SND_JACK_HEADSET | SND_JACK_LINEOUT |

				    SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				    SND_JACK_BTN_2 | SND_JACK_BTN_3,

				    &pco_jack, NULL, 0);

				    &pco_jack);

	if (ret) {

		dev_err(card->dev, "HP jack creation failed %d\n", ret);

		return ret;
@@ -266,7 +266,7 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd) 
				    SND_JACK_HEADSET | SND_JACK_LINEOUT |

				    SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				    SND_JACK_BTN_2 | SND_JACK_BTN_3,

				    &pco_jack, NULL, 0);

				    &pco_jack);

	if (ret) {

		dev_err(card->dev, "HP jack creation failed %d\n", ret);

		return ret;