> -----Original Message----- > From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> > Sent: Monday, 20 April 2020 11:28 > To: Hadar Gat <Hadar.Gat@xxxxxxx> > Cc: Matt Mackall <mpm@xxxxxxxxxxx>; Arnd Bergmann <arnd@xxxxxxxx>; > Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>; Gilad Ben-Yossef > <gilad@xxxxxxxxxxxxx>; Ofir Drang <Ofir.Drang@xxxxxxx>; linux- > crypto@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx > Subject: hwrng: cctrng - Remove unnecessary FIPS ifdef > > This patch removes the unnecessary FIPS ifdef in cctrng. > > Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> > Acked-by: Hadar Gat <hadar.gat@xxxxxxx> > 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); > -- > Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Home Page: > http://gondor.apana.org.au/~herbert/ > PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt