Skip to content

Commit d54b780

Browse files
committed
soundwire: intel: simplify pm_runtime handling in suspend/resume
Since we've introduced a .prepare callback that brings all devices to full power on S state transitions if the clock-stop mode was used, we no longer need to special-case when the device was pm_runtime suspended. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent dfa8f2c commit d54b780

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

drivers/soundwire/intel.c

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,19 +1610,9 @@ static int __maybe_unused intel_suspend(struct device *dev)
16101610

16111611
clock_stop_quirks = sdw->link_res->clock_stop_quirks;
16121612

1613-
if ((clock_stop_quirks & SDW_INTEL_CLK_STOP_BUS_RESET ||
1614-
!clock_stop_quirks) &&
1615-
!pm_runtime_suspended(dev->parent)) {
1616-
1617-
/*
1618-
* if we've enabled clock stop, and the parent
1619-
* is still active, disable shim wake. The
1620-
* SHIM registers are not accessible if the
1621-
* parent is already pm_runtime suspended so
1622-
* it's too late to change that configuration
1623-
*/
1624-
1625-
intel_shim_wake(sdw, false);
1613+
if (clock_stop_quirks & SDW_INTEL_CLK_STOP_BUS_RESET || !clock_stop_quirks) {
1614+
/* this should not happen but throw a log in case of a broken sequence */
1615+
dev_err(dev, "%s: pm_runtime status is suspended with clock-stop mode\n", __func__);
16261616
}
16271617

16281618
return 0;

0 commit comments

Comments
 (0)