Commit 8206a110 authored by Kumar Gala's avatar Kumar Gala Committed by Benjamin Herrenschmidt

powerpc/pci: Clean up direct access to sysdata by FSL platforms

We shouldn't directly access sysdata to get the pci_controller.  Instead
use pci_bus_to_host() for this purpose.  In the future we might have
sysdata be a device_node to match ppc64 and unify the code between ppc32
& ppc64.
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 19afa407
...@@ -284,7 +284,7 @@ static void __init setup_pci_cmd(struct pci_controller *hose) ...@@ -284,7 +284,7 @@ static void __init setup_pci_cmd(struct pci_controller *hose)
void fsl_pcibios_fixup_bus(struct pci_bus *bus) void fsl_pcibios_fixup_bus(struct pci_bus *bus)
{ {
struct pci_controller *hose = (struct pci_controller *) bus->sysdata; struct pci_controller *hose = pci_bus_to_host(bus);
int i; int i;
if ((bus->parent == hose->bus) && if ((bus->parent == hose->bus) &&
...@@ -422,7 +422,7 @@ struct mpc83xx_pcie_priv { ...@@ -422,7 +422,7 @@ struct mpc83xx_pcie_priv {
static int mpc83xx_pcie_exclude_device(struct pci_bus *bus, unsigned int devfn) static int mpc83xx_pcie_exclude_device(struct pci_bus *bus, unsigned int devfn)
{ {
struct pci_controller *hose = bus->sysdata; struct pci_controller *hose = pci_bus_to_host(bus);
if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
...@@ -448,7 +448,7 @@ static int mpc83xx_pcie_exclude_device(struct pci_bus *bus, unsigned int devfn) ...@@ -448,7 +448,7 @@ static int mpc83xx_pcie_exclude_device(struct pci_bus *bus, unsigned int devfn)
static void __iomem *mpc83xx_pcie_remap_cfg(struct pci_bus *bus, static void __iomem *mpc83xx_pcie_remap_cfg(struct pci_bus *bus,
unsigned int devfn, int offset) unsigned int devfn, int offset)
{ {
struct pci_controller *hose = bus->sysdata; struct pci_controller *hose = pci_bus_to_host(bus);
struct mpc83xx_pcie_priv *pcie = hose->dn->data; struct mpc83xx_pcie_priv *pcie = hose->dn->data;
u8 bus_no = bus->number - hose->first_busno; u8 bus_no = bus->number - hose->first_busno;
u32 dev_base = bus_no << 24 | devfn << 16; u32 dev_base = bus_no << 24 | devfn << 16;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment