Commit 47b17ba0 authored by Simon Trimmer's avatar Simon Trimmer Committed by Takashi Iwai
Browse files

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



Commit 5d7e328e ("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: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20241206105757.718750-1-rf@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c34e9ab9

include/sound/cs35l56.h

+0 −6
Original line number Diff line number Diff line
@@ -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;

sound/pci/hda/cs35l56_hda.c

+0 −8
Original line number Diff line number Diff line
@@ -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);