diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-06-17 18:33:32 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-27 16:14:01 -0400 |
commit | 0aea531326d1a17ccef7d9a538429c5b32cf4f12 (patch) | |
tree | 7a7ee366f7d2b7df6b852d009f08725e982aed1d /arch/sh | |
parent | 8b285ce84bbc719e363a796f466404576b840d36 (diff) |
PCI: remove unused arch pcibios_update_resource() functions
Russell King did the following back in 2003:
<-- snip -->
[PCI] pci-9: Kill per-architecture pcibios_update_resource()
Kill pcibios_update_resource(), replacing it with pci_update_resource().
pci_update_resource() uses pcibios_resource_to_bus() to convert a
resource to a device BAR - the transformation should be exactly the
same as the transformation used for the PCI bridges.
pci_update_resource "knows" about 64-bit BARs, but doesn't attempt to
set the high 32-bits to anything non-zero - currently no architecture
attempts to do something different. If anyone cares, please fix; I'm
going to reflect current behaviour for the time being.
Ivan pointed out the following architectures need to examine their
pcibios_update_resource() implementation - they should make sure that
this new implementation does the right thing. #warning's have been
added where appropriate.
ia64
mips
mips64
This cset also includes a fix for the problem reported by AKPM where
64-bit arch compilers complain about the resource mask being placed
in a u32.
<-- snip -->
This patch removes the unused pcibios_update_resource() functions the
kernel gained since, from FRV, m68k, mips & sh architectures.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/drivers/pci/pci.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 08d2e7325252..f57095a2617c 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
@@ -76,38 +76,6 @@ void __devinit __weak pcibios_fixup_bus(struct pci_bus *bus) | |||
76 | pci_read_bridge_bases(bus); | 76 | pci_read_bridge_bases(bus); |
77 | } | 77 | } |
78 | 78 | ||
79 | void | ||
80 | pcibios_update_resource(struct pci_dev *dev, struct resource *root, | ||
81 | struct resource *res, int resource) | ||
82 | { | ||
83 | u32 new, check; | ||
84 | int reg; | ||
85 | |||
86 | new = res->start | (res->flags & PCI_REGION_FLAG_MASK); | ||
87 | if (resource < 6) { | ||
88 | reg = PCI_BASE_ADDRESS_0 + 4*resource; | ||
89 | } else if (resource == PCI_ROM_RESOURCE) { | ||
90 | res->flags |= IORESOURCE_ROM_ENABLE; | ||
91 | new |= PCI_ROM_ADDRESS_ENABLE; | ||
92 | reg = dev->rom_base_reg; | ||
93 | } else { | ||
94 | /* | ||
95 | * Somebody might have asked allocation of a non-standard | ||
96 | * resource | ||
97 | */ | ||
98 | return; | ||
99 | } | ||
100 | |||
101 | pci_write_config_dword(dev, reg, new); | ||
102 | pci_read_config_dword(dev, reg, &check); | ||
103 | if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? | ||
104 | PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) { | ||
105 | printk(KERN_ERR "PCI: Error while updating region " | ||
106 | "%s/%d (%08x != %08x)\n", pci_name(dev), resource, | ||
107 | new, check); | ||
108 | } | ||
109 | } | ||
110 | |||
111 | void pcibios_align_resource(void *data, struct resource *res, | 79 | void pcibios_align_resource(void *data, struct resource *res, |
112 | resource_size_t size, resource_size_t align) | 80 | resource_size_t size, resource_size_t align) |
113 | __attribute__ ((weak)); | 81 | __attribute__ ((weak)); |