Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (6dd4c83e) · Commits · e / devices / android_kernel_teracube_2e

drivers/crypto/qat/qat_common/adf_common_drv.h

+11 −2

Original line number	Diff line number	Diff line
		@@ -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