mirror of
https://github.com/torvalds/linux.git
synced 2024-09-20 23:13:00 +00:00
ALSA: hda: cs35l41: Remove unnecessary boolean state variable firmware_running
This state duplicates the running state inside cs_dsp, so is not necessary.
Remove it, and use cs_dsp.running instead.
This brings the CS35L41 HDA driver more inline with its ASoC version,
allowing the same state to be used when calling library functions.
Fixes: fa3efcc36a
("ALSA: cs35l41: Use mbox command to enable speaker output for external boost")
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231117163609.823627-2-sbinding@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
7c9caa2993
commit
37f67abe08
|
@ -504,7 +504,6 @@ static void cs35l41_shutdown_dsp(struct cs35l41_hda *cs35l41)
|
|||
|
||||
cs_dsp_stop(dsp);
|
||||
cs_dsp_power_down(dsp);
|
||||
cs35l41->firmware_running = false;
|
||||
dev_dbg(cs35l41->dev, "Unloaded Firmware\n");
|
||||
}
|
||||
|
||||
|
@ -550,7 +549,7 @@ static void cs35l41_hda_play_start(struct device *dev)
|
|||
|
||||
cs35l41->playback_started = true;
|
||||
|
||||
if (cs35l41->firmware_running) {
|
||||
if (cs35l41->cs_dsp.running) {
|
||||
regmap_multi_reg_write(reg, cs35l41_hda_config_dsp,
|
||||
ARRAY_SIZE(cs35l41_hda_config_dsp));
|
||||
regmap_update_bits(reg, CS35L41_PWR_CTRL2,
|
||||
|
@ -580,7 +579,7 @@ static void cs35l41_mute(struct device *dev, bool mute)
|
|||
regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute));
|
||||
} else {
|
||||
dev_dbg(dev, "Unmuting\n");
|
||||
if (cs35l41->firmware_running) {
|
||||
if (cs35l41->cs_dsp.running) {
|
||||
regmap_multi_reg_write(reg, cs35l41_hda_unmute_dsp,
|
||||
ARRAY_SIZE(cs35l41_hda_unmute_dsp));
|
||||
} else {
|
||||
|
@ -599,7 +598,7 @@ static void cs35l41_hda_play_done(struct device *dev)
|
|||
dev_dbg(dev, "Play (Complete)\n");
|
||||
|
||||
cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1,
|
||||
cs35l41->firmware_running);
|
||||
cs35l41->cs_dsp.running);
|
||||
cs35l41_mute(dev, false);
|
||||
}
|
||||
|
||||
|
@ -612,7 +611,7 @@ static void cs35l41_hda_pause_start(struct device *dev)
|
|||
|
||||
cs35l41_mute(dev, true);
|
||||
cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0,
|
||||
cs35l41->firmware_running);
|
||||
cs35l41->cs_dsp.running);
|
||||
}
|
||||
|
||||
static void cs35l41_hda_pause_done(struct device *dev)
|
||||
|
@ -625,7 +624,7 @@ static void cs35l41_hda_pause_done(struct device *dev)
|
|||
regmap_update_bits(reg, CS35L41_PWR_CTRL2, CS35L41_AMP_EN_MASK, 0 << CS35L41_AMP_EN_SHIFT);
|
||||
if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST)
|
||||
regmap_write(reg, CS35L41_GPIO1_CTRL1, 0x00000001);
|
||||
if (cs35l41->firmware_running) {
|
||||
if (cs35l41->cs_dsp.running) {
|
||||
cs35l41_set_cspl_mbox_cmd(dev, reg, CSPL_MBOX_CMD_PAUSE);
|
||||
regmap_update_bits(reg, CS35L41_PWR_CTRL2,
|
||||
CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,
|
||||
|
@ -675,7 +674,7 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
|
|||
break;
|
||||
case HDA_GEN_PCM_ACT_CLOSE:
|
||||
mutex_lock(&cs35l41->fw_mutex);
|
||||
if (!cs35l41->firmware_running && cs35l41->request_fw_load &&
|
||||
if (!cs35l41->cs_dsp.running && cs35l41->request_fw_load &&
|
||||
!cs35l41->fw_request_ongoing) {
|
||||
dev_info(dev, "Requesting Firmware Load after HDA_GEN_PCM_ACT_CLOSE\n");
|
||||
cs35l41->fw_request_ongoing = true;
|
||||
|
@ -761,10 +760,9 @@ static int cs35l41_verify_id(struct cs35l41_hda *cs35l41, unsigned int *regid, u
|
|||
static int cs35l41_ready_for_reset(struct cs35l41_hda *cs35l41)
|
||||
{
|
||||
mutex_lock(&cs35l41->fw_mutex);
|
||||
if (cs35l41->firmware_running) {
|
||||
if (cs35l41->cs_dsp.running) {
|
||||
cs35l41->cs_dsp.running = false;
|
||||
cs35l41->cs_dsp.booted = false;
|
||||
cs35l41->firmware_running = false;
|
||||
}
|
||||
regcache_mark_dirty(cs35l41->regmap);
|
||||
mutex_unlock(&cs35l41->fw_mutex);
|
||||
|
@ -925,7 +923,7 @@ static int cs35l41_runtime_suspend(struct device *dev)
|
|||
|
||||
mutex_lock(&cs35l41->fw_mutex);
|
||||
|
||||
if (cs35l41->firmware_running) {
|
||||
if (cs35l41->cs_dsp.running) {
|
||||
ret = cs35l41_enter_hibernate(cs35l41->dev, cs35l41->regmap,
|
||||
cs35l41->hw_cfg.bst_type);
|
||||
if (ret)
|
||||
|
@ -960,7 +958,7 @@ static int cs35l41_runtime_resume(struct device *dev)
|
|||
|
||||
regcache_cache_only(cs35l41->regmap, false);
|
||||
|
||||
if (cs35l41->firmware_running) {
|
||||
if (cs35l41->cs_dsp.running) {
|
||||
ret = cs35l41_exit_hibernate(cs35l41->dev, cs35l41->regmap);
|
||||
if (ret) {
|
||||
dev_warn(cs35l41->dev, "Unable to exit Hibernate.");
|
||||
|
@ -1052,8 +1050,6 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
|
|||
goto clean_dsp;
|
||||
}
|
||||
|
||||
cs35l41->firmware_running = true;
|
||||
|
||||
return 0;
|
||||
|
||||
clean_dsp:
|
||||
|
@ -1063,10 +1059,10 @@ clean_dsp:
|
|||
|
||||
static void cs35l41_load_firmware(struct cs35l41_hda *cs35l41, bool load)
|
||||
{
|
||||
if (cs35l41->firmware_running && !load) {
|
||||
if (cs35l41->cs_dsp.running && !load) {
|
||||
dev_dbg(cs35l41->dev, "Unloading Firmware\n");
|
||||
cs35l41_shutdown_dsp(cs35l41);
|
||||
} else if (!cs35l41->firmware_running && load) {
|
||||
} else if (!cs35l41->cs_dsp.running && load) {
|
||||
dev_dbg(cs35l41->dev, "Loading Firmware\n");
|
||||
cs35l41_smart_amp(cs35l41);
|
||||
} else {
|
||||
|
@ -1346,7 +1342,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
|
|||
cs35l41->acpi_subsystem_id, cs35l41->hw_cfg.bst_type,
|
||||
cs35l41->hw_cfg.gpio1.func == CS35l41_VSPK_SWITCH,
|
||||
cs35l41->hw_cfg.spk_pos ? 'R' : 'L',
|
||||
cs35l41->firmware_running, cs35l41->speaker_id);
|
||||
cs35l41->cs_dsp.running, cs35l41->speaker_id);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user