ASoC: SDCA: Handle CONFIG_PM_SLEEP not being set
Subsystems (3)
Charles Keepax
maintainerPATCH 1/1 ASoC: SDCA: Handle CONFIG_PM_SLEEP not being set
If CONFIG_PM_SLEEP is not set the completion used will not exist. Update the code to avoid the build error this introduces, without PM_SLEEP it should be safe to always run the conditional code.
--- sound/soc/sdca/sdca_interrupts.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
sound/soc/sdca/sdca_interrupts.c +14 -2
@@ -198,6 +198,18 @@ static irqreturn_t hid_handler(int irq, void *data)return irqret; } +#ifdef CONFIG_PM_SLEEP +static bool no_pm_in_progress (struct device *dev) +{ +return completion_done (&dev->power.completion); +} +#else +static bool no_pm_in_progress (struct device *dev) +{ +return true; +} +#endif +static irqreturn_t fdl_owner_handler (int irq,void *data) {struct sdca_interrupt *interrupt = data;
@@ -209,7 +221,7 @@ static irqreturn_t fdl_owner_handler(int irq, void *data)* FDL has to run from the system resume handler, at which point * we can't wait for the pm runtime. */ -if (completion_done (&dev->power.completion)) { +if (no_pm_in_progress (dev)) { ret =pm_runtime_get_sync (dev);if (ret <0 ) {dev_err (dev,"failed to resume for fdl: %d\n" , ret);
@@ -223,7 +235,7 @@ static irqreturn_t fdl_owner_handler(int irq, void *data) irqret =IRQ_HANDLED ; error: -if (completion_done (&dev->power.completion)) +if (no_pm_in_progress (dev))pm_runtime_put (dev);return irqret; }
Signature · 1 line
2.47.3
Mark Brown
maintainerQuoted 5 lines · Charles Keepax
If
CONFIG_PM_SLEEPis not set the completion used will not exist. Update the code to avoid the build error this introduces, withoutPM_SLEEPit should be safe to always run the conditional code.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SDCA: Handle CONFIG_PM_SLEEP not being set
commit: 7a3d1b04d938f31e112fe09c0ffc1af830ba1f6d
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark