hwrng: npcm - Add struct device pointer to device context struct

Add a struct device pointer field to the device's context struct. This
makes using the unsigned long priv pointer in struct hwrng unnecessary, so
remove that one as well.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/npcm-rng.c b/drivers/char/hw_random/npcm-rng.c
index 9ff00f096f3816a1fd0bd5d841800430f7c71681..3e308c890bd25a887864f830a2457afc009bab6b 100644 (file)
--- a/drivers/char/hw_random/npcm-rng.c
+++ b/drivers/char/hw_random/npcm-rng.c
@@ -32,6 +32,7 @@
 struct npcm_rng {
        void __iomem *base;
        struct hwrng rng;
+       struct device *dev;
        u32 clkp;
 };
 
@@ -57,7 +58,7 @@ static int npcm_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
        int retval = 0;
        int ready;
 
-       pm_runtime_get_sync((struct device *)priv->rng.priv);
+       pm_runtime_get_sync(priv->dev);
 
        while (max) {
                if (wait) {
@@ -79,8 +80,8 @@ static int npcm_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
                max--;
        }
 
-       pm_runtime_mark_last_busy((struct device *)priv->rng.priv);
-       pm_runtime_put_sync_autosuspend((struct device *)priv->rng.priv);
+       pm_runtime_mark_last_busy(priv->dev);
+       pm_runtime_put_sync_autosuspend(priv->dev);
 
        return retval || !wait ? retval : -EIO;
 }
@@ -109,7 +110,7 @@ static int npcm_rng_probe(struct platform_device *pdev)
 #endif
        priv->rng.name = pdev->name;
        priv->rng.read = npcm_rng_read;
-       priv->rng.priv = (unsigned long)&pdev->dev;
+       priv->dev = &pdev->dev;
        priv->clkp = (u32)(uintptr_t)of_device_get_match_data(&pdev->dev);
 
        writel(NPCM_RNG_M1ROSEL, priv->base + NPCM_RNGMODE_REG);