Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149642
b: refs/heads/master
c: 8206a11
h: refs/heads/master
v: v3
  • Loading branch information
Kumar Gala authored and Benjamin Herrenschmidt committed May 21, 2009
1 parent bbb4e2e commit 4172793
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 19afa40797a3b392b64bf0b30b46e62001eeb66f
refs/heads/master: 8206a110cbaa029570d037c0aeafeb181443b6b8
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/sysdev/fsl_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ static void __init setup_pci_cmd(struct pci_controller *hose)

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;

if ((bus->parent == hose->bus) &&
Expand Down Expand Up @@ -422,7 +422,7 @@ struct mpc83xx_pcie_priv {

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)
return PCIBIOS_DEVICE_NOT_FOUND;
Expand All @@ -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,
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;
u8 bus_no = bus->number - hose->first_busno;
u32 dev_base = bus_no << 24 | devfn << 16;
Expand Down

0 comments on commit 4172793

Please sign in to comment.