Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: qat - remove empty functions and turn qat_uregister fn to void

Some code cleanups after crypto API changes:
- Change qat_algs_unregister to a void function to keep it consistent
with qat_asym_algs_unregister.
- Remove empty functions qat_algs_init & qat_algs_exit.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Tadeusz Struk and committed by
Herbert Xu
be2cfac0 97bce7e0

+5 -25
+1 -3
drivers/crypto/qat/qat_common/adf_common_drv.h
··· 163 163 void qat_crypto_put_instance(struct qat_crypto_instance *inst); 164 164 void qat_alg_callback(void *resp); 165 165 void qat_alg_asym_callback(void *resp); 166 - int qat_algs_init(void); 167 - void qat_algs_exit(void); 168 166 int qat_algs_register(void); 169 - int qat_algs_unregister(void); 167 + void qat_algs_unregister(void); 170 168 int qat_asym_algs_register(void); 171 169 void qat_asym_algs_unregister(void); 172 170
-6
drivers/crypto/qat/qat_common/adf_ctl_drv.c
··· 463 463 { 464 464 mutex_init(&adf_ctl_lock); 465 465 466 - if (qat_algs_init()) 467 - goto err_algs_init; 468 - 469 466 if (adf_chr_drv_create()) 470 467 goto err_chr_dev; 471 468 ··· 479 482 err_aer: 480 483 adf_chr_drv_destroy(); 481 484 err_chr_dev: 482 - qat_algs_exit(); 483 - err_algs_init: 484 485 mutex_destroy(&adf_ctl_lock); 485 486 return -EFAULT; 486 487 } ··· 488 493 adf_chr_drv_destroy(); 489 494 adf_exit_aer(); 490 495 qat_crypto_unregister(); 491 - qat_algs_exit(); 492 496 adf_clean_vf_map(false); 493 497 mutex_destroy(&adf_ctl_lock); 494 498 }
+3 -5
drivers/crypto/qat/qat_common/adf_init.c
··· 272 272 clear_bit(ADF_STATUS_STARTING, &accel_dev->status); 273 273 clear_bit(ADF_STATUS_STARTED, &accel_dev->status); 274 274 275 - if (!list_empty(&accel_dev->crypto_list) && qat_algs_unregister()) 276 - dev_err(&GET_DEV(accel_dev), 277 - "Failed to unregister crypto algs\n"); 278 - 279 - if (!list_empty(&accel_dev->crypto_list)) 275 + if (!list_empty(&accel_dev->crypto_list)) { 276 + qat_algs_unregister(); 280 277 qat_asym_algs_unregister(); 278 + } 281 279 282 280 list_for_each(list_itr, &service_table) { 283 281 service = list_entry(list_itr, struct service_hndl, list);
+1 -11
drivers/crypto/qat/qat_common/qat_algs.c
··· 1212 1212 goto unlock; 1213 1213 } 1214 1214 1215 - int qat_algs_unregister(void) 1215 + void qat_algs_unregister(void) 1216 1216 { 1217 1217 mutex_lock(&algs_lock); 1218 1218 if (--active_devs != 0) ··· 1223 1223 1224 1224 unlock: 1225 1225 mutex_unlock(&algs_lock); 1226 - return 0; 1227 - } 1228 - 1229 - int qat_algs_init(void) 1230 - { 1231 - return 0; 1232 - } 1233 - 1234 - void qat_algs_exit(void) 1235 - { 1236 1226 }