From b2d7e8bcaab7d1d931369984e2bae952247a1412 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 20 Apr 2020 18:28:19 +1000 Subject: hwrng: cctrng - Remove unnecessary FIPS ifdef This patch removes the unnecessary FIPS ifdef in cctrng. Signed-off-by: Herbert Xu Acked-by: Hadar Gat Signed-off-by: Herbert Xu --- drivers/char/hw_random/cctrng.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/char') diff --git a/drivers/char/hw_random/cctrng.c b/drivers/char/hw_random/cctrng.c index e82716c12c3a..49fb65a221f3 100644 --- a/drivers/char/hw_random/cctrng.c +++ b/drivers/char/hw_random/cctrng.c @@ -331,13 +331,11 @@ void cc_trng_compwork_handler(struct work_struct *w) ehr_valid = CC_REG_FLD_GET(RNG_ISR, EHR_VALID, isr); dev_dbg(dev, "Got RNG_ISR=0x%08X (EHR_VALID=%u)\n", isr, ehr_valid); -#ifdef CONFIG_CRYPTO_FIPS - if (CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr) && fips_enabled) { + if (fips_enabled && CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr)) { fips_fail_notify(); /* FIPS error is fatal */ panic("Got HW CRNGT error while fips is enabled!\n"); } -#endif /* Clear all pending RNG interrupts */ cc_iowrite(drvdata, CC_RNG_ICR_REG_OFFSET, isr); -- cgit v1.2.3-59-g8ed1b