crypto: qat - remove redundant struct elem

The element pci_dev_id in the struct adf_hw_device_data is redundant since
the PCI device id can be retrieved from the struct pci_dev.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/crypto/qat/qat_common/adf_accel_devices.h
index 45db8d53a9d39ac37b78d4f8091ec7edce00fb1a..99cbce6b3cbc9815a662ad8d7e6708554d29baf0 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h
+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h
@@ -153,7 +153,6 @@ struct adf_hw_device_data {
        void (*enable_ints)(struct adf_accel_dev *accel_dev);
        const char *fw_name;
        const char *fw_mmp_name;
-       uint32_t pci_dev_id;
        uint32_t fuses;
        uint32_t accel_capabilities_mask;
        uint16_t accel_mask;

diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
index eb2f408d43022df407fb7fe4640ab61c0521b044..155ace9d4a439b470f1aff180d16a0b72e2abe6d 100644 (file)
--- a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
@@ -208,7 +208,6 @@ void adf_init_hw_data_dh895xcc(struct adf_hw_device_data *hw_data)
        hw_data->instance_id = dh895xcc_class.instances++;
        hw_data->num_banks = ADF_DH895XCC_ETR_MAX_BANKS;
        hw_data->num_accel = ADF_DH895XCC_MAX_ACCELERATORS;
-       hw_data->pci_dev_id = ADF_DH895XCC_PCI_DEVICE_ID;
        hw_data->num_logical_accel = 1;
        hw_data->num_engines = ADF_DH895XCC_MAX_ACCELENGINES;
        hw_data->tx_rx_gap = ADF_DH895XCC_RX_RINGS_OFFSET;

diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
index d241037f87287a3659dd71e4f80fa4a52b7b3056..4abeca1b1c33dc58f73bce3580e2a2d16eed4424 100644 (file)
--- a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
@@ -100,7 +100,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
        }
 
        if (accel_dev->hw_device) {
-               switch (accel_dev->hw_device->pci_dev_id) {
+               switch (accel_pci_dev->pci_dev->device) {
                case ADF_DH895XCC_PCI_DEVICE_ID:
                        adf_clean_hw_data_dh895xcc(accel_dev->hw_device);
                        break;