commit 1104528bc769bef26f837097459e1a6e4dae240c
author Bjorn Helgaas <bhelgaas@google.com> Mon Sep 29 13:24:24 2014 -0600
committer Bjorn Helgaas <bhelgaas@google.com> Mon Sep 29 13:24:24 2014 -0600
tree cd2a4c8bf4c929abd7dfff94b76b1ca8daf12b56
parent c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4
parent 24832b4de315ad00e5430a53772750dfcf18514d

Merge branch 'pci/host-designware' into next

* pci/host-designware:
  PCI: designware: Add get_msi_data() to pcie_host_ops
  PCI: designware: Rename get_msi_data() to get_msi_addr()
  PCI: designware: Fix IO resource end address calculation
  PCI: designware: Fix configuration base address when using 'reg'
  PCI: designware: Use NULL instead of false

[bhelgaas: Fixup keystone for "PCI: designware: Rename get_msi_data() to
get_msi_addr()"]

drivers/pci/host/pci-keystone-dw.c

diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c
index 2434786..34086ce 100644
--- a/drivers/pci/host/pci-keystone-dw.c
+++ b/drivers/pci/host/pci-keystone-dw.c
@@ -70,7 +70,7 @@
 	*bit_pos = offset >> 3;
 }
 
-u32 ks_dw_pcie_get_msi_data(struct pcie_port *pp)
+u32 ks_dw_pcie_get_msi_addr(struct pcie_port *pp)
 {
 	struct keystone_pcie *ks_pcie = to_keystone_pcie(pp);