Commit 307addcc authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Takashi Iwai
Browse files

ALSA: core: Remove unused snd_jack_set_parent 



snd_jack_set_parent() was added as part of 2008's
commit e76d8cea ("ALSA: Add jack reporting API")

but hasn't been used.

Remove it.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250502235219.1000429-6-linux@treblig.org
parent 625a4681

include/sound/jack.h

+0 −6
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
		 struct snd_jack **jack, bool initial_kctl, bool phantom_jack);

int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);

#ifdef CONFIG_SND_JACK_INPUT_DEV

void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);

int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,

		     int keytype);

#endif
@@ -104,11 +103,6 @@ static inline void snd_jack_report(struct snd_jack *jack, int status) 
#endif



#if !defined(CONFIG_SND_JACK) || !defined(CONFIG_SND_JACK_INPUT_DEV)

static inline void snd_jack_set_parent(struct snd_jack *jack,

				       struct device *parent)

{

}



static inline int snd_jack_set_key(struct snd_jack *jack,

				   enum snd_jack_types type,

				   int keytype)

sound/core/jack.c

+0 −19
Original line number Diff line number Diff line
@@ -574,25 +574,6 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
EXPORT_SYMBOL(snd_jack_new);



#ifdef CONFIG_SND_JACK_INPUT_DEV

/**

 * snd_jack_set_parent - Set the parent device for a jack

 *

 * @jack:   The jack to configure

 * @parent: The device to set as parent for the jack.

 *

 * Set the parent for the jack devices in the device tree.  This

 * function is only valid prior to registration of the jack.  If no

 * parent is configured then the parent device will be the sound card.

 */

void snd_jack_set_parent(struct snd_jack *jack, struct device *parent)

{

	WARN_ON(jack->registered);

	guard(mutex)(&jack->input_dev_lock);

	if (jack->input_dev)

		jack->input_dev->dev.parent = parent;

}

EXPORT_SYMBOL(snd_jack_set_parent);



/**

 * snd_jack_set_key - Set a key mapping on a jack

 *