2021-06-01 14:37:48

by Zhang Qilong

Subject: [PATCH -next 0/2] Fix error handling in omap sham ops

First patch clear pm_runtime_get_sync calls. The other
fix PM disable depth imbalance.

Zhang Qilong (2):
crypto: omap-des - using pm_runtime_resume_and_get instead of
pm_runtime_get_sync
crypto: omap-sham - Fix PM reference leak in omap sham ops

drivers/crypto/omap-des.c | 9 +++------
drivers/crypto/omap-sham.c | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)

--
2.17.1

2021-06-01 14:38:16

by Zhang Qilong

Subject: [PATCH -next 1/2] crypto: omap-des - using pm_runtime_resume_and_get instead of pm_runtime_get_sync

Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
pm_runtime_put_noidle. This change is just to simplify the code, no
actual functional changes.

Signed-off-by: Zhang Qilong <[email protected]>
---
drivers/crypto/omap-des.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index c9d38bcfd1c7..bc8631363d72 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -229,9 +229,8 @@ static int omap_des_hw_init(struct omap_des_dev *dd)
* It may be long delays between requests.
* Device might go to off mode to save power.
*/
- err = pm_runtime_get_sync(dd->dev);
+ err = pm_runtime_resume_and_get(dd->dev);
if (err < 0) {
- pm_runtime_put_noidle(dd->dev);
dev_err(dd->dev, "%s: failed to get_sync(%d)\n", __func__, err);
return err;
}
@@ -994,9 +993,8 @@ static int omap_des_probe(struct platform_device *pdev)
pm_runtime_set_autosuspend_delay(dev, DEFAULT_AUTOSUSPEND_DELAY);

pm_runtime_enable(dev);
- err = pm_runtime_get_sync(dev);
+ err = pm_runtime_resume_and_get(dev);
if (err < 0) {
- pm_runtime_put_noidle(dev);
dev_err(dd->dev, "%s: failed to get_sync(%d)\n", __func__, err);
goto err_get;
}
@@ -1124,9 +1122,8 @@ static int omap_des_resume(struct device *dev)
{
int err;

- err = pm_runtime_get_sync(dev);
+ err = pm_runtime_resume_and_get(dev);
if (err < 0) {
- pm_runtime_put_noidle(dev);
dev_err(dev, "%s: failed to get_sync(%d)\n", __func__, err);
return err;
}
--
2.17.1

2021-06-11 07:18:42

by Herbert Xu

Subject: Re: [PATCH -next 0/2] Fix error handling in omap sham ops

On Tue, Jun 01, 2021 at 10:51:16PM +0800, Zhang Qilong wrote:
> First patch clear pm_runtime_get_sync calls. The other
> fix PM disable depth imbalance.
>
> Zhang Qilong (2):
> crypto: omap-des - using pm_runtime_resume_and_get instead of
> pm_runtime_get_sync
> crypto: omap-sham - Fix PM reference leak in omap sham ops
>
> drivers/crypto/omap-des.c | 9 +++------
> drivers/crypto/omap-sham.c | 4 ++--
> 2 files changed, 5 insertions(+), 8 deletions(-)

All applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt