Commit 70b4891c authored by Vinod Koul's avatar Vinod Koul Committed by Takashi Iwai
Browse files

ALSA: hda: make use of core codec fns 



Now that we have introduced the core fns we should make hda use these
helpers

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1b5e6167

sound/pci/hda/hda_codec.c

+0 −44
Original line number Diff line number Diff line
@@ -90,50 +90,6 @@ static int codec_exec_verb(struct hdac_device *dev, unsigned int cmd, 
	return err;

}



/**

 * snd_hda_codec_read - send a command and get the response

 * @codec: the HDA codec

 * @nid: NID to send the command

 * @flags: optional bit flags

 * @verb: the verb to send

 * @parm: the parameter for the verb

 *

 * Send a single command and read the corresponding response.

 *

 * Returns the obtained response value, or -1 for an error.

 */

unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,

				int flags,

				unsigned int verb, unsigned int parm)

{

	unsigned int cmd = snd_hdac_make_cmd(&codec->core, nid, verb, parm);

	unsigned int res;

	if (snd_hdac_exec_verb(&codec->core, cmd, flags, &res))

		return -1;

	return res;

}

EXPORT_SYMBOL_GPL(snd_hda_codec_read);



/**

 * snd_hda_codec_write - send a single command without waiting for response

 * @codec: the HDA codec

 * @nid: NID to send the command

 * @flags: optional bit flags

 * @verb: the verb to send

 * @parm: the parameter for the verb

 *

 * Send a single command without waiting for response.

 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int flags,

			unsigned int verb, unsigned int parm)

{

	unsigned int cmd = snd_hdac_make_cmd(&codec->core, nid, verb, parm);

	return snd_hdac_exec_verb(&codec->core, cmd, flags, NULL);

}

EXPORT_SYMBOL_GPL(snd_hda_codec_write);



/**

 * snd_hda_sequence_write - sequence writes

 * @codec: the HDA codec

sound/pci/hda/hda_codec.h

+14 −4
Original line number Diff line number Diff line
@@ -309,11 +309,21 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec); 
/*

 * low level functions

 */

unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,

static inline unsigned int

snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,

				int flags,

				unsigned int verb, unsigned int parm);

int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int flags,

			unsigned int verb, unsigned int parm);

				unsigned int verb, unsigned int parm)

{

	return snd_hdac_codec_read(&codec->core, nid, flags, verb, parm);

}



static inline int

snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int flags,

			unsigned int verb, unsigned int parm)

{

	return snd_hdac_codec_write(&codec->core, nid, flags, verb, parm);

}



#define snd_hda_param_read(codec, nid, param) \

	snd_hdac_read_parm(&(codec)->core, nid, param)

#define snd_hda_get_sub_nodes(codec, nid, start_nid) \

sound/pci/hda/hda_local.h

+1 −6
Original line number Diff line number Diff line
@@ -681,12 +681,7 @@ static inline bool 
snd_hda_check_power_state(struct hda_codec *codec, hda_nid_t nid,

			  unsigned int target_state)

{

	unsigned int state = snd_hda_codec_read(codec, nid, 0,

						AC_VERB_GET_POWER_STATE, 0);

	if (state & AC_PWRST_ERROR)

		return true;

	state = (state >> 4) & 0x0f;

	return (state == target_state);

	return snd_hdac_check_power_state(&codec->core, nid, target_state);

}



unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec,