Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab86255f authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman
Browse files

crypto: talitos - Fix return type of current_desc_hdr() 



[ Upstream commit 0237616173fd363a54bd272aa3bd376faa1d7caa ]

current_desc_hdr() returns a u32 but in fact this is a __be32,
leading to a lot of sparse warnings.

Change the return type to __be32 and ensure it is handled as
sure by the caller.

Fixes: 3e721aeb ("crypto: talitos - handle descriptor not found in error path")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1c870748

drivers/crypto/talitos.c

+3 −3
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ DEF_TALITOS2_DONE(ch1_3, TALITOS2_ISR_CH_1_3_DONE) 
/*

 * locate current (offending) descriptor

 */

static u32 current_desc_hdr(struct device *dev, int ch)

static __be32 current_desc_hdr(struct device *dev, int ch)

{

	struct talitos_private *priv = dev_get_drvdata(dev);

	int tail, iter;
@@ -478,13 +478,13 @@ static u32 current_desc_hdr(struct device *dev, int ch) 
/*

 * user diagnostics; report root cause of error based on execution unit status

 */

static void report_eu_error(struct device *dev, int ch, u32 desc_hdr)

static void report_eu_error(struct device *dev, int ch, __be32 desc_hdr)

{

	struct talitos_private *priv = dev_get_drvdata(dev);

	int i;



	if (!desc_hdr)

		desc_hdr = in_be32(priv->chan[ch].reg + TALITOS_DESCBUF);

		desc_hdr = cpu_to_be32(in_be32(priv->chan[ch].reg + TALITOS_DESCBUF));



	switch (desc_hdr & DESC_HDR_SEL0_MASK) {

	case DESC_HDR_SEL0_AFEU: