Skip to content

Commit 47b17ba

Browse files
simontrimmertiwai
authored andcommitted
ALSA: hda: cs35l56: Remove calls to cs35l56_force_sync_asp1_registers_from_cache()
Commit 5d7e328 ("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>
1 parent c34e9ab commit 47b17ba

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

include/sound/cs35l56.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,6 @@ struct cs35l56_base {
271271
struct gpio_desc *reset_gpio;
272272
};
273273

274-
/* Temporary to avoid a build break with the HDA driver */
275-
static inline int cs35l56_force_sync_asp1_registers_from_cache(struct cs35l56_base *cs35l56_base)
276-
{
277-
return 0;
278-
}
279-
280274
static inline bool cs35l56_is_otp_register(unsigned int reg)
281275
{
282276
return (reg >> 16) == 3;

sound/pci/hda/cs35l56_hda.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ static int cs35l56_hda_runtime_resume(struct device *dev)
151151
}
152152
}
153153

154-
ret = cs35l56_force_sync_asp1_registers_from_cache(&cs35l56->base);
155-
if (ret)
156-
goto err;
157-
158154
return 0;
159155

160156
err:
@@ -1059,9 +1055,6 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)
10591055

10601056
regmap_multi_reg_write(cs35l56->base.regmap, cs35l56_hda_dai_config,
10611057
ARRAY_SIZE(cs35l56_hda_dai_config));
1062-
ret = cs35l56_force_sync_asp1_registers_from_cache(&cs35l56->base);
1063-
if (ret)
1064-
goto dsp_err;
10651058

10661059
/*
10671060
* 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)
10871080

10881081
pm_err:
10891082
pm_runtime_disable(cs35l56->base.dev);
1090-
dsp_err:
10911083
cs_dsp_remove(&cs35l56->cs_dsp);
10921084
err:
10931085
gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 0);

0 commit comments

Comments
 (0)