Commit 695912e6 authored by Sakari Ailus's avatar Sakari Ailus Committed by Herbert Xu
Browse files

hwrng: atmel - 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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9af6339a

drivers/char/hw_random/atmel-rng.c

+6 −5
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct atmel_trng { 
	struct clk *clk;

	void __iomem *base;

	struct hwrng rng;

	struct device *dev;

	bool has_half_rate;

};
@@ -59,9 +60,9 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max, 
	u32 *data = buf;

	int ret;



	ret = pm_runtime_get_sync((struct device *)trng->rng.priv);

	ret = pm_runtime_get_sync(trng->dev);

	if (ret < 0) {

		pm_runtime_put_sync((struct device *)trng->rng.priv);

		pm_runtime_put_sync(trng->dev);

		return ret;

	}
@@ -79,8 +80,8 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max, 
	ret = 4;



out:

	pm_runtime_mark_last_busy((struct device *)trng->rng.priv);

	pm_runtime_put_sync_autosuspend((struct device *)trng->rng.priv);

	pm_runtime_mark_last_busy(trng->dev);

	pm_runtime_put_sync_autosuspend(trng->dev);

	return ret;

}
@@ -134,9 +135,9 @@ static int atmel_trng_probe(struct platform_device *pdev) 
		return -ENODEV;



	trng->has_half_rate = data->has_half_rate;

	trng->dev = &pdev->dev;

	trng->rng.name = pdev->name;

	trng->rng.read = atmel_trng_read;

	trng->rng.priv = (unsigned long)&pdev->dev;

	platform_set_drvdata(pdev, trng);



#ifndef CONFIG_PM