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 <zhangqilong3@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index c9d38bcfd1c774a1b8ab15f89800ef11e962661e..bc8631363d72516d174f0b618c9038b17a90aaed 100644 (file)
--- 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;
        }