Factor out a few commonly duplicated functions from northbridge.c.

[coreboot.git] / src / northbridge / via / cn700 / northbridge.c

diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c
index 2be45f7b8346ec91465075506dfd2d73d4180b76..d0ad09515138c0d7ed539c5d0d8c3185feb91c57 100644 (file)
--- a/src/northbridge/via/cn700/northbridge.c
+++ b/src/northbridge/via/cn700/northbridge.c
@@ -97,51 +97,6 @@ static const struct pci_driver memctrl_driver __pci_driver = {
        .device = PCI_DEVICE_ID_VIA_CN700_MEMCTRL,
 };
 
-static void ram_resource(device_t dev, unsigned long index,
-                        unsigned long basek, unsigned long sizek)
-{
-       struct resource *resource;
-
-       if (!sizek)
-               return;
-
-       resource = new_resource(dev, index);
-       resource->base = ((resource_t) basek) << 10;
-       resource->size = ((resource_t) sizek) << 10;
-       resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE |
-           IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
-}
-
-static void tolm_test(void *gp, struct device *dev, struct resource *new)
-{
-       struct resource **best_p = gp;
-       struct resource *best;
-
-       best = *best_p;
-       if (!best || (best->base > new->base))
-               best = new;
-       *best_p = best;
-}
-
-static u32 find_pci_tolm(struct bus *bus)
-{
-       struct resource *min;
-       u32 tolm;
-
-       print_debug("Entering find_pci_tolm\n");
-
-       min = 0;
-       search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM,
-                            tolm_test, &min);
-       tolm = 0xffffffffUL;
-       if (min && tolm > min->base)
-               tolm = min->base;
-
-       print_debug("Leaving find_pci_tolm\n");
-
-       return tolm;
-}
-
 #if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
 #define HIGH_TABLES_SIZE 64
@@ -157,7 +112,7 @@ static void pci_domain_set_resources(device_t dev)
 
        printk(BIOS_SPEW, "Entering cn700 pci_domain_set_resources.\n");
 
-       pci_tolm = find_pci_tolm(&dev->link[0]);
+       pci_tolm = find_pci_tolm(dev->link_list);
        mc_dev = dev_find_device(PCI_VENDOR_ID_VIA,
                                 PCI_DEVICE_ID_VIA_CN700_MEMCTRL, 0);
 
@@ -177,7 +132,7 @@ static void pci_domain_set_resources(device_t dev)
                }
 
                tomk = rambits * 64 * 1024;
-               printk(BIOS_SPEW, "tomk is 0x%x\n", tomk);
+               printk(BIOS_DEBUG, "tomk is 0x%lx\n", tomk);
                /* Compute the Top Of Low Memory (TOLM), in Kb. */
                tolmk = pci_tolm >> 10;
                if (tolmk >= tomk) {
@@ -199,27 +154,27 @@ static void pci_domain_set_resources(device_t dev)
                ram_resource(dev, idx++, 768,
                             (tolmk - 768 - CONFIG_VIDEO_MB * 1024));
        }
-       assign_resources(&dev->link[0]);
+       assign_resources(dev->link_list);
 }
 
-static const struct device_operations pci_domain_ops = {
+static struct device_operations pci_domain_ops = {
        .read_resources   = pci_domain_read_resources,
        .set_resources    = pci_domain_set_resources,
-       .enable_resources = enable_childrens_resources,
-       .init             = 0,
+       .enable_resources = NULL,
+       .init             = NULL,
        .scan_bus         = pci_domain_scan_bus,
 };
 
 static void cpu_bus_init(device_t dev)
 {
-       initialize_cpus(&dev->link[0]);
+       initialize_cpus(dev->link_list);
 }
 
 static void cpu_bus_noop(device_t dev)
 {
 }
 
-static const struct device_operations cpu_bus_ops = {
+static struct device_operations cpu_bus_ops = {
        .read_resources   = cpu_bus_noop,
        .set_resources    = cpu_bus_noop,
        .enable_resources = cpu_bus_noop,