diff mbox

caam: desc: Remove unused JUMP_TYPE_MASK definition

Message ID 1441304489-21738-1-git-send-email-festevam@gmail.com (mailing list archive)
State Superseded
Delegated to: Herbert Xu
Headers show

Commit Message

Fabio Estevam Sept. 3, 2015, 6:21 p.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

JUMP_TYPE_MASK is defined in desc.h and it is never used, so we can
safely remove it to avoid the following build warning:

In file included from drivers/crypto/caam/desc_constr.h:7:0,
                 from drivers/crypto/caam/ctrl.c:15:
drivers/crypto/caam/desc.h:1495:0: warning: "JUMP_TYPE_MASK" redefined
 #define JUMP_TYPE_MASK  (0x03 << JUMP_TYPE_SHIFT)
 ^
In file included from include/linux/module.h:19:0,
                 from drivers/crypto/caam/compat.h:9,
                 from drivers/crypto/caam/ctrl.c:11:
include/linux/jump_label.h:131:0: note: this is the location of the previous definition
 #define JUMP_TYPE_MASK 1UL

Reported-by: Olof's autobuilder <build@lixom.net>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/crypto/caam/desc.h | 1 -
 1 file changed, 1 deletion(-)

Comments

Horia Geantă Sept. 15, 2015, 4:42 p.m. UTC | #1 
On 9/3/2015 9:21 PM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> JUMP_TYPE_MASK is defined in desc.h and it is never used, so we can
> safely remove it to avoid the following build warning:
> 
> In file included from drivers/crypto/caam/desc_constr.h:7:0,
>                  from drivers/crypto/caam/ctrl.c:15:
> drivers/crypto/caam/desc.h:1495:0: warning: "JUMP_TYPE_MASK" redefined
>  #define JUMP_TYPE_MASK  (0x03 << JUMP_TYPE_SHIFT)
>  ^
> In file included from include/linux/module.h:19:0,
>                  from drivers/crypto/caam/compat.h:9,
>                  from drivers/crypto/caam/ctrl.c:11:
> include/linux/jump_label.h:131:0: note: this is the location of the previous definition
>  #define JUMP_TYPE_MASK 1UL
> 
> Reported-by: Olof's autobuilder <build@lixom.net>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

The build warning is introduced by commit
a1efb01feca5 ("jump_label, locking/static_keys: Rename JUMP_LABEL_TYPE_*
and related helpers to the static_key* pattern")
which currently is not in cryptodev-2.6 tree, i.e. can only be found
upstream.

Other than this,
Reviewed-by: Horia Geant? <horia.geanta@freescale.com>

Horia


--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h
index 983d663..1e93c6a 100644
--- a/drivers/crypto/caam/desc.h
+++ b/drivers/crypto/caam/desc.h
@@ -1492,7 +1492,6 @@  struct sec4_sg_entry {
 #define JUMP_JSL		(1 << JUMP_JSL_SHIFT)
 
 #define JUMP_TYPE_SHIFT		22
-#define JUMP_TYPE_MASK		(0x03 << JUMP_TYPE_SHIFT)
 #define JUMP_TYPE_LOCAL		(0x00 << JUMP_TYPE_SHIFT)
 #define JUMP_TYPE_NONLOCAL	(0x01 << JUMP_TYPE_SHIFT)
 #define JUMP_TYPE_HALT		(0x02 << JUMP_TYPE_SHIFT)