提交 ca4a8ad0 编写于 作者: B Bjorn Helgaas 提交者: Yang Yingliang

Intel:PCI/portdrv: Use conventional Device ID table formatting

mainline inclusion
from mainline-v5.1-rc1
commit c89f7f98
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I47H3V
CVE: NA

--------------------------------

commit c89f7f98 upstream.
Backport summary: for 4.19 kernel ICX PCIe Gen4 support.

The pci_device_id table was technically correct, but unusually formatted,
which made adding entries error-prone.  Change the format so it's obvious
how to add entries.
Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
(cherry picked from commit c89f7f98)
Signed-off-by: NEthan Zhao <haifeng.zhao@intel.com>
Signed-off-by: NJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 d08233f2
...@@ -184,10 +184,10 @@ static void pcie_portdrv_err_resume(struct pci_dev *dev) ...@@ -184,10 +184,10 @@ static void pcie_portdrv_err_resume(struct pci_dev *dev)
/* /*
* LINUX Device Driver Model * LINUX Device Driver Model
*/ */
static const struct pci_device_id port_pci_ids[] = { { static const struct pci_device_id port_pci_ids[] = {
/* handle any PCI-Express port */ /* handle any PCI-Express port */
PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0), { PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0) },
}, { /* end: all zeroes */ } { },
}; };
static const struct pci_error_handlers pcie_portdrv_err_handler = { static const struct pci_error_handlers pcie_portdrv_err_handler = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册