Unverified Commit 6dc7b8a1 authored Jun 12, 2024 by Krzysztof Kozlowski Committed by Mark Brown Jun 18, 2024

ASoC: codecs: wcd937x: Drop unused chipid member



The driver stores the read chipid in 'struct wcd937x_priv' but never
needs it after.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240612-asoc-wcd9xxx-wide-cleanups-v1-15-0d15885b2a06@linaro.org


Signed-off-by: Mark Brown <broonie@kernel.org>

parent c2d9fd2e

sound/soc/codecs/wcd937x.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -99,7 +99,6 @@ struct wcd937x_priv {
		s32 pullup_ref[WCD937X_MAX_MICBIAS];
		u32 hph_mode;
		int ear_rx_path;
		u32 chipid;
		u32 micb1_mv;
		u32 micb2_mv;
		u32 micb3_mv;
		@@ -2539,6 +2538,7 @@ static int wcd937x_soc_codec_probe(struct snd_soc_component *component)
		struct device *dev = component->dev;
		unsigned long time_left;
		int i, ret;
		u32 chipid;

		time_left = wait_for_completion_timeout(&tx_sdw_dev->initialization_complete,
		msecs_to_jiffies(5000));
		@@ -2552,11 +2552,10 @@ static int wcd937x_soc_codec_probe(struct snd_soc_component *component)
		if (ret < 0)
		return ret;

		wcd937x->chipid = (snd_soc_component_read(component,
		chipid = (snd_soc_component_read(component,
		WCD937X_DIGITAL_EFUSE_REG_0) & 0x1e) >> 1;
		if (wcd937x->chipid != CHIPID_WCD9370 &&
		wcd937x->chipid != CHIPID_WCD9375) {
		dev_err(dev, "Got unknown chip id: 0x%x\n", wcd937x->chipid);
		if (chipid != CHIPID_WCD9370 && chipid != CHIPID_WCD9375) {
		dev_err(dev, "Got unknown chip id: 0x%x\n", chipid);
		pm_runtime_put(dev);
		return -EINVAL;
		}
		@@ -2605,7 +2604,7 @@ static int wcd937x_soc_codec_probe(struct snd_soc_component *component)
		disable_irq_nosync(wcd937x->hphl_pdm_wd_int);
		disable_irq_nosync(wcd937x->aux_pdm_wd_int);

		if (wcd937x->chipid == CHIPID_WCD9375) {
		if (chipid == CHIPID_WCD9375) {
		ret = snd_soc_dapm_new_controls(dapm, wcd9375_dapm_widgets,
		ARRAY_SIZE(wcd9375_dapm_widgets));
		if (ret < 0) {