diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-19 22:54:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 00:18:08 -0500 |
commit | fe2d338cdcc628e0abdb4f70570a7fa864c617db (patch) | |
tree | fbcaeabc2cd7f0a8d564b2e32c54254a71116de9 /arch/powerpc/kernel/pci_64.c | |
parent | fa462f2d75e2437b5757069d3d7d27b1e50285cb (diff) |
[POWERPC] Merge pcibios_resource_to_bus/bus_to_resource
This merges the PowerPC 32 and 64 bits version of pcibios_resource_to_bus
and pcibios_bus_to_resource().
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_64.c')
-rw-r--r-- | arch/powerpc/kernel/pci_64.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index e0f3731c3a1c..6d1c28fc5e23 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -93,48 +93,6 @@ static void fixup_broken_pcnet32(struct pci_dev* dev) | |||
93 | } | 93 | } |
94 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32); | 94 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32); |
95 | 95 | ||
96 | void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | ||
97 | struct resource *res) | ||
98 | { | ||
99 | unsigned long offset = 0; | ||
100 | struct pci_controller *hose = pci_bus_to_host(dev->bus); | ||
101 | |||
102 | if (!hose) | ||
103 | return; | ||
104 | |||
105 | if (res->flags & IORESOURCE_IO) | ||
106 | offset = (unsigned long)hose->io_base_virt - _IO_BASE; | ||
107 | |||
108 | if (res->flags & IORESOURCE_MEM) | ||
109 | offset = hose->pci_mem_offset; | ||
110 | |||
111 | region->start = res->start - offset; | ||
112 | region->end = res->end - offset; | ||
113 | } | ||
114 | |||
115 | void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | ||
116 | struct pci_bus_region *region) | ||
117 | { | ||
118 | unsigned long offset = 0; | ||
119 | struct pci_controller *hose = pci_bus_to_host(dev->bus); | ||
120 | |||
121 | if (!hose) | ||
122 | return; | ||
123 | |||
124 | if (res->flags & IORESOURCE_IO) | ||
125 | offset = (unsigned long)hose->io_base_virt - _IO_BASE; | ||
126 | |||
127 | if (res->flags & IORESOURCE_MEM) | ||
128 | offset = hose->pci_mem_offset; | ||
129 | |||
130 | res->start = region->start + offset; | ||
131 | res->end = region->end + offset; | ||
132 | } | ||
133 | |||
134 | #ifdef CONFIG_HOTPLUG | ||
135 | EXPORT_SYMBOL(pcibios_resource_to_bus); | ||
136 | EXPORT_SYMBOL(pcibios_bus_to_resource); | ||
137 | #endif | ||
138 | 96 | ||
139 | /* | 97 | /* |
140 | * We need to avoid collisions with `mirrored' VGA ports | 98 | * We need to avoid collisions with `mirrored' VGA ports |