Commit 256693a3 authored by Matthias Brugger's avatar Matthias Brugger Committed by Herbert Xu
Browse files

hwrng: iproc-rng200 - Move enable/disable in separate function 



We are calling the same code for enable and disable the block in various
parts of the driver. Put that code into a new function to reduce code
duplication.

Signed-off-by: default avatarMatthias Brugger <mbrugger@suse.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarScott Branden <scott.branden@broadcom.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 96a6af54

drivers/char/hw_random/iproc-rng200.c

+16 −19
Original line number Diff line number Diff line
@@ -53,14 +53,24 @@ struct iproc_rng200_dev { 


#define to_rng_priv(rng)	container_of(rng, struct iproc_rng200_dev, rng)



static void iproc_rng200_restart(void __iomem *rng_base)

static void iproc_rng200_enable_set(void __iomem *rng_base, bool enable)

{

	uint32_t val;

	u32 val;



	/* Disable RBG */

	val = ioread32(rng_base + RNG_CTRL_OFFSET);

	val &= ~RNG_CTRL_RNG_RBGEN_MASK;



	if (enable)

		val |= RNG_CTRL_RNG_RBGEN_ENABLE;



	iowrite32(val, rng_base + RNG_CTRL_OFFSET);

}



static void iproc_rng200_restart(void __iomem *rng_base)

{

	uint32_t val;



	iproc_rng200_enable_set(rng_base, false);



	/* Clear all interrupt status */

	iowrite32(0xFFFFFFFFUL, rng_base + RNG_INT_STATUS_OFFSET);
@@ -82,11 +92,7 @@ static void iproc_rng200_restart(void __iomem *rng_base) 
	val &= ~RBG_SOFT_RESET;

	iowrite32(val, rng_base + RBG_SOFT_RESET_OFFSET);



	/* Enable RBG */

	val = ioread32(rng_base + RNG_CTRL_OFFSET);

	val &= ~RNG_CTRL_RNG_RBGEN_MASK;

	val |= RNG_CTRL_RNG_RBGEN_ENABLE;

	iowrite32(val, rng_base + RNG_CTRL_OFFSET);

	iproc_rng200_enable_set(rng_base, true);

}



static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max,
@@ -153,13 +159,8 @@ static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max, 
static int iproc_rng200_init(struct hwrng *rng)

{

	struct iproc_rng200_dev *priv = to_rng_priv(rng);

	uint32_t val;



	/* Setup RNG. */

	val = ioread32(priv->base + RNG_CTRL_OFFSET);

	val &= ~RNG_CTRL_RNG_RBGEN_MASK;

	val |= RNG_CTRL_RNG_RBGEN_ENABLE;

	iowrite32(val, priv->base + RNG_CTRL_OFFSET);

	iproc_rng200_enable_set(priv->base, true);



	return 0;

}
@@ -167,12 +168,8 @@ static int iproc_rng200_init(struct hwrng *rng) 
static void iproc_rng200_cleanup(struct hwrng *rng)

{

	struct iproc_rng200_dev *priv = to_rng_priv(rng);

	uint32_t val;



	/* Disable RNG hardware */

	val = ioread32(priv->base + RNG_CTRL_OFFSET);

	val &= ~RNG_CTRL_RNG_RBGEN_MASK;

	iowrite32(val, priv->base + RNG_CTRL_OFFSET);

	iproc_rng200_enable_set(priv->base, false);

}



static int iproc_rng200_probe(struct platform_device *pdev)