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

Commit 0087f201 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: cht_bsw_max98090: remove useless code, align with ChromeOS driver 



Remove dead code which was missed in previous changes. This is not
visible with git diff but there is a test+return on the same condition
just above.

Also reuse local variable instead of fetching the jack information twice.

Tested on Acer R11 (cyan)

Fixes: 3bbda5a3 ('ASoC: Intel: cht_bsw_max98090_ti: Fix jack initialization')
Cc: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-By: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4b2b915f

sound/soc/intel/boards/cht_bsw_max98090_ti.c

+1 −5
Original line number Diff line number Diff line
@@ -219,10 +219,6 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) 
		return ret;

	}





	if (ctx->ts3a227e_present)

		snd_soc_jack_notifier_register(jack, &cht_jack_nb);



	ret = snd_soc_jack_add_gpiods(runtime->card->dev->parent, jack,

				      ARRAY_SIZE(hs_jack_gpios),

				      hs_jack_gpios);
@@ -323,7 +319,7 @@ static int cht_max98090_headset_init(struct snd_soc_component *component) 
		return ret;

	}



	return ts3a227e_enable_jack_detect(component, &ctx->jack);

	return ts3a227e_enable_jack_detect(component, jack);

}



static const struct snd_soc_ops cht_aif1_ops = {