OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c3d649
)
hwrng: cctrng - Remove unnecessary FIPS ifdef
author
Herbert Xu
<herbert@gondor.apana.org.au>
Mon, 20 Apr 2020 08:28:19 +0000
(18:28 +1000)
committer
Herbert Xu
<herbert@gondor.apana.org.au>
Thu, 30 Apr 2020 05:19:32 +0000
(15:19 +1000)
This patch removes the unnecessary FIPS ifdef in cctrng.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Hadar Gat <hadar.gat@arm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/char/hw_random/cctrng.c
patch
|
blob
|
history
diff --git
a/drivers/char/hw_random/cctrng.c
b/drivers/char/hw_random/cctrng.c
index
e82716c
..
49fb65a
100644
(file)
--- 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);