Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5cf4023 authored by Tadeusz Struk's avatar Tadeusz Struk Committed by Herbert Xu
Browse files

crypto: qat - Fix adf_isr_resource_free name clash 



When both PF and VF drivers are build in linker complains about multiple
definition of adf_isr_resource_[alloc/free] functions.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5cd01fe1

drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -143,8 +143,8 @@ void adf_init_hw_data_dh895xcciov(struct adf_hw_device_data *hw_data) 
	hw_data->num_engines = ADF_DH895XCCIOV_MAX_ACCELENGINES;

	hw_data->num_engines = ADF_DH895XCCIOV_MAX_ACCELENGINES;

	hw_data->tx_rx_gap = ADF_DH895XCCIOV_RX_RINGS_OFFSET;

	hw_data->tx_rx_gap = ADF_DH895XCCIOV_RX_RINGS_OFFSET;

	hw_data->tx_rings_mask = ADF_DH895XCCIOV_TX_RINGS_MASK;

	hw_data->tx_rings_mask = ADF_DH895XCCIOV_TX_RINGS_MASK;

	hw_data->alloc_irq = adf_isr_resource_alloc;

	hw_data->alloc_irq = adf_vf_isr_resource_alloc;

	hw_data->free_irq = adf_isr_resource_free;

	hw_data->free_irq = adf_vf_isr_resource_free;

	hw_data->enable_error_correction = adf_vf_void_noop;

	hw_data->enable_error_correction = adf_vf_void_noop;

	hw_data->init_admin_comms = adf_vf_int_noop;

	hw_data->init_admin_comms = adf_vf_int_noop;

	hw_data->exit_admin_comms = adf_vf_void_noop;

	hw_data->exit_admin_comms = adf_vf_void_noop;

drivers/crypto/qat/qat_dh895xccvf/adf_drv.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 




void adf_init_hw_data_dh895xcciov(struct adf_hw_device_data *hw_data);

void adf_init_hw_data_dh895xcciov(struct adf_hw_device_data *hw_data);

void adf_clean_hw_data_dh895xcciov(struct adf_hw_device_data *hw_data);

void adf_clean_hw_data_dh895xcciov(struct adf_hw_device_data *hw_data);

int adf_isr_resource_alloc(struct adf_accel_dev *accel_dev);

int adf_vf_isr_resource_alloc(struct adf_accel_dev *accel_dev);

void adf_isr_resource_free(struct adf_accel_dev *accel_dev);

void adf_vf_isr_resource_free(struct adf_accel_dev *accel_dev);

void adf_update_ring_arb_enable(struct adf_etr_ring_data *ring);

void adf_update_ring_arb_enable(struct adf_etr_ring_data *ring);

#endif
 
#endif

drivers/crypto/qat/qat_dh895xccvf/adf_isr.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -226,7 +226,7 @@ static void adf_cleanup_bh(struct adf_accel_dev *accel_dev) 
	tasklet_kill(&priv_data->banks[0].resp_handler);

	tasklet_kill(&priv_data->banks[0].resp_handler);

}

}





void adf_isr_resource_free(struct adf_accel_dev *accel_dev)

void adf_vf_isr_resource_free(struct adf_accel_dev *accel_dev)

{

{

	struct pci_dev *pdev = accel_to_pci_dev(accel_dev);

	struct pci_dev *pdev = accel_to_pci_dev(accel_dev);
@@ -237,7 +237,7 @@ void adf_isr_resource_free(struct adf_accel_dev *accel_dev) 
	adf_disable_msi(accel_dev);

	adf_disable_msi(accel_dev);

}

}





int adf_isr_resource_alloc(struct adf_accel_dev *accel_dev)

int adf_vf_isr_resource_alloc(struct adf_accel_dev *accel_dev)

{

{

	if (adf_enable_msi(accel_dev))

	if (adf_enable_msi(accel_dev))

		goto err_out;

		goto err_out;
@@ -253,6 +253,6 @@ int adf_isr_resource_alloc(struct adf_accel_dev *accel_dev) 




	return 0;

	return 0;

err_out:

err_out:

	adf_isr_resource_free(accel_dev);

	adf_vf_isr_resource_free(accel_dev);

	return -EFAULT;

	return -EFAULT;

}
 
}