diff options
Diffstat (limited to 'arch/ppc64/kernel/pmac_pci.c')
-rw-r--r-- | arch/ppc64/kernel/pmac_pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/pmac_pci.c b/arch/ppc64/kernel/pmac_pci.c index dc40a0cad0b4..1f61aa4746ec 100644 --- a/arch/ppc64/kernel/pmac_pci.c +++ b/arch/ppc64/kernel/pmac_pci.c | |||
@@ -121,7 +121,7 @@ static void __init fixup_bus_range(struct device_node *bridge) | |||
121 | |(((unsigned long)(off)) & 0xFCUL) \ | 121 | |(((unsigned long)(off)) & 0xFCUL) \ |
122 | |1UL) | 122 | |1UL) |
123 | 123 | ||
124 | static unsigned long __pmac macrisc_cfg_access(struct pci_controller* hose, | 124 | static unsigned long macrisc_cfg_access(struct pci_controller* hose, |
125 | u8 bus, u8 dev_fn, u8 offset) | 125 | u8 bus, u8 dev_fn, u8 offset) |
126 | { | 126 | { |
127 | unsigned int caddr; | 127 | unsigned int caddr; |
@@ -142,7 +142,7 @@ static unsigned long __pmac macrisc_cfg_access(struct pci_controller* hose, | |||
142 | return ((unsigned long)hose->cfg_data) + offset; | 142 | return ((unsigned long)hose->cfg_data) + offset; |
143 | } | 143 | } |
144 | 144 | ||
145 | static int __pmac macrisc_read_config(struct pci_bus *bus, unsigned int devfn, | 145 | static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn, |
146 | int offset, int len, u32 *val) | 146 | int offset, int len, u32 *val) |
147 | { | 147 | { |
148 | struct pci_controller *hose; | 148 | struct pci_controller *hose; |
@@ -173,7 +173,7 @@ static int __pmac macrisc_read_config(struct pci_bus *bus, unsigned int devfn, | |||
173 | return PCIBIOS_SUCCESSFUL; | 173 | return PCIBIOS_SUCCESSFUL; |
174 | } | 174 | } |
175 | 175 | ||
176 | static int __pmac macrisc_write_config(struct pci_bus *bus, unsigned int devfn, | 176 | static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn, |
177 | int offset, int len, u32 val) | 177 | int offset, int len, u32 val) |
178 | { | 178 | { |
179 | struct pci_controller *hose; | 179 | struct pci_controller *hose; |
@@ -265,7 +265,7 @@ static int u3_ht_skip_device(struct pci_controller *hose, | |||
265 | + (((unsigned long)bus) << 16) \ | 265 | + (((unsigned long)bus) << 16) \ |
266 | + 0x01000000UL) | 266 | + 0x01000000UL) |
267 | 267 | ||
268 | static unsigned long __pmac u3_ht_cfg_access(struct pci_controller* hose, | 268 | static unsigned long u3_ht_cfg_access(struct pci_controller* hose, |
269 | u8 bus, u8 devfn, u8 offset) | 269 | u8 bus, u8 devfn, u8 offset) |
270 | { | 270 | { |
271 | if (bus == hose->first_busno) { | 271 | if (bus == hose->first_busno) { |
@@ -277,7 +277,7 @@ static unsigned long __pmac u3_ht_cfg_access(struct pci_controller* hose, | |||
277 | return ((unsigned long)hose->cfg_data) + U3_HT_CFA1(bus, devfn, offset); | 277 | return ((unsigned long)hose->cfg_data) + U3_HT_CFA1(bus, devfn, offset); |
278 | } | 278 | } |
279 | 279 | ||
280 | static int __pmac u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, | 280 | static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, |
281 | int offset, int len, u32 *val) | 281 | int offset, int len, u32 *val) |
282 | { | 282 | { |
283 | struct pci_controller *hose; | 283 | struct pci_controller *hose; |
@@ -327,7 +327,7 @@ static int __pmac u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, | |||
327 | return PCIBIOS_SUCCESSFUL; | 327 | return PCIBIOS_SUCCESSFUL; |
328 | } | 328 | } |
329 | 329 | ||
330 | static int __pmac u3_ht_write_config(struct pci_bus *bus, unsigned int devfn, | 330 | static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn, |
331 | int offset, int len, u32 val) | 331 | int offset, int len, u32 val) |
332 | { | 332 | { |
333 | struct pci_controller *hose; | 333 | struct pci_controller *hose; |