ALSA: hda - Kill snd_hda_codec_update_cache()
PATCH 1/1 ALSA: hda - Kill snd_hda_codec_update_cache()
snd_hda_codec_update_cache() used to serve for a slightly different purpose from snd_hdac_write_cache(), but now both of them became identical.
Let's unify and replace with the latter one consistently.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/hda/hda_codec.c | 4 ++-- sound/pci/hda/hda_codec.h | 3 --- sound/pci/hda/hda_generic.c | 8 ++++---- sound/pci/hda/patch_analog.c | 4 ++-- sound/pci/hda/patch_conexant.c | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-)
sound/pci/hda/hda_codec.c +2 -2
@@ -3842,7 +3842,7 @@ EXPORT_SYMBOL_GPL(snd_hda_correct_pin_ctl);* This function is a helper to set a pin ctl value more safely. * It corrects the pin ctl value via snd_hda_correct_pin_ctl(), stores the * value in pin target array via snd_hda_codec_set_pin_target(), then -* actually writes the value via either snd_hda_codec_update_cache() or +* actually writes the value via either snd_hda_codec_write_cache() or * snd_hda_codec_write() depending on @cached flag. */ int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin,
@@ -3851,7 +3851,7 @@ int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin, val =snd_hda_correct_pin_ctl (codec, pin, val);snd_hda_codec_set_pin_target (codec, pin, val);if (cached) -return snd_hda_codec_update_cache (codec, pin,0 , +return snd_hda_codec_write_cache (codec, pin,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL , val);else return snd_hda_codec_write(codec, pin, 0,
sound/pci/hda/hda_codec.h +0 -3
@@ -381,9 +381,6 @@ snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,return snd_hdac_regmap_write (&codec->core, nid, verb, parm); } -#define snd_hda_codec_update_cache (codec, nid, flags, verb, parm) \ - snd_hda_codec_write_cache(codec, nid, flags, verb, parm) -/* the struct for codec->pin_configs */ struct hda_pincfg {hda_nid_t nid;
sound/pci/hda/hda_generic.c +4 -4
@@ -209,7 +209,7 @@ static void parse_user_hints(struct hda_codec *codec)*/ #define update_pin_ctl (codec, pin, val) \ - snd_hda_codec_update_cache(codec, pin, 0, \ + snd_hda_codec_write_cache(codec, pin, 0, \ AC_VERB_SET_PIN_WIDGET_CONTROL, val)/* restore the pinctl based on the cached value */
@@ -898,7 +898,7 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path,hda_nid_t nid = path->path[i];if (enable && path->multi[i]) -snd_hda_codec_update_cache (codec, nid,0 , +snd_hda_codec_write_cache (codec, nid,0 ,AC_VERB_SET_CONNECT_SEL , path->idx[i]);if (has_amp_in (codec, path, i))
@@ -930,7 +930,7 @@ static void set_pin_eapd(struct hda_codec *codec, hda_nid_t pin, bool enable)return ;if (codec->inv_eapd) enable = !enable; -snd_hda_codec_update_cache (codec, pin,0 , +snd_hda_codec_write_cache (codec, pin,0 ,AC_VERB_SET_EAPD_BTLENABLE , enable ?0x02 :0x00 ); }
@@ -5973,7 +5973,7 @@ static void clear_unsol_on_unused_pins(struct hda_codec *codec)hda_nid_t nid = pin->nid;if (is_jack_detectable (codec, nid) && !snd_hda_jack_tbl_get (codec, nid)) -snd_hda_codec_update_cache (codec, nid,0 , +snd_hda_codec_write_cache (codec, nid,0 ,AC_VERB_SET_UNSOLICITED_ENABLE ,0 ); } }
sound/pci/hda/patch_analog.c +2 -2
@@ -148,7 +148,7 @@ static void ad_vmaster_eapd_hook(void *private_data, int enabled)return ;if (codec->inv_eapd) enabled = !enabled; -snd_hda_codec_update_cache (codec, spec->eapd_nid,0 , +snd_hda_codec_write_cache (codec, spec->eapd_nid,0 ,AC_VERB_SET_EAPD_BTLENABLE , enabled ?0x02 :0x00 ); }
@@ -991,7 +991,7 @@ static void ad1884_vmaster_hp_gpio_hook(void *private_data, int enabled)if (spec->eapd_nid)ad_vmaster_eapd_hook (private_data, enabled); -snd_hda_codec_update_cache (codec,0x01 ,0 , +snd_hda_codec_write_cache (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DATA , enabled ?0x00 :0x02 ); }
sound/pci/hda/patch_conexant.c +1 -1
@@ -341,7 +341,7 @@ static void cxt_fixup_headset_mic(struct hda_codec *codec,* control. */ #define update_mic_pin (codec, nid, val) \ - snd_hda_codec_update_cache(codec, nid, 0, \ + snd_hda_codec_write_cache(codec, nid, 0, \ AC_VERB_SET_PIN_WIDGET_CONTROL, val)static const struct hda_input_mux olpc_xo_dc_bias = {
Signature · 1 line
2.17.1