crypto: qat - fix excluded_middle.cocci warnings

 Condition !A || A && B is equivalent to !A || B.

Generated by: scripts/coccinelle/misc/excluded_middle.cocci

Fixes: b76f0ea01312 ("coccinelle: misc: add excluded_middle.cocci script")
CC: Denis Efremov <efremov@linux.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
Signed-off-by: Julia Lawall <julia.lawall@inria.fr>
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/qat/qat_common/adf_dev_mgr.c
index 29dc2e3d38ffe1066b3ac1d8f43df6a0e0210851..4c752eed10fea903d27967fb3fbf6287f25f0593 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_dev_mgr.c
+++ b/drivers/crypto/qat/qat_common/adf_dev_mgr.c
@@ -151,8 +151,8 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
        mutex_lock(&table_lock);
        atomic_set(&accel_dev->ref_count, 0);
 
-       /* PF on host or VF on guest */
-       if (!accel_dev->is_vf || (accel_dev->is_vf && !pf)) {
+       /* PF on host or VF on guest - optimized to remove redundant is_vf */
+       if (!accel_dev->is_vf || !pf) {
                struct vf_id_map *map;
 
                list_for_each(itr, &accel_table) {
@@ -248,7 +248,8 @@ void adf_devmgr_rm_dev(struct adf_accel_dev *accel_dev,
                       struct adf_accel_dev *pf)
 {
        mutex_lock(&table_lock);
-       if (!accel_dev->is_vf || (accel_dev->is_vf && !pf)) {
+       /* PF on host or VF on guest - optimized to remove redundant is_vf */
+       if (!accel_dev->is_vf || !pf) {
                id_map[accel_dev->accel_id] = 0;
                num_devices--;
        } else if (accel_dev->is_vf && pf) {