mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 10:00:17 +00:00
ALSA: hda/tas2781: do not call pm_runtime_force_* in system_resume/suspend
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>
This commit is contained in:
committed by
Takashi Iwai
parent
bec7760a6c
commit
5f51de7e30
@@ -870,14 +870,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 */
|
||||||
@@ -895,14 +890,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++) {
|
||||||
|
|||||||
Reference in New Issue
Block a user