diff options
author | Tadeusz Struk <tadeusz.struk@intel.com> | 2016-04-29 14:00:00 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-03 04:10:13 -0400 |
commit | d0c15bd5067ec75d8738f4d4ba1e5e3ab0ea6f2d (patch) | |
tree | 082bba4a6d0cbdeaec6165adc44f4882c44d3fff | |
parent | cca0a7b0ac7fd905a9db6c724dab87e6e6bbee00 (diff) |
crypto: qat - make adf_vf_isr.c dependant on IOV config
The adf_vf_isr.c should only be build if CONFIG_PCI_IOV is enabled
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | drivers/crypto/qat/qat_common/Makefile | 4 | ||||
-rw-r--r-- | drivers/crypto/qat/qat_common/adf_common_drv.h | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/drivers/crypto/qat/qat_common/Makefile b/drivers/crypto/qat/qat_common/Makefile index 5873d22fc6cd..6d74b91f2152 100644 --- a/drivers/crypto/qat/qat_common/Makefile +++ b/drivers/crypto/qat/qat_common/Makefile | |||
@@ -9,7 +9,6 @@ clean-files += qat_rsaprivkey-asn1.c qat_rsaprivkey-asn1.h | |||
9 | obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o | 9 | obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o |
10 | intel_qat-objs := adf_cfg.o \ | 10 | intel_qat-objs := adf_cfg.o \ |
11 | adf_isr.o \ | 11 | adf_isr.o \ |
12 | adf_vf_isr.o \ | ||
13 | adf_ctl_drv.o \ | 12 | adf_ctl_drv.o \ |
14 | adf_dev_mgr.o \ | 13 | adf_dev_mgr.o \ |
15 | adf_init.o \ | 14 | adf_init.o \ |
@@ -27,4 +26,5 @@ intel_qat-objs := adf_cfg.o \ | |||
27 | qat_hal.o | 26 | qat_hal.o |
28 | 27 | ||
29 | intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o | 28 | intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o |
30 | intel_qat-$(CONFIG_PCI_IOV) += adf_sriov.o adf_pf2vf_msg.o adf_vf2pf_msg.o | 29 | intel_qat-$(CONFIG_PCI_IOV) += adf_sriov.o adf_pf2vf_msg.o \ |
30 | adf_vf2pf_msg.o adf_vf_isr.o | ||
diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h index 35ffa940989b..75faa39bc8d0 100644 --- a/drivers/crypto/qat/qat_common/adf_common_drv.h +++ b/drivers/crypto/qat/qat_common/adf_common_drv.h | |||
@@ -144,8 +144,6 @@ void adf_disable_aer(struct adf_accel_dev *accel_dev); | |||
144 | void adf_dev_restore(struct adf_accel_dev *accel_dev); | 144 | void adf_dev_restore(struct adf_accel_dev *accel_dev); |
145 | int adf_init_aer(void); | 145 | int adf_init_aer(void); |
146 | void adf_exit_aer(void); | 146 | void adf_exit_aer(void); |
147 | int adf_init_vf_wq(void); | ||
148 | void adf_exit_vf_wq(void); | ||
149 | int adf_init_admin_comms(struct adf_accel_dev *accel_dev); | 147 | int adf_init_admin_comms(struct adf_accel_dev *accel_dev); |
150 | void adf_exit_admin_comms(struct adf_accel_dev *accel_dev); | 148 | void adf_exit_admin_comms(struct adf_accel_dev *accel_dev); |
151 | int adf_send_admin_init(struct adf_accel_dev *accel_dev); | 149 | int adf_send_admin_init(struct adf_accel_dev *accel_dev); |
@@ -243,6 +241,8 @@ int adf_vf2pf_init(struct adf_accel_dev *accel_dev); | |||
243 | void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev); | 241 | void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev); |
244 | int adf_init_pf_wq(void); | 242 | int adf_init_pf_wq(void); |
245 | void adf_exit_pf_wq(void); | 243 | void adf_exit_pf_wq(void); |
244 | int adf_init_vf_wq(void); | ||
245 | void adf_exit_vf_wq(void); | ||
246 | #else | 246 | #else |
247 | static inline int adf_sriov_configure(struct pci_dev *pdev, int numvfs) | 247 | static inline int adf_sriov_configure(struct pci_dev *pdev, int numvfs) |
248 | { | 248 | { |
@@ -278,5 +278,15 @@ static inline int adf_init_pf_wq(void) | |||
278 | static inline void adf_exit_pf_wq(void) | 278 | static inline void adf_exit_pf_wq(void) |
279 | { | 279 | { |
280 | } | 280 | } |
281 | |||
282 | static inline int adf_init_vf_wq(void) | ||
283 | { | ||
284 | return 0; | ||
285 | } | ||
286 | |||
287 | static inline void adf_exit_vf_wq(void) | ||
288 | { | ||
289 | } | ||
290 | |||
281 | #endif | 291 | #endif |
282 | #endif | 292 | #endif |