diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-03 10:01:52 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-03 10:01:52 +0200 |
| commit | 6dd4c83ed7e28309c03b0c267f1473fc3e7db9f1 (patch) | |
| tree | 8c41d6a1a61b26b660ecef59006760cd9fa2ffdb /drivers/crypto | |
| parent | crypto: s5p-sss - fix incorrect usage of scatterlists api (diff) | |
| parent | crypto: qat - fix adf_ctl_drv.c:undefined reference to adf_init_pf_wq (diff) | |
| download | linux-6dd4c83ed7e28309c03b0c267f1473fc3e7db9f1.tar.xz linux-6dd4c83ed7e28309c03b0c267f1473fc3e7db9f1.zip | |
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 fix.
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/qat/qat_common/adf_common_drv.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h index ff0b37bed8c1..35ffa940989b 100644 --- a/drivers/crypto/qat/qat_common/adf_common_drv.h +++ b/drivers/crypto/qat/qat_common/adf_common_drv.h @@ -146,8 +146,6 @@ 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); @@ -243,6 +241,8 @@ void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev); int adf_vf2pf_init(struct adf_accel_dev *accel_dev); void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev); +int adf_init_pf_wq(void); +void adf_exit_pf_wq(void); #else static inline int adf_sriov_configure(struct pci_dev *pdev, int numvfs) { @@ -269,5 +269,14 @@ static inline int adf_vf2pf_init(struct adf_accel_dev *accel_dev) static inline void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev) { } + +static inline int adf_init_pf_wq(void) +{ + return 0; +} + +static inline void adf_exit_pf_wq(void) +{ +} #endif #endif |