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

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 and remove the stub function.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20241206105757.718750-1-rf@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index 94e8185c4795fe9d21fe60eb81d6a550a53195a5..3dc7a1551ac35034741faa7987b1e39eb4f107af 100644 (file)
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -271,12 +271,6 @@ struct cs35l56_base {
        struct gpio_desc *reset_gpio;
 };
 
-/* Temporary to avoid a build break with the HDA driver */
-static inline int cs35l56_force_sync_asp1_registers_from_cache(struct cs35l56_base *cs35l56_base)
-{
-       return 0;
-}
-
 static inline bool cs35l56_is_otp_register(unsigned int reg)
 {
        return (reg >> 16) == 3;

diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
index e3ac0e23ae321100befac7490a85fac8b3556e56..7baf3b506eefecb63332ca202374f36193290c35 100644 (file)
--- 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:
@@ -1059,9 +1055,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,
@@ -1087,7 +1080,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);