Skip to contentSkip to conversation

crypto: qat - make adf_ae_shutdown() a void function

PATCH New Ahsan Atta 1 participant 1 message Oct 30

Subsystems (2)
Crypto API QAT driver
lore
Share & tools
lore

Ahsan Atta

author
#0 lore raw

PATCH 1/1 crypto: qat - make adf_ae_shutdown() a void function

From: Svyatoslav Pankratov <[email protected]>

adf_ae_shutdown() has no failure mode and has always returned 0, yet its only caller in adf_dev_shutdown() carries an error branch that reports a shutdown failure and skips clearing ADF_STATUS_AE_INITIALISED. That branch is unreachable.

Change the return type to void and drop the dead error handling.

Signed-off-by Svyatoslav Pankratov <[email protected]>
Signed-off-by Ahsan Atta <[email protected]>
Reviewed-by Giovanni Cabiddu <[email protected]>
---
 drivers/crypto/intel/qat/qat_common/adf_accel_engine.c | 5 ++---
 drivers/crypto/intel/qat/qat_common/adf_common_drv.h   | 2 +-
 drivers/crypto/intel/qat/qat_common/adf_init.c         | 8 ++------
 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/crypto/intel/qat/qat_common/adf_accel_engine.c +2 -3
index 09d4f547e082..bb97bbedbb8a 100644
@@ -204,16 +204,15 @@ int adf_ae_init(struct adf_accel_dev *accel_dev)
 	return 0;
 }
 
-int adf_ae_shutdown(struct adf_accel_dev *accel_dev)
+void adf_ae_shutdown(struct adf_accel_dev *accel_dev)
 {
 	struct adf_fw_loader_data *loader_data = accel_dev->fw_loader;
 	struct adf_hw_device_data *hw_device = accel_dev->hw_device;
 
 	if (!hw_device->fw_name)
-		return 0;
+		return;
 
 	qat_hal_deinit(loader_data->fw_loader);
 	kfree(accel_dev->fw_loader);
 	accel_dev->fw_loader = NULL;
-	return 0;
 }
drivers/crypto/intel/qat/qat_common/adf_common_drv.h +1 -1
index 762a0b5e774a..533388cfa252 100644
@@ -67,7 +67,7 @@ int adf_dev_started(struct adf_accel_dev *accel_dev);
 int adf_dev_restarting_notify(struct adf_accel_dev *accel_dev);
 int adf_dev_restarted_notify(struct adf_accel_dev *accel_dev);
 int adf_ae_init(struct adf_accel_dev *accel_dev);
-int adf_ae_shutdown(struct adf_accel_dev *accel_dev);
+void adf_ae_shutdown(struct adf_accel_dev *accel_dev);
 int adf_ae_fw_load(struct adf_accel_dev *accel_dev);
 void adf_ae_fw_release(struct adf_accel_dev *accel_dev);
 int adf_ae_start(struct adf_accel_dev *accel_dev);
drivers/crypto/intel/qat/qat_common/adf_init.c +2 -6
index 81cb5e6c9f4a..6af0866b9539 100644
@@ -393,12 +393,8 @@ static void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
 	}
 
 	if (test_bit(ADF_STATUS_AE_INITIALISED, &accel_dev->status)) {
-		if (adf_ae_shutdown(accel_dev))
-			dev_err(&GET_DEV(accel_dev),
-				"Failed to shutdown Accel Engine\n");
-		else
-			clear_bit(ADF_STATUS_AE_INITIALISED,
-				  &accel_dev->status);
+		adf_ae_shutdown(accel_dev);
+		clear_bit(ADF_STATUS_AE_INITIALISED, &accel_dev->status);
 	}
 
 	mutex_lock(&service_lock);
Signature · 1 line
2.50.1