3 files changed, 5 insertions, 28 deletions

diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
index 6b4fb28e9f99..c28121765448 100644
--- a/arch/frv/mb93090-mb00/pci-frv.c
+++ b/arch/frv/mb93090-mb00/pci-frv.c
@@ -194,23 +194,3 @@ void __init pcibios_resource_survey(void)
         pcibios_allocate_resources(1);
         pcibios_assign_resources();
 }
-
-/*
- *  If we set up a device for bus mastering, we need to check the latency
- *  timer as certain crappy BIOSes forget to set it properly.
- */
-unsigned int pcibios_max_latency = 255;
-
-void pcibios_set_master(struct pci_dev *dev)
-{
-        u8 lat;
-        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
-        if (lat < 16)
-                lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency;
-        else if (lat > pcibios_max_latency)
-                lat = pcibios_max_latency;
-        else
-                return;
-        printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);
-        pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
-}
diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h
index f3fe55914793..089eeba4f3bc 100644
--- a/arch/frv/mb93090-mb00/pci-frv.h
+++ b/arch/frv/mb93090-mb00/pci-frv.h
@@ -26,8 +26,6 @@ extern unsigned int __nongpreldata pci_probe;
 
 /* pci-frv.c */
 
-extern unsigned int pcibios_max_latency;
-
 void pcibios_resource_survey(void);
 
 /* pci-vdk.c */
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index f8dd37e49535..6b0b82ff4419 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -327,11 +327,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
         printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
 #endif
 
-        if (bus->number == 0) {
-                bus->resource[0] = &pci_ioport_resource;
-                bus->resource[1] = &pci_iomem_resource;
-        }
-
         pci_read_bridge_bases(bus);
 
         if (bus->number == 0) {
@@ -357,6 +352,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
 int __init pcibios_init(void)
 {
         struct pci_ops *dir = NULL;
+        LIST_HEAD(resources);
 
         if (!mb93090_mb00_detected)
                 return -ENXIO;
@@ -420,7 +416,10 @@ int __init pcibios_init(void)
         }
 
         printk("PCI: Probing PCI hardware\n");
-        pci_root_bus = pci_scan_bus(0, pci_root_ops, NULL);
+        pci_add_resource(&resources, &pci_ioport_resource);
+        pci_add_resource(&resources, &pci_iomem_resource);
+        pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL,
+                                         &resources);
 
         pcibios_irq_init();
         pcibios_fixup_peer_bridges();