On Thu, 27 Jun 2019 at 18:19, Eric Biggers <ebiggers@xxxxxxxxxx> wrote: > > On Thu, Jun 27, 2019 at 02:02:55PM +0200, Ard Biesheuvel wrote: > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > > --- > > drivers/crypto/hifn_795x.c | 30 +++++--------------- > > 1 file changed, 7 insertions(+), 23 deletions(-) > > > > diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c > > index d656be0a142b..000477e4a429 100644 > > --- a/drivers/crypto/hifn_795x.c > > +++ b/drivers/crypto/hifn_795x.c > > @@ -30,7 +30,7 @@ > > #include <linux/ktime.h> > > > > #include <crypto/algapi.h> > > -#include <crypto/des.h> > > +#include <crypto/internal/des.h> > > > > static char hifn_pll_ref[sizeof("extNNN")] = "ext"; > > module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444); > > @@ -1948,25 +1948,13 @@ static void hifn_flush(struct hifn_device *dev) > > static int hifn_setkey(struct crypto_ablkcipher *cipher, const u8 *key, > > unsigned int len) > > { > > - struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher); > > struct hifn_context *ctx = crypto_tfm_ctx(tfm); > > struct hifn_device *dev = ctx->dev; > > + int err; > > Also a build error here: > > drivers/crypto/hifn_795x.c: In function 'hifn_setkey': > drivers/crypto/hifn_795x.c:1951:44: error: 'tfm' undeclared (first use in this function); did you mean 'tm'? > struct hifn_context *ctx = crypto_tfm_ctx(tfm); > ^~~ > tm > drivers/crypto/hifn_795x.c:1951:44: note: each undeclared identifier is reported only once for each function it appears in Hum, I built allmodconfig for a bunch of architectures, but apparently I missed this one and another one. I will double check these for the next rev