caam: desc: Remove unused JUMP_TYPE_MASK definition
PATCH 1/1 caam: desc: Remove unused JUMP_TYPE_MASK definition
From: Fabio Estevam <[email protected]>
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
--- drivers/crypto/caam/desc.h | 1 - 1 file changed, 1 deletion(-)
drivers/crypto/caam/desc.h +0 -1
@@ -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)
Signature · 1 line
1.9.1
Quoted 16 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
JUMP_TYPE_MASKis defined indesc.hand 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,
fromdrivers/crypto/caam/ctrl.c:15:drivers/crypto/caam/desc.h:1495:0: warning: "JUMP_TYPE_MASK" redefined
#defineJUMP_TYPE_MASK(0x03<<JUMP_TYPE_SHIFT)
^
In file included frominclude/linux/module.h:19:0,
fromdrivers/crypto/caam/compat.h:9,
fromdrivers/crypto/caam/ctrl.c:11:include/linux/jump_label.h:131:0: note: this is the location of the previous definition
#defineJUMP_TYPE_MASK1UL
Quoted 2 lines
Reported-by Olof's autobuilder <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
The build warning is introduced by commita1efb01feca5 ("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,
Horia