iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda/tas2781: do not call pm_runtime_force_* in system_resume/suspend

Browse Source 
[ Upstream commit 5f51de7e30 ]

The runtime_resume function calls prmg_load and apply_calibration
functions, but system_resume also calls them, so calling
pm_runtime_force_resume before reset is unnecessary.

For consistency, do not call the pm_runtime_force_suspend in
system_suspend, as runtime_suspend does the same.

Fixes: 5be27f1e3e ("ALSA: hda/tas2781: Add tas2781 HDA driver")
Signed-off-by: Gergo Koteles <soyer@irl.hu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Message-ID: <d0b4cc1248b9d375d59c009563da42d60d69eac3.1709918447.git.soyer@irl.hu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Gergo Koteles
2024-03-08 18:41:43 +01:00
committed by Sasha Levin
parent 939dbde009
commit 93cc238b7f
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sound/pci/hda/tas2781_hda_i2c.c
View File

@ -781,14 +781,9 @@ static int tas2781_runtime_resume(struct device *dev)
static int tas2781_system_suspend(struct device *dev) static int tas2781_system_suspend(struct device *dev)
{ {
struct tas2781_hda *tas_hda = dev_get_drvdata(dev); struct tas2781_hda *tas_hda = dev_get_drvdata(dev);
int ret;
dev_dbg(tas_hda->priv->dev, "System Suspend\n"); dev_dbg(tas_hda->priv->dev, "System Suspend\n");
ret = pm_runtime_force_suspend(dev);
if (ret)
return ret;
mutex_lock(&tas_hda->priv->codec_lock); mutex_lock(&tas_hda->priv->codec_lock);
/* Shutdown chip before system suspend */ /* Shutdown chip before system suspend */
@ -806,14 +801,10 @@ static int tas2781_system_suspend(struct device *dev)
static int tas2781_system_resume(struct device *dev) static int tas2781_system_resume(struct device *dev)
{ {
struct tas2781_hda *tas_hda = dev_get_drvdata(dev); struct tas2781_hda *tas_hda = dev_get_drvdata(dev);
int i, ret; int i;
dev_dbg(tas_hda->priv->dev, "System Resume\n"); dev_dbg(tas_hda->priv->dev, "System Resume\n");
ret = pm_runtime_force_resume(dev);
if (ret)
return ret;
mutex_lock(&tas_hda->priv->codec_lock); mutex_lock(&tas_hda->priv->codec_lock);
for (i = 0; i < tas_hda->priv->ndev; i++) { for (i = 0; i < tas_hda->priv->ndev; i++) {