crypto: qat - use PCI_VDEVICE

Build pci_device_id structure using the PCI_VDEVICE macro.
This removes any references to the ADF_SYSTEM_DEVICE macro.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Fiona Trahe <fiona.trahe@intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Giovanni Cabiddu 2020-09-09 11:59:40 +01:00 committed by Herbert Xu
parent 92db319899
commit 37b15fa97e
6 changed files with 12 additions and 30 deletions

View File

@ -18,12 +18,9 @@
#include <adf_cfg.h> #include <adf_cfg.h>
#include "adf_c3xxx_hw_data.h" #include "adf_c3xxx_hw_data.h"
#define ADF_SYSTEM_DEVICE(device_id) \
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
static const struct pci_device_id adf_pci_tbl[] = { static const struct pci_device_id adf_pci_tbl[] = {
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C3XXX), { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C3XXX), },
{0,} { }
}; };
MODULE_DEVICE_TABLE(pci, adf_pci_tbl); MODULE_DEVICE_TABLE(pci, adf_pci_tbl);

View File

@ -18,12 +18,9 @@
#include <adf_cfg.h> #include <adf_cfg.h>
#include "adf_c3xxxvf_hw_data.h" #include "adf_c3xxxvf_hw_data.h"
#define ADF_SYSTEM_DEVICE(device_id) \
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
static const struct pci_device_id adf_pci_tbl[] = { static const struct pci_device_id adf_pci_tbl[] = {
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF), { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF), },
{0,} { }
}; };
MODULE_DEVICE_TABLE(pci, adf_pci_tbl); MODULE_DEVICE_TABLE(pci, adf_pci_tbl);

View File

@ -18,12 +18,9 @@
#include <adf_cfg.h> #include <adf_cfg.h>
#include "adf_c62x_hw_data.h" #include "adf_c62x_hw_data.h"
#define ADF_SYSTEM_DEVICE(device_id) \
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
static const struct pci_device_id adf_pci_tbl[] = { static const struct pci_device_id adf_pci_tbl[] = {
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C62X), { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C62X), },
{0,} { }
}; };
MODULE_DEVICE_TABLE(pci, adf_pci_tbl); MODULE_DEVICE_TABLE(pci, adf_pci_tbl);

View File

@ -18,12 +18,9 @@
#include <adf_cfg.h> #include <adf_cfg.h>
#include "adf_c62xvf_hw_data.h" #include "adf_c62xvf_hw_data.h"
#define ADF_SYSTEM_DEVICE(device_id) \
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
static const struct pci_device_id adf_pci_tbl[] = { static const struct pci_device_id adf_pci_tbl[] = {
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_C62X_VF), { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C62X_VF), },
{0,} { }
}; };
MODULE_DEVICE_TABLE(pci, adf_pci_tbl); MODULE_DEVICE_TABLE(pci, adf_pci_tbl);

View File

@ -18,12 +18,9 @@
#include <adf_cfg.h> #include <adf_cfg.h>
#include "adf_dh895xcc_hw_data.h" #include "adf_dh895xcc_hw_data.h"
#define ADF_SYSTEM_DEVICE(device_id) \
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
static const struct pci_device_id adf_pci_tbl[] = { static const struct pci_device_id adf_pci_tbl[] = {
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_DH895XCC), { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_DH895XCC), },
{0,} { }
}; };
MODULE_DEVICE_TABLE(pci, adf_pci_tbl); MODULE_DEVICE_TABLE(pci, adf_pci_tbl);

View File

@ -18,12 +18,9 @@
#include <adf_cfg.h> #include <adf_cfg.h>
#include "adf_dh895xccvf_hw_data.h" #include "adf_dh895xccvf_hw_data.h"
#define ADF_SYSTEM_DEVICE(device_id) \
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
static const struct pci_device_id adf_pci_tbl[] = { static const struct pci_device_id adf_pci_tbl[] = {
ADF_SYSTEM_DEVICE(PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF), { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF), },
{0,} { }
}; };
MODULE_DEVICE_TABLE(pci, adf_pci_tbl); MODULE_DEVICE_TABLE(pci, adf_pci_tbl);