microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ALSA: hda/cirrus: Cleanup patch_cirrus.c code. 

Minor changes, clean up code, remove unnecessary
initialization of variables, reduced number of
warnings from ./scripts/checkpatch.pl from 19 to 0

Tested on DELL Inspiron-3505, DELL Inspiron-3501, DELL Inspiron-3500

Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210315190716.47686-3-vitalyr@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Stefan Binding 2021-03-15 19:07:14 +00:00 коммит произвёл Takashi Iwai
Родитель fb3447d584
Коммит 61a9aba19f
1 изменённых файлов: 72 добавлений и 75 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

147
sound/pci/hda/patch_cirrus.c
Просмотреть файл

@ -127,7 +127,7 @@ enum {
* 1 DAC => HP(sense) / Speakers, * 1 DAC => HP(sense) / Speakers,
* 1 ADC <= LineIn(sense) / MicIn / DMicIn, * 1 ADC <= LineIn(sense) / MicIn / DMicIn,
* 1 SPDIF OUT => SPDIF Trasmitter(sense) * 1 SPDIF OUT => SPDIF Trasmitter(sense)
*/ */
#define CS4210_DAC_NID 0x02 #define CS4210_DAC_NID 0x02
#define CS4210_ADC_NID 0x03 #define CS4210_ADC_NID 0x03
#define CS4210_VENDOR_NID 0x0B #define CS4210_VENDOR_NID 0x0B
@ -146,6 +146,7 @@ enum {
static inline int cs_vendor_coef_get(struct hda_codec *codec, unsigned int idx) static inline int cs_vendor_coef_get(struct hda_codec *codec, unsigned int idx)
{ {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
snd_hda_codec_write(codec, spec->vendor_nid, 0, snd_hda_codec_write(codec, spec->vendor_nid, 0,
AC_VERB_SET_COEF_INDEX, idx); AC_VERB_SET_COEF_INDEX, idx);
return snd_hda_codec_read(codec, spec->vendor_nid, 0, return snd_hda_codec_read(codec, spec->vendor_nid, 0,
@ -156,6 +157,7 @@ static inline void cs_vendor_coef_set(struct hda_codec *codec, unsigned int idx,
unsigned int coef) unsigned int coef)
{ {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
snd_hda_codec_write(codec, spec->vendor_nid, 0, snd_hda_codec_write(codec, spec->vendor_nid, 0,
AC_VERB_SET_COEF_INDEX, idx); AC_VERB_SET_COEF_INDEX, idx);
snd_hda_codec_write(codec, spec->vendor_nid, 0, snd_hda_codec_write(codec, spec->vendor_nid, 0,
@ -192,6 +194,7 @@ static void cs_automute(struct hda_codec *codec)
static bool is_active_pin(struct hda_codec *codec, hda_nid_t nid) static bool is_active_pin(struct hda_codec *codec, hda_nid_t nid)
{ {
unsigned int val; unsigned int val;
val = snd_hda_codec_get_pincfg(codec, nid); val = snd_hda_codec_get_pincfg(codec, nid);
return (get_defcfg_connect(val) != AC_JACK_PORT_NONE); return (get_defcfg_connect(val) != AC_JACK_PORT_NONE);
} }
@ -210,7 +213,7 @@ static void init_input_coef(struct hda_codec *codec)
coef |= 1 << 3; /* DMIC1 2 chan on, GPIO0 off coef |= 1 << 3; /* DMIC1 2 chan on, GPIO0 off
* No effect if SPDIF_OUT2 is * No effect if SPDIF_OUT2 is
* selected in IDX_SPDIF_CTL. * selected in IDX_SPDIF_CTL.
*/ */
cs_vendor_coef_set(codec, IDX_BEEP_CFG, coef); cs_vendor_coef_set(codec, IDX_BEEP_CFG, coef);
} }
@ -284,13 +287,6 @@ static const struct hda_verb cs_errata_init_verbs[] = {
{0x11, AC_VERB_SET_COEF_INDEX, 0x0001}, {0x11, AC_VERB_SET_COEF_INDEX, 0x0001},
{0x11, AC_VERB_SET_PROC_COEF, 0x0008}, {0x11, AC_VERB_SET_PROC_COEF, 0x0008},
{0x11, AC_VERB_SET_PROC_STATE, 0x00}, {0x11, AC_VERB_SET_PROC_STATE, 0x00},
#if 0 /* Don't to set to D3 as we are in power-up sequence */
{0x07, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Rx: D3 */
{0x08, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Tx: D3 */
/*{0x01, AC_VERB_SET_POWER_STATE, 0x03},*/ /* AFG: D3 This is already handled */
#endif
{} /* terminator */ {} /* terminator */
}; };
@ -378,8 +374,10 @@ static int cs_parse_auto_config(struct hda_codec *codec)
/* keep the ADCs powered up when it's dynamically switchable */ /* keep the ADCs powered up when it's dynamically switchable */
if (spec->gen.dyn_adc_switch) { if (spec->gen.dyn_adc_switch) {
unsigned int done = 0; unsigned int done = 0;
for (i = 0; i < spec->gen.input_mux.num_items; i++) { for (i = 0; i < spec->gen.input_mux.num_items; i++) {
int idx = spec->gen.dyn_adc_idx[i]; int idx = spec->gen.dyn_adc_idx[i];
if (done & (1 << idx)) if (done & (1 << idx))
continue; continue;
snd_hda_gen_fix_pin_power(codec, snd_hda_gen_fix_pin_power(codec,
@ -513,6 +511,7 @@ static void cs420x_fixup_gpio_13(struct hda_codec *codec,
{ {
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
spec->gpio_eapd_hp = 2; /* GPIO1 = headphones */ spec->gpio_eapd_hp = 2; /* GPIO1 = headphones */
spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */ spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
spec->gpio_mask = spec->gpio_dir = spec->gpio_mask = spec->gpio_dir =
@ -525,6 +524,7 @@ static void cs420x_fixup_gpio_23(struct hda_codec *codec,
{ {
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
spec->gpio_eapd_hp = 4; /* GPIO2 = headphones */ spec->gpio_eapd_hp = 4; /* GPIO2 = headphones */
spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */ spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
spec->gpio_mask = spec->gpio_dir = spec->gpio_mask = spec->gpio_dir =
@ -669,6 +669,7 @@ static void cs4208_fixup_gpio0(struct hda_codec *codec,
{ {
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
spec->gpio_eapd_hp = 0; spec->gpio_eapd_hp = 0;
spec->gpio_eapd_speaker = 1; spec->gpio_eapd_speaker = 1;
spec->gpio_mask = spec->gpio_dir = spec->gpio_mask = spec->gpio_dir =
@ -823,7 +824,7 @@ static int patch_cs4208(struct hda_codec *codec)
* 1 DAC => HP(sense) / Speakers, * 1 DAC => HP(sense) / Speakers,
* 1 ADC <= LineIn(sense) / MicIn / DMicIn, * 1 ADC <= LineIn(sense) / MicIn / DMicIn,
* 1 SPDIF OUT => SPDIF Trasmitter(sense) * 1 SPDIF OUT => SPDIF Trasmitter(sense)
*/ */
/* CS4210 board names */ /* CS4210 board names */
static const struct hda_model_fixup cs421x_models[] = { static const struct hda_model_fixup cs421x_models[] = {
@ -866,6 +867,7 @@ static void cs421x_fixup_sense_b(struct hda_codec *codec,
const struct hda_fixup *fix, int action) const struct hda_fixup *fix, int action)
{ {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
if (action == HDA_FIXUP_ACT_PRE_PROBE) if (action == HDA_FIXUP_ACT_PRE_PROBE)
spec->sense_b = 1; spec->sense_b = 1;
} }
@ -891,9 +893,9 @@ static const struct hda_verb cs421x_coef_init_verbs[] = {
{0x0B, AC_VERB_SET_PROC_STATE, 1}, {0x0B, AC_VERB_SET_PROC_STATE, 1},
{0x0B, AC_VERB_SET_COEF_INDEX, CS421X_IDX_DEV_CFG}, {0x0B, AC_VERB_SET_COEF_INDEX, CS421X_IDX_DEV_CFG},
/* /*
Disable Coefficient Index Auto-Increment(DAI)=1, * Disable Coefficient Index Auto-Increment(DAI)=1,
PDREF=0 * PDREF=0
*/ */
{0x0B, AC_VERB_SET_PROC_COEF, 0x0001 }, {0x0B, AC_VERB_SET_PROC_COEF, 0x0001 },
{0x0B, AC_VERB_SET_COEF_INDEX, CS421X_IDX_ADC_CFG}, {0x0B, AC_VERB_SET_COEF_INDEX, CS421X_IDX_ADC_CFG},
@ -980,12 +982,12 @@ static int cs421x_boost_vol_put(struct snd_kcontrol *kcontrol,
coef &= ~0x0003; coef &= ~0x0003;
coef |= (vol & 0x0003); coef |= (vol & 0x0003);
if (original_coef == coef) if (original_coef != coef) {
return 0;
else {
cs_vendor_coef_set(codec, CS421X_IDX_SPK_CTL, coef); cs_vendor_coef_set(codec, CS421X_IDX_SPK_CTL, coef);
return 1; return 1;
} }
return 0;
} }
static const struct snd_kcontrol_new cs421x_speaker_boost_ctl = { static const struct snd_kcontrol_new cs421x_speaker_boost_ctl = {
@ -1024,8 +1026,8 @@ static void cs4210_pinmux_init(struct hda_codec *codec)
is_active_pin(codec, CS421X_DMIC_PIN_NID)) { is_active_pin(codec, CS421X_DMIC_PIN_NID)) {
/* /*
GPIO or SENSE_B forced - disconnect the DMIC pin. * GPIO or SENSE_B forced - disconnect the DMIC pin.
*/ */
def_conf = snd_hda_codec_get_pincfg(codec, CS421X_DMIC_PIN_NID); def_conf = snd_hda_codec_get_pincfg(codec, CS421X_DMIC_PIN_NID);
def_conf &= ~AC_DEFCFG_PORT_CONN; def_conf &= ~AC_DEFCFG_PORT_CONN;
def_conf |= (AC_JACK_PORT_NONE << AC_DEFCFG_PORT_CONN_SHIFT); def_conf |= (AC_JACK_PORT_NONE << AC_DEFCFG_PORT_CONN_SHIFT);
@ -1064,6 +1066,7 @@ static void parse_cs421x_digital(struct hda_codec *codec)
for (i = 0; i < cfg->dig_outs; i++) { for (i = 0; i < cfg->dig_outs; i++) {
hda_nid_t nid = cfg->dig_out_pins[i]; hda_nid_t nid = cfg->dig_out_pins[i];
if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) { if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) {
spec->spdif_detect = 1; spec->spdif_detect = 1;
snd_hda_jack_detect_enable_callback(codec, nid, snd_hda_jack_detect_enable_callback(codec, nid,
@ -1142,9 +1145,9 @@ static int cs421x_parse_auto_config(struct hda_codec *codec)
#ifdef CONFIG_PM #ifdef CONFIG_PM
/* /*
Manage PDREF, when transitioning to D3hot * Manage PDREF, when transitioning to D3hot
(DAC,ADC) -> D3, PDREF=1, AFG->D3 * (DAC,ADC) -> D3, PDREF=1, AFG->D3
*/ */
static int cs421x_suspend(struct hda_codec *codec) static int cs421x_suspend(struct hda_codec *codec)
{ {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
@ -1195,10 +1198,10 @@ static int patch_cs4210(struct hda_codec *codec)
snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
/* /*
Update the GPIO/DMIC/SENSE_B pinmux before the configuration * Update the GPIO/DMIC/SENSE_B pinmux before the configuration
is auto-parsed. If GPIO or SENSE_B is forced, DMIC input * is auto-parsed. If GPIO or SENSE_B is forced, DMIC input
is disabled. * is disabled.
*/ */
cs4210_pinmux_init(codec); cs4210_pinmux_init(codec);
err = cs421x_parse_auto_config(codec); err = cs421x_parse_auto_config(codec);
@ -1502,8 +1505,8 @@ static const struct cs8409_cir_param cs8409_cs42l42_hw_cfg[] = {
*/ */
static void cs8409_enable_i2c_clock(struct hda_codec *codec, unsigned int enable) static void cs8409_enable_i2c_clock(struct hda_codec *codec, unsigned int enable)
{ {
unsigned int retval = 0; unsigned int retval;
unsigned int newval = 0; unsigned int newval;
retval = cs_vendor_coef_get(codec, 0x0); retval = cs_vendor_coef_get(codec, 0x0);
newval = (enable) ? (retval | 0x8) : (retval & 0xfffffff7); newval = (enable) ? (retval | 0x8) : (retval & 0xfffffff7);
@ -1698,13 +1701,13 @@ static int cs8409_cs42l42_volume_get(struct snd_kcontrol *kcontrol,
} }
switch (nid) { switch (nid) {
case CS8409_CS42L42_HP_PIN_NID: case CS8409_CS42L42_HP_PIN_NID:
if (chs & 1) if (chs & BIT(0))
*valp++ = spec->cs42l42_hp_volume[0]; *valp++ = spec->cs42l42_hp_volume[0];
if (chs & 2) if (chs & BIT(1))
*valp++ = spec->cs42l42_hp_volume[1]; *valp++ = spec->cs42l42_hp_volume[1];
break; break;
case CS8409_CS42L42_AMIC_PIN_NID: case CS8409_CS42L42_AMIC_PIN_NID:
if (chs & 1) if (chs & BIT(0))
*valp++ = spec->cs42l42_hs_mic_volume[0]; *valp++ = spec->cs42l42_hs_mic_volume[0];
break; break;
default: default:
@ -1722,19 +1725,19 @@ static int cs8409_cs42l42_volume_put(struct snd_kcontrol *kcontrol,
int chs = get_amp_channels(kcontrol); int chs = get_amp_channels(kcontrol);
long *valp = ucontrol->value.integer.value; long *valp = ucontrol->value.integer.value;
int change = 0; int change = 0;
char vol = 0; char vol;
snd_hda_power_up(codec); snd_hda_power_up(codec);
switch (nid) { switch (nid) {
case CS8409_CS42L42_HP_PIN_NID: case CS8409_CS42L42_HP_PIN_NID:
mutex_lock(&spec->cs8409_i2c_mux); mutex_lock(&spec->cs8409_i2c_mux);
if (chs & 1) { if (chs & BIT(0)) {
vol = -(*valp); vol = -(*valp);
change = cs8409_i2c_write(codec, CS42L42_I2C_ADDR, change = cs8409_i2c_write(codec, CS42L42_I2C_ADDR,
CS8409_CS42L42_REG_HS_VOLUME_CHA, vol, 1); CS8409_CS42L42_REG_HS_VOLUME_CHA, vol, 1);
valp++; valp++;
} }
if (chs & 2) { if (chs & BIT(1)) {
vol = -(*valp); vol = -(*valp);
change |= cs8409_i2c_write(codec, CS42L42_I2C_ADDR, change |= cs8409_i2c_write(codec, CS42L42_I2C_ADDR,
CS8409_CS42L42_REG_HS_VOLUME_CHB, vol, 1); CS8409_CS42L42_REG_HS_VOLUME_CHB, vol, 1);
@ -1743,7 +1746,7 @@ static int cs8409_cs42l42_volume_put(struct snd_kcontrol *kcontrol,
break; break;
case CS8409_CS42L42_AMIC_PIN_NID: case CS8409_CS42L42_AMIC_PIN_NID:
mutex_lock(&spec->cs8409_i2c_mux); mutex_lock(&spec->cs8409_i2c_mux);
if (chs & 1) { if (chs & BIT(0)) {
change = cs8409_i2c_write( change = cs8409_i2c_write(
codec, CS42L42_I2C_ADDR, codec, CS42L42_I2C_ADDR,
CS8409_CS42L42_REG_AMIC_VOLUME, (char)*valp, 1); CS8409_CS42L42_REG_AMIC_VOLUME, (char)*valp, 1);
@ -1907,7 +1910,7 @@ static void cs8409_jack_unsol_event(struct hda_codec *codec, unsigned int res)
int reg_cdc_status; int reg_cdc_status;
int reg_hs_status; int reg_hs_status;
int reg_ts_status; int reg_ts_status;
int type = 0; int type;
struct hda_jack_tbl *jk; struct hda_jack_tbl *jk;
/* jack_unsol_event() will be called every time gpio line changing state. /* jack_unsol_event() will be called every time gpio line changing state.
@ -1984,7 +1987,7 @@ static void cs8409_jack_unsol_event(struct hda_codec *codec, unsigned int res)
if (status_changed) { if (status_changed) {
snd_hda_set_pin_ctl(codec, CS8409_CS42L42_SPK_PIN_NID, snd_hda_set_pin_ctl(codec, CS8409_CS42L42_SPK_PIN_NID,
(spec->cs42l42_hp_jack_in)?0 : PIN_OUT); spec->cs42l42_hp_jack_in ? 0 : PIN_OUT);
/* Report jack*/ /* Report jack*/
jk = snd_hda_jack_tbl_get_mst(codec, CS8409_CS42L42_HP_PIN_NID, 0); jk = snd_hda_jack_tbl_get_mst(codec, CS8409_CS42L42_HP_PIN_NID, 0);
@ -2072,18 +2075,18 @@ static void cs8409_enable_ur(struct hda_codec *codec, int flag)
/* GPIO4 INT# and GPIO3 WAKE# */ /* GPIO4 INT# and GPIO3 WAKE# */
snd_hda_codec_write(codec, codec->core.afg, snd_hda_codec_write(codec, codec->core.afg,
0, AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0, AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK,
flag?(GPIO3_INT | GPIO4_INT) : 0); flag ? (GPIO3_INT | GPIO4_INT) : 0);
snd_hda_codec_write(codec, codec->core.afg, snd_hda_codec_write(codec, codec->core.afg,
0, AC_VERB_SET_UNSOLICITED_ENABLE, 0, AC_VERB_SET_UNSOLICITED_ENABLE,
flag?AC_UNSOL_ENABLED : 0); flag ? AC_UNSOL_ENABLED : 0);
} }
/* Vendor specific HW configuration /* Vendor specific HW configuration
* PLL, ASP, I2C, SPI, GPIOs, DMIC etc... * PLL, ASP, I2C, SPI, GPIOs, DMIC etc...
*/ */
static int cs8409_cs42l42_hw_init(struct hda_codec *codec) static void cs8409_cs42l42_hw_init(struct hda_codec *codec)
{ {
const struct cs8409_cir_param *seq = cs8409_cs42l42_hw_cfg; const struct cs8409_cir_param *seq = cs8409_cs42l42_hw_cfg;
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
@ -2123,14 +2126,16 @@ static int cs8409_cs42l42_hw_init(struct hda_codec *codec)
if (spec->cs42l42_volume_init) { if (spec->cs42l42_volume_init) {
mutex_lock(&spec->cs8409_i2c_mux); mutex_lock(&spec->cs8409_i2c_mux);
cs8409_i2c_write(codec, CS42L42_I2C_ADDR, cs8409_i2c_write(codec, CS42L42_I2C_ADDR,
CS8409_CS42L42_REG_HS_VOLUME_CHA, -spec->cs42l42_hp_volume[0], CS8409_CS42L42_REG_HS_VOLUME_CHA,
-spec->cs42l42_hp_volume[0],
1); 1);
cs8409_i2c_write(codec, CS42L42_I2C_ADDR, cs8409_i2c_write(codec, CS42L42_I2C_ADDR,
CS8409_CS42L42_REG_HS_VOLUME_CHB, -spec->cs42l42_hp_volume[1], CS8409_CS42L42_REG_HS_VOLUME_CHB,
-spec->cs42l42_hp_volume[1],
1); 1);
cs8409_i2c_write( cs8409_i2c_write(codec, CS42L42_I2C_ADDR,
codec, CS42L42_I2C_ADDR, CS8409_CS42L42_REG_AMIC_VOLUME,
CS8409_CS42L42_REG_AMIC_VOLUME, spec->cs42l42_hs_mic_volume[0], spec->cs42l42_hs_mic_volume[0],
1); 1);
mutex_unlock(&spec->cs8409_i2c_mux); mutex_unlock(&spec->cs8409_i2c_mux);
} }
@ -2141,15 +2146,11 @@ static int cs8409_cs42l42_hw_init(struct hda_codec *codec)
/* Enable Unsolicited Response */ /* Enable Unsolicited Response */
cs8409_enable_ur(codec, 1); cs8409_enable_ur(codec, 1);
return 1;
} }
static int cs8409_cs42l42_init(struct hda_codec *codec) static int cs8409_cs42l42_init(struct hda_codec *codec)
{ {
int ret = 0; int ret = snd_hda_gen_init(codec);
ret = snd_hda_gen_init(codec);
if (!ret) { if (!ret) {
/* On Dell platforms with suspend D3 mode support we /* On Dell platforms with suspend D3 mode support we
@ -2181,9 +2182,9 @@ static const struct hda_codec_ops cs8409_cs42l42_patch_ops = {
static int cs8409_cs42l42_fixup(struct hda_codec *codec) static int cs8409_cs42l42_fixup(struct hda_codec *codec)
{ {
int err = 0; int err;
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
unsigned int pincap = 0; int caps;
/* Basic initial sequence for specific hw configuration */ /* Basic initial sequence for specific hw configuration */
snd_hda_sequence_write(codec, cs8409_cs42l42_init_verbs); snd_hda_sequence_write(codec, cs8409_cs42l42_init_verbs);
@ -2198,25 +2199,25 @@ static int cs8409_cs42l42_fixup(struct hda_codec *codec)
* capabilities. We have to override pin capabilities, * capabilities. We have to override pin capabilities,
* otherwise they will not be created as input devices. * otherwise they will not be created as input devices.
*/ */
_snd_hdac_read_parm(&codec->core, caps = snd_hdac_read_parm(&codec->core, CS8409_CS42L42_HP_PIN_NID,
CS8409_CS42L42_HP_PIN_NID, AC_PAR_PIN_CAP, &pincap); AC_PAR_PIN_CAP);
if (caps >= 0)
snd_hdac_override_parm(&codec->core, snd_hdac_override_parm(&codec->core,
CS8409_CS42L42_HP_PIN_NID, AC_PAR_PIN_CAP, CS8409_CS42L42_HP_PIN_NID, AC_PAR_PIN_CAP,
(pincap | (AC_PINCAP_IMP_SENSE | AC_PINCAP_PRES_DETECT))); (caps | (AC_PINCAP_IMP_SENSE | AC_PINCAP_PRES_DETECT)));
_snd_hdac_read_parm(&codec->core, CS8409_CS42L42_AMIC_PIN_NID, caps = snd_hdac_read_parm(&codec->core, CS8409_CS42L42_AMIC_PIN_NID,
AC_PAR_PIN_CAP, &pincap); AC_PAR_PIN_CAP);
if (caps >= 0)
snd_hdac_override_parm(&codec->core, snd_hdac_override_parm(&codec->core,
CS8409_CS42L42_AMIC_PIN_NID, AC_PAR_PIN_CAP, CS8409_CS42L42_AMIC_PIN_NID, AC_PAR_PIN_CAP,
(pincap | (AC_PINCAP_IMP_SENSE | AC_PINCAP_PRES_DETECT))); (caps | (AC_PINCAP_IMP_SENSE | AC_PINCAP_PRES_DETECT)));
snd_hda_override_wcaps(codec, CS8409_CS42L42_HP_PIN_NID, snd_hda_override_wcaps(codec, CS8409_CS42L42_HP_PIN_NID,
(get_wcaps(codec, CS8409_CS42L42_HP_PIN_NID) | AC_WCAP_UNSOL_CAP)); (get_wcaps(codec, CS8409_CS42L42_HP_PIN_NID) | AC_WCAP_UNSOL_CAP));
snd_hda_override_wcaps(codec, CS8409_CS42L42_AMIC_PIN_NID, snd_hda_override_wcaps(codec, CS8409_CS42L42_AMIC_PIN_NID,
(get_wcaps(codec, CS8409_CS42L42_AMIC_PIN_NID) | AC_WCAP_UNSOL_CAP)); (get_wcaps(codec, CS8409_CS42L42_AMIC_PIN_NID) | AC_WCAP_UNSOL_CAP));
snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@ -2238,7 +2239,7 @@ static int cs8409_cs42l42_fixup(struct hda_codec *codec)
snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
return err; return 0;
} }
static int cs8409_cs42l42_exec_verb(struct hdac_device *dev, static int cs8409_cs42l42_exec_verb(struct hdac_device *dev,
@ -2247,11 +2248,8 @@ static int cs8409_cs42l42_exec_verb(struct hdac_device *dev,
struct hda_codec *codec = container_of(dev, struct hda_codec, core); struct hda_codec *codec = container_of(dev, struct hda_codec, core);
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
unsigned int nid = 0; unsigned int nid = ((cmd >> 20) & 0x07f);
unsigned int verb = 0; unsigned int verb = ((cmd >> 8) & 0x0fff);
nid = ((cmd >> 20) & 0x07f);
verb = ((cmd >> 8) & 0x0fff);
/* CS8409 pins have no AC_PINSENSE_PRESENCE /* CS8409 pins have no AC_PINSENSE_PRESENCE
* capabilities. We have to intercept 2 calls for pins 0x24 and 0x34 * capabilities. We have to intercept 2 calls for pins 0x24 and 0x34
@ -2327,9 +2325,6 @@ static int patch_cs8409(struct hda_codec *codec)
spec->cs42l42_mic_jack_in = 0; spec->cs42l42_mic_jack_in = 0;
err = cs8409_cs42l42_fixup(codec); err = cs8409_cs42l42_fixup(codec);
if (err > 0)
err = cs8409_cs42l42_hw_init(codec);
break; break;
default: default:
@ -2338,10 +2333,12 @@ static int patch_cs8409(struct hda_codec *codec)
codec->bus->pci->subsystem_device); codec->bus->pci->subsystem_device);
break; break;
} }
if (err < 0)
cs_free(codec); if (!err) {
else cs8409_cs42l42_hw_init(codec);
snd_hda_codec_set_name(codec, "CS8409/CS42L42"); snd_hda_codec_set_name(codec, "CS8409/CS42L42");
} else
cs_free(codec);
return err; return err;
} }