diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-29 13:24:24 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-29 13:24:24 -0600 |
| commit | 1104528bc769bef26f837097459e1a6e4dae240c (patch) | |
| tree | cd2a4c8bf4c929abd7dfff94b76b1ca8daf12b56 /drivers/pci/host/pcie-designware.h | |
| parent | c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4 (diff) | |
| parent | 24832b4de315ad00e5430a53772750dfcf18514d (diff) | |
| download | op-kernel-dev-1104528bc769bef26f837097459e1a6e4dae240c.zip op-kernel-dev-1104528bc769bef26f837097459e1a6e4dae240c.tar.gz | |
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()"]
Diffstat (limited to 'drivers/pci/host/pcie-designware.h')
| -rw-r--r-- | drivers/pci/host/pcie-designware.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h index 48f8670..c625675 100644 --- a/drivers/pci/host/pcie-designware.h +++ b/drivers/pci/host/pcie-designware.h @@ -70,7 +70,8 @@ struct pcie_host_ops { void (*host_init)(struct pcie_port *pp); void (*msi_set_irq)(struct pcie_port *pp, int irq); void (*msi_clear_irq)(struct pcie_port *pp, int irq); - u32 (*get_msi_data)(struct pcie_port *pp); + u32 (*get_msi_addr)(struct pcie_port *pp); + u32 (*get_msi_data)(struct pcie_port *pp, int pos); void (*scan_bus)(struct pcie_port *pp); int (*msi_host_init)(struct pcie_port *pp, struct msi_chip *chip); }; |
