Commit d550f3ad authored by Adam Guerin's avatar Adam Guerin Committed by Aichun Shi
Browse files

crypto: qat - remove unused macros in qat_comp_alg.c 

mainline inclusion
from mainline-v6.9-rc1
commit dfff0e35fa5dd84ae75052ba129b0219d83e46dc
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9A5BW
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dfff0e35fa5dd84ae75052ba129b0219d83e46dc



-------------------------------------

As a result of the removal of qat_zlib_deflate, some defines where not
removed. Remove them.

This is to fix the following warning when compiling the QAT driver
using the clang compiler with CC=clang W=2:
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:21:9: warning: macro is not used [-Wunused-macros]
       21 | #define QAT_RFC_1950_CM_OFFSET 4
          |         ^
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:16:9: warning: macro is not used [-Wunused-macros]
       16 | #define QAT_RFC_1950_HDR_SIZE 2
          |         ^
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:17:9: warning: macro is not used [-Wunused-macros]
       17 | #define QAT_RFC_1950_FOOTER_SIZE 4
          |         ^
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:22:9: warning: macro is not used [-Wunused-macros]
       22 | #define QAT_RFC_1950_DICT_MASK 0x20
          |         ^
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:18:9: warning: macro is not used [-Wunused-macros]
       18 | #define QAT_RFC_1950_CM_DEFLATE 8
          |         ^
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:20:9: warning: macro is not used [-Wunused-macros]
       20 | #define QAT_RFC_1950_CM_MASK 0x0f
          |         ^
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:23:9: warning: macro is not used [-Wunused-macros]
       23 | #define QAT_RFC_1950_COMP_HDR 0x785e
          |         ^
    drivers/crypto/intel/qat/qat_common/qat_comp_algs.c:19:9: warning: macro is not used [-Wunused-macros]
       19 | #define QAT_RFC_1950_CM_DEFLATE_CINFO_32K 7
          |         ^

Intel-SIG: commit dfff0e35fa5d crypto: qat - remove unused macros in qat_comp_alg.c
Backport to support QAT in-tree driver

Fixes: e9dd20e0e5f6 ("crypto: qat - Remove zlib-deflate")
Signed-off-by: default avatarAdam Guerin <adam.guerin@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
[ Aichun Shi: amend commit log ]
Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent 749169d7

drivers/crypto/intel/qat/qat_common/qat_comp_algs.c

+0 −9
Original line number Diff line number Diff line
@@ -13,15 +13,6 @@ 
#include "qat_compression.h"

#include "qat_algs_send.h"



#define QAT_RFC_1950_HDR_SIZE 2

#define QAT_RFC_1950_FOOTER_SIZE 4

#define QAT_RFC_1950_CM_DEFLATE 8

#define QAT_RFC_1950_CM_DEFLATE_CINFO_32K 7

#define QAT_RFC_1950_CM_MASK 0x0f

#define QAT_RFC_1950_CM_OFFSET 4

#define QAT_RFC_1950_DICT_MASK 0x20

#define QAT_RFC_1950_COMP_HDR 0x785e



static DEFINE_MUTEX(algs_lock);

static unsigned int active_devs;