From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 4 Jun 2020 17:59:16 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/host-generic'
X-Git-Tag: v5.8-rc1~115^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d388e541e2e3e26adfd9b1c99144176a73e19f95;p=thirdparty%2Flinux.git

Merge branch 'remotes/lorenzo/pci/host-generic'

  - Constify struct pci_ecam_ops (Rob Herring)

  - Support building as modules (Rob Herring)

  - Eliminate wrappers for pci_host_common_probe() by using DT match table
    data (Rob Herring)

* remotes/lorenzo/pci/host-generic:
  PCI: host-generic: Eliminate pci_host_common_probe wrappers
  PCI: host-generic: Support building as modules
  PCI: Constify struct pci_ecam_ops

# Conflicts:
#	drivers/pci/controller/dwc/pcie-hisi.c
---

d388e541e2e3e26adfd9b1c99144176a73e19f95
diff --cc drivers/pci/controller/dwc/pcie-hisi.c
index 11f5ff711d4d5,0ba50fb473b10..0ad4e07dd4c25
--- a/drivers/pci/controller/dwc/pcie-hisi.c
+++ b/drivers/pci/controller/dwc/pcie-hisi.c
@@@ -362,7 -353,7 +353,7 @@@ static int hisi_pcie_platform_init(stru
  	return 0;
  }
  
- static struct pci_ecam_ops hisi_pcie_platform_ops = {
 -const struct pci_ecam_ops hisi_pcie_platform_ops = {
++static const struct pci_ecam_ops hisi_pcie_platform_ops = {
  	.bus_shift    = 20,
  	.init         =  hisi_pcie_platform_init,
  	.pci_ops      = {