[PATCH 1/2] hwrng: cctrng - simplify runtime pm refcount code

[Martin Kaiser <martin@kaiser.cx>]

Clean up the code for runtime pm refcounts.

The cc_trng_pm_get helper function isn't really useful, call
pm_runtime_resume_and_get directly.

In dev_err_probe, show the error code only once.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/char/hw_random/cctrng.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/char/hw_random/cctrng.c b/drivers/char/hw_random/cctrng.c
index b5f2c75d2eb8..ef3ca6d8cc85 100644
--- a/drivers/char/hw_random/cctrng.c
+++ b/drivers/char/hw_random/cctrng.c
@@ -85,12 +85,6 @@ static inline u32 cc_ioread(struct cctrng_drvdata *drvdata, u32 reg)
 	return ioread32(drvdata->cc_base + reg);
 }
 
-
-static int cc_trng_pm_get(struct device *dev)
-{
-	return pm_runtime_resume_and_get(dev);
-}
-
 static void cc_trng_pm_put_suspend(struct device *dev)
 {
 	pm_runtime_put_autosuspend(dev);
@@ -239,11 +233,11 @@ static int cctrng_read(struct hwrng *rng, void *data, size_t max, bool wait)
 			/* re-check space in buffer to avoid potential race */
 			if (circ_buf_space(drvdata) >= CC_TRNG_EHR_IN_WORDS) {
 				/* increment device's usage counter */
-				int rc = cc_trng_pm_get(dev);
+				int rc = pm_runtime_resume_and_get(dev);
 
 				if (rc) {
 					dev_err(dev,
-						"cc_trng_pm_get returned %x\n",
+						"pm_runtime_resume_and_get returned %x\n",
 						rc);
 					return rc;
 				}
@@ -521,9 +515,9 @@ static int cctrng_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, rc, "cc_trng_pm_init failed\n");
 
 	/* increment device's usage counter */
-	rc = cc_trng_pm_get(dev);
+	rc = pm_runtime_resume_and_get(dev);
 	if (rc)
-		return dev_err_probe(dev, rc, "cc_trng_pm_get returned %x\n", rc);
+		return dev_err_probe(dev, rc, "pm_runtime_resume_and_get failed\n");
 
 	/* set pending_hw to verify that HW won't be triggered from read */
 	atomic_set(&drvdata->pending_hw, 1);
-- 
2.43.7