git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
microblaze
/
pci
/
pci-common.c
diff --git
a/arch/microblaze/pci/pci-common.c
b/arch/microblaze/pci/pci-common.c
index
740bb32
..
9cb782b
100644
(file)
--- a/
arch/microblaze/pci/pci-common.c
+++ b/
arch/microblaze/pci/pci-common.c
@@
-1025,7
+1025,7
@@
static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)
struct pci_dev *dev = bus->self;
struct pci_dev *dev = bus->self;
-
for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++
i) {
+
pci_bus_for_each_resource(bus, res,
i) {
res = bus->resource[i];
if (!res)
continue;
res = bus->resource[i];
if (!res)
continue;
@@
-1131,21
+1131,20
@@
static int skip_isa_ioresource_align(struct pci_dev *dev)
* but we want to try to avoid allocating at 0x2900-0x2bff
* which might have be mirrored at 0x0100-0x03ff..
*/
* but we want to try to avoid allocating at 0x2900-0x2bff
* which might have be mirrored at 0x0100-0x03ff..
*/
-
void pcibios_align_resource(void *data,
struct resource *res,
+
resource_size_t pcibios_align_resource(void *data, const
struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;
+ resource_size_t start = res->start;
if (res->flags & IORESOURCE_IO) {
if (res->flags & IORESOURCE_IO) {
- resource_size_t start = res->start;
-
if (skip_isa_ioresource_align(dev))
if (skip_isa_ioresource_align(dev))
- return;
- if (start & 0x300)
{
+ return
start
;
+ if (start & 0x300)
start = (start + 0x3ff) & ~0x3ff;
start = (start + 0x3ff) & ~0x3ff;
- res->start = start;
- }
}
}
+
+ return start;
}
EXPORT_SYMBOL(pcibios_align_resource);
}
EXPORT_SYMBOL(pcibios_align_resource);
@@
-1228,7
+1227,7
@@
void pcibios_allocate_bus_resources(struct pci_bus *bus)
pr_debug("PCI: Allocating bus resources for %04x:%02x...\n",
pci_domain_nr(bus), bus->number);
pr_debug("PCI: Allocating bus resources for %04x:%02x...\n",
pci_domain_nr(bus), bus->number);
-
for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++
i) {
+
pci_bus_for_each_resource(bus, res,
i) {
res = bus->resource[i];
if (!res || !res->flags
|| res->start > res->end || res->parent)
res = bus->resource[i];
if (!res || !res->flags
|| res->start > res->end || res->parent)
@@
-1508,7
+1507,7
@@
void pcibios_finish_adding_to_bus(struct pci_bus *bus)
pci_bus_add_devices(bus);
/* Fixup EEH */
pci_bus_add_devices(bus);
/* Fixup EEH */
- eeh_add_device_tree_late(bus);
+ /* eeh_add_device_tree_late(bus); */
}
EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
}
EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);