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

crypto: qat - remove double initialization of value

mainline inclusion
from mainline-v6.9-rc1
commit a66cf93ab33853f17b8cc33a99263dd0a383a1a1
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=a66cf93ab33853f17b8cc33a99263dd0a383a1a1



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

Remove double initialization of the reg variable.

This is to fix the following warning when compiling the QAT driver
using clang scan-build:
    drivers/crypto/intel/qat/qat_common/adf_gen4_ras.c:1010:6: warning: Value stored to 'reg' during its initialization is never read [deadcode.DeadStores]
     1010 |         u32 reg = ADF_CSR_RD(csr, ADF_GEN4_SSMCPPERR);
          |             ^~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/crypto/intel/qat/qat_common/adf_gen4_ras.c:1109:6: warning: Value stored to 'reg' during its initialization is never read [deadcode.DeadStores]
     1109 |         u32 reg = ADF_CSR_RD(csr, ADF_GEN4_SER_ERR_SSMSH);
          |             ^~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Intel-SIG: commit a66cf93ab338 crypto: qat - remove double initialization of value
Backport to support QAT in-tree driver

Fixes: 99b1c9826e48 ("crypto: qat - count QAT GEN4 errors")
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 555c4edc
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -1007,8 +1007,7 @@ static bool adf_handle_spppar_err(struct adf_accel_dev *accel_dev,
static bool adf_handle_ssmcpppar_err(struct adf_accel_dev *accel_dev,
				     void __iomem *csr, u32 iastatssm)
{
	u32 reg = ADF_CSR_RD(csr, ADF_GEN4_SSMCPPERR);
	u32 bits_num = BITS_PER_REG(reg);
	u32 reg, bits_num = BITS_PER_REG(reg);
	bool reset_required = false;
	unsigned long errs_bits;
	u32 bit_iterator;
@@ -1106,8 +1105,7 @@ static bool adf_handle_rf_parr_err(struct adf_accel_dev *accel_dev,
static bool adf_handle_ser_err_ssmsh(struct adf_accel_dev *accel_dev,
				     void __iomem *csr, u32 iastatssm)
{
	u32 reg = ADF_CSR_RD(csr, ADF_GEN4_SER_ERR_SSMSH);
	u32 bits_num = BITS_PER_REG(reg);
	u32 reg, bits_num = BITS_PER_REG(reg);
	bool reset_required = false;
	unsigned long errs_bits;
	u32 bit_iterator;