From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 28 Apr 2016 01:13:03 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6f6438975d6a1afb0f0ac18176ede4e667020db0;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in the qat adf_init_pf_wq change.
---

6f6438975d6a1afb0f0ac18176ede4e667020db0
diff --cc drivers/crypto/qat/qat_common/adf_common_drv.h
index 557ea361d385,155510277c54..ff0b37bed8c1
--- a/drivers/crypto/qat/qat_common/adf_common_drv.h
+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h
@@@ -144,8 -144,8 +144,10 @@@ void adf_disable_aer(struct adf_accel_d
  void adf_dev_restore(struct adf_accel_dev *accel_dev);
  int adf_init_aer(void);
  void adf_exit_aer(void);
 +int adf_init_vf_wq(void);
 +void adf_exit_vf_wq(void);
+ int adf_init_pf_wq(void);
+ void adf_exit_pf_wq(void);
  int adf_init_admin_comms(struct adf_accel_dev *accel_dev);
  void adf_exit_admin_comms(struct adf_accel_dev *accel_dev);
  int adf_send_admin_init(struct adf_accel_dev *accel_dev);
diff --cc drivers/crypto/qat/qat_common/adf_ctl_drv.c
index 116ddda75e27,3c3f948290ca..db21b499cc1d
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@@ -471,17 -462,17 +471,22 @@@ static int __init adf_register_ctl_devi
  	if (adf_init_aer())
  		goto err_aer;
  
+ 	if (adf_init_pf_wq())
+ 		goto err_pf_wq;
+ 
 +	if (adf_init_vf_wq())
 +		goto err_vf_wq;
 +
  	if (qat_crypto_register())
  		goto err_crypto_register;
  
  	return 0;
  
  err_crypto_register:
 +	adf_exit_vf_wq();
 +err_vf_wq:
+ 	adf_exit_pf_wq();
+ err_pf_wq:
  	adf_exit_aer();
  err_aer:
  	adf_chr_drv_destroy();
@@@ -494,7 -485,7 +499,8 @@@ static void __exit adf_unregister_ctl_d
  {
  	adf_chr_drv_destroy();
  	adf_exit_aer();
 +	adf_exit_vf_wq();
+ 	adf_exit_pf_wq();
  	qat_crypto_unregister();
  	adf_clean_vf_map(false);
  	mutex_destroy(&adf_ctl_lock);