Skip to contentSkip to conversation

ALSA: hda: cs35l56: Remove calls to cs35l56_force_sync_asp1_registers_from_cache()

PATCH In review Richard Fitzgerald 2 participants 2 messages Aug 9, 2024 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: hda: cs35l56: Remove calls to cs35l56_force_sync_asp1_registers_from_cache()

From: Simon Trimmer <[email protected]>

Commit 5d7e328e20b3 ("ASoC: cs35l56: Revert support for dual-ownership of ASP registers")
replaced cs35l56_force_sync_asp1_registers_from_cache() with a dummy implementation so that the HDA driver would continue to build.

Remove the calls from HDA so that the stub function can be removed.

---
 sound/pci/hda/cs35l56_hda.c | 8 --------
 1 file changed, 8 deletions(-)
sound/pci/hda/cs35l56_hda.c +0 -8
index 96d3f13c5abf..bbfd68a572bf 100644
@@ -151,10 +151,6 @@ static int cs35l56_hda_runtime_resume(struct device *dev)
 		}
 	}
 
-	ret = cs35l56_force_sync_asp1_registers_from_cache(&cs35l56->base);
-	if (ret)
-		goto err;
-
 	return 0;
 
 err:
@@ -1095,9 +1091,6 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)
 
 	regmap_multi_reg_write(cs35l56->base.regmap, cs35l56_hda_dai_config,
 			       ARRAY_SIZE(cs35l56_hda_dai_config));
-	ret = cs35l56_force_sync_asp1_registers_from_cache(&cs35l56->base);
-	if (ret)
-		goto dsp_err;
 
 	/*
 	 * By default only enable one ASP1TXn, where n=amplifier index,
@@ -1123,7 +1116,6 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)
 
 pm_err:
 	pm_runtime_disable(cs35l56->base.dev);
-dsp_err:
 	cs_dsp_remove(&cs35l56->cs_dsp);
 err:
 	gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 0);
Signature · 1 line
2.39.2
#1 lore raw
Quoted 8 lines · Richard Fitzgerald

From: Simon Trimmer <[email protected]>

Commit 5d7e328e20b3 ("ASoC: cs35l56: Revert support for dual-ownership of ASP registers")
replaced cs35l56_force_sync_asp1_registers_from_cache() with a dummy implementation so that the HDA driver would continue to build.

Quoted 4 lines

Remove the calls from HDA so that the stub function can be removed.

Since those are the only callers, it'd be easier to get rid of the definition in include/sound/cs35l56.h together as a single patch. Otherwise it'll lead to a dependency, which can be difficult when applied over multiple trees.

thanks,

Takashi

Quoted 40 lines
---
 sound/pci/hda/cs35l56_hda.c | 8 --------
 1 file changed, 8 deletions(-)
sound/pci/hda/cs35l56_hda.c +0 -8
index 96d3f13c5abf..bbfd68a572bf 100644
@@ -151,10 +151,6 @@ static int cs35l56_hda_runtime_resume(struct device *dev)
 		}
 	}
 
-	ret = cs35l56_force_sync_asp1_registers_from_cache(&cs35l56->base);
-	if (ret)
-		goto err;
-
 	return 0;
 
 err:
@@ -1095,9 +1091,6 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)
 
 	regmap_multi_reg_write(cs35l56->base.regmap, cs35l56_hda_dai_config,
 			       ARRAY_SIZE(cs35l56_hda_dai_config));
-	ret = cs35l56_force_sync_asp1_registers_from_cache(&cs35l56->base);
-	if (ret)
-		goto dsp_err;
 
 	/*
 	 * By default only enable one ASP1TXn, where n=amplifier index,
@@ -1123,7 +1116,6 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)
 
 pm_err:
 	pm_runtime_disable(cs35l56->base.dev);
-dsp_err:
 	cs_dsp_remove(&cs35l56->cs_dsp);
 err:
 	gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 0);
Signature · 1 line
2.39.2