diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-08 10:27:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-08 10:27:51 -0700 |
| commit | 3466f49dd0dd9d30fe1e916b49fca1f4f99a3b66 (patch) | |
| tree | beb512067de626fda4e0cf7885126462356ffb17 /drivers/hwspinlock/omap_hwspinlock.c | |
| parent | 92ceebf920aa9f103b89d102f98fc59c6b990cc0 (diff) | |
| parent | cdab30b44518513003607ecfc8a22de3dbbb78ed (diff) | |
Merge tag 'hwlock-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull hwspinlock updates from Bjorn Andersson:
"This removes the need for representing the Qualcomm SFPB mutex using
an intermediate syscon node and it clean up the pm_runtime_get_sync()
usage in the OMAP hwspinlock driver"
* tag 'hwlock-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
hwspinlock: qcom: Add support for mmio usage to sfpb-mutex
hwspinlock: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
Diffstat (limited to 'drivers/hwspinlock/omap_hwspinlock.c')
| -rw-r--r-- | drivers/hwspinlock/omap_hwspinlock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c index 33eeff94fc2a..1fb3a2550e29 100644 --- a/drivers/hwspinlock/omap_hwspinlock.c +++ b/drivers/hwspinlock/omap_hwspinlock.c @@ -94,11 +94,9 @@ static int omap_hwspinlock_probe(struct platform_device *pdev) * the module SYSSTATUS register */ pm_runtime_enable(&pdev->dev); - ret = pm_runtime_get_sync(&pdev->dev); - if (ret < 0) { - pm_runtime_put_noidle(&pdev->dev); + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret < 0) goto runtime_err; - } /* Determine number of locks */ i = readl(io_base + SYSSTATUS_OFFSET); |