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

Commit a9c74173 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Make is_jack_detectable() as non-inlined 



It's a bit too big and used too often as an inline function.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 374a69e7

sound/pci/hda/hda_jack.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,20 @@ 
#include "hda_local.h"

#include "hda_local.h"

#include "hda_jack.h"

#include "hda_jack.h"





bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid)

{

	if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT))

		return false;

	if (!codec->ignore_misc_bit &&

	    (get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid)) &

	     AC_DEFCFG_MISC_NO_PRESENCE))

		return false;

	if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP))

		return false;

	return true;

}

EXPORT_SYMBOL_HDA(is_jack_detectable);



/* execute pin sense measurement */

/* execute pin sense measurement */

static u32 read_pin_sense(struct hda_codec *codec, hda_nid_t nid)

static u32 read_pin_sense(struct hda_codec *codec, hda_nid_t nid)

{

{

sound/pci/hda/hda_jack.h

+1 −12
Original line number Original line Diff line number Diff line
@@ -62,18 +62,7 @@ int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid, 
u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid);

u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid);

int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);

int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);





static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid)

bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid);

{

	if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT))

		return false;

	if (!codec->ignore_misc_bit &&

	    (get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid)) &

	     AC_DEFCFG_MISC_NO_PRESENCE))

		return false;

	if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP))

		return false;

	return true;

}





int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,

int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,

			  const char *name, int idx);

			  const char *name, int idx);