Skip to content

Commit de2f29c

Browse files
committed
ALSA: hda: Remove redundant runtime PM calls
The previous fix for more comprehensive runtime PM calls turned out to be not good as hoped; a few calls including pm_runtime_enable() and pm_runtime_disable() are rather utterly superfluous for PCI devices, even triggering a kernel error message. Better to drop those calls. Note that the problem we wanted to solve with that commit seems irrelevant with the fix itself; the original bug (a GPF at azx_remove()) was likely a regression by the recent PCI core cleanup, and the buggy PCI change has been already reverted. So basically we were scratching a wrong surface. OTOH, making the runtime PM calls symmetric for both probe and remove is more consistent, and maybe that's a sensible outcome. Fixes: 4f66a9e ("ALSA: hda: intel: More comprehensive PM runtime setup for controller driver") Reported-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/d9d76980-966a-e031-70d1-3254ba5be5eb@gmail.com Link: https://lore.kernel.org/r/20211119162730.24423-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 37c4fd0 commit de2f29c

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

sound/pci/hda/hda_intel.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,8 +1349,6 @@ static void azx_free(struct azx *chip)
13491349

13501350
if (azx_has_pm_runtime(chip) && chip->running) {
13511351
pm_runtime_get_noresume(&pci->dev);
1352-
pm_runtime_disable(&pci->dev);
1353-
pm_runtime_set_suspended(&pci->dev);
13541352
pm_runtime_forbid(&pci->dev);
13551353
pm_runtime_dont_use_autosuspend(&pci->dev);
13561354
}
@@ -2328,8 +2326,6 @@ static int azx_probe_continue(struct azx *chip)
23282326
if (azx_has_pm_runtime(chip)) {
23292327
pm_runtime_use_autosuspend(&pci->dev);
23302328
pm_runtime_allow(&pci->dev);
2331-
pm_runtime_set_active(&pci->dev);
2332-
pm_runtime_enable(&pci->dev);
23332329
pm_runtime_put_autosuspend(&pci->dev);
23342330
}
23352331

0 commit comments

Comments
 (0)