From 5789e5ed116bbba72b99e3036e4d315304e07885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 20 Nov 2016 23:56:59 +0200 Subject: [PATCH] UPSTREAM: via/k8t890: Compose a list of PCI IDs BUG=None BRANCH=None TEST=None Signed-off-by: Kysti Mlkki Reviewed-on: https://review.coreboot.org/17549 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) Change-Id: Ic474e17b70d64b63356a0ba7dd1649e5a6ff3a30 Reviewed-on: https://chromium-review.googlesource.com/415059 Commit-Ready: Aaron Durbin Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/southbridge/via/k8t890/pcie.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/southbridge/via/k8t890/pcie.c b/src/southbridge/via/k8t890/pcie.c index cc39f57970..d93fd17516 100644 --- a/src/southbridge/via/k8t890/pcie.c +++ b/src/southbridge/via/k8t890/pcie.c @@ -147,26 +147,16 @@ static const struct pci_driver northbridge_driver __pci_driver = { .device = PCI_DEVICE_ID_VIA_K8T890CE_PEG, }; -static const struct pci_driver pcie_drvd3f0 __pci_driver = { - .ops = &pcie_ops, - .vendor = PCI_VENDOR_ID_VIA, - .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX0, +static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_VIA_K8T890CE_PEX0, + PCI_DEVICE_ID_VIA_K8T890CE_PEX1, + PCI_DEVICE_ID_VIA_K8T890CE_PEX2, + PCI_DEVICE_ID_VIA_K8T890CE_PEX3, + 0, }; -static const struct pci_driver pcie_drvd3f1 __pci_driver = { - .ops = &pcie_ops, - .vendor = PCI_VENDOR_ID_VIA, - .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX1, -}; - -static const struct pci_driver pcie_drvd3f2 __pci_driver = { - .ops = &pcie_ops, - .vendor = PCI_VENDOR_ID_VIA, - .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX2, -}; - -static const struct pci_driver pcie_drvd3f3 __pci_driver = { - .ops = &pcie_ops, - .vendor = PCI_VENDOR_ID_VIA, - .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX3, +static const struct pci_driver pex_driver __pci_driver = { + .ops = &pcie_ops, + .vendor = PCI_VENDOR_ID_VIA, + .devices = pci_device_ids, };