crypto: qat - Deletion of unnecessary checks before two function calls
authorMarkus Elfring <elfring@users.sourceforge.net>
Fri, 26 Jun 2015 18:30:11 +0000 (20:30 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 29 Jun 2015 08:06:29 +0000 (16:06 +0800)
The functions kfree() and release_firmware() test whether their argument
is NULL and then return immediately.
Thus the test around the calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/qat/qat_common/adf_accel_engine.c
drivers/crypto/qat/qat_common/adf_transport.c

index 7f8b66c..fdda8e7 100644 (file)
@@ -88,10 +88,7 @@ void adf_ae_fw_release(struct adf_accel_dev *accel_dev)
 
        qat_uclo_del_uof_obj(loader_data->fw_loader);
        qat_hal_deinit(loader_data->fw_loader);
-
-       if (loader_data->uof_fw)
-               release_firmware(loader_data->uof_fw);
-
+       release_firmware(loader_data->uof_fw);
        loader_data->uof_fw = NULL;
        loader_data->fw_loader = NULL;
 }
index ccec327..db2926b 100644 (file)
@@ -449,7 +449,7 @@ static int adf_init_bank(struct adf_accel_dev *accel_dev,
 err:
        for (i = 0; i < ADF_ETR_MAX_RINGS_PER_BANK; i++) {
                ring = &bank->rings[i];
-               if (hw_data->tx_rings_mask & (1 << i) && ring->inflights)
+               if (hw_data->tx_rings_mask & (1 << i))
                        kfree(ring->inflights);
        }
        return -ENOMEM;