| Message ID | 20240809094527.10229-1-rf@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: hda: cs35l56: Remove calls to cs35l56_force_sync_asp1_registers_from_cache() | expand |
On Fri, 09 Aug 2024 11:45:27 +0200, Richard Fitzgerald wrote: > > From: Simon Trimmer <simont@opensource.cirrus.com> > > 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. > > Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> 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 > --- > sound/pci/hda/cs35l56_hda.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c > index 96d3f13c5abf..bbfd68a572bf 100644 > --- a/sound/pci/hda/cs35l56_hda.c > +++ b/sound/pci/hda/cs35l56_hda.c > @@ -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); > -- > 2.39.2 >
diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c index 96d3f13c5abf..bbfd68a572bf 100644 --- a/sound/pci/hda/cs35l56_hda.c +++ b/sound/pci/hda/cs35l56_hda.c @@ -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);