linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / pci / setup-res.c

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 38eade9..ea9277b 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -40,9 +40,8 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
 
        pcibios_resource_to_bus(dev, &region, res);
 
-       pr_debug("  got res [%llx:%llx] bus [%lx:%lx] flags %lx for "
-                "BAR %d of %s\n", (unsigned long long)res->start,
-                (unsigned long long)res->end,
+       pr_debug("  got res [%lx:%lx] bus [%lx:%lx] flags %lx for "
+                "BAR %d of %s\n", res->start, res->end,
                 region.start, region.end, res->flags, resno, pci_name(dev));
 
        new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
@@ -105,12 +104,10 @@ pci_claim_resource(struct pci_dev *dev, int resource)
                err = insert_resource(root, res);
 
        if (err) {
-               printk(KERN_ERR "PCI: %s region %d of %s %s [%llx:%llx]\n",
-                       root ? "Address space collision on" :
-                               "No parent found for",
-                       resource, dtype, pci_name(dev),
-                       (unsigned long long)res->start,
-                       (unsigned long long)res->end);
+               printk(KERN_ERR "PCI: %s region %d of %s %s [%lx:%lx]\n",
+                      root ? "Address space collision on" :
+                             "No parent found for",
+                      resource, dtype, pci_name(dev), res->start, res->end);
        }
 
        return err;
@@ -121,7 +118,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
 {
        struct pci_bus *bus = dev->bus;
        struct resource *res = dev->resource + resno;
-       resource_size_t size, min, align;
+       unsigned long size, min, align;
        int ret;
 
        size = res->end - res->start + 1;
@@ -148,11 +145,9 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
        }
 
        if (ret) {
-               printk(KERN_DEBUG "PCI: Failed to allocate %s resource "
-                       "#%d:%llx@%llx for %s\n",
-                       res->flags & IORESOURCE_IO ? "I/O" : "mem",
-                       resno, (unsigned long long)size,
-                       (unsigned long long)res->start, pci_name(dev));
+               printk(KERN_ERR "PCI: Failed to allocate %s resource #%d:%lx@%lx for %s\n",
+                      res->flags & IORESOURCE_IO ? "I/O" : "mem",
+                      resno, size, res->start, pci_name(dev));
        } else if (resno < PCI_BRIDGE_RESOURCES) {
                pci_update_resource(dev, res, resno);
        }
@@ -160,46 +155,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
        return ret;
 }
 
-#ifdef CONFIG_EMBEDDED
-int pci_assign_resource_fixed(struct pci_dev *dev, int resno)
-{
-       struct pci_bus *bus = dev->bus;
-       struct resource *res = dev->resource + resno;
-       unsigned int type_mask;
-       int i, ret = -EBUSY;
-
-       type_mask = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH;
-
-       for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
-               struct resource *r = bus->resource[i];
-               if (!r)
-                       continue;
-
-               /* type_mask must match */
-               if ((res->flags ^ r->flags) & type_mask)
-                       continue;
-
-               ret = request_resource(r, res);
-
-               if (ret == 0)
-                       break;
-       }
-
-       if (ret) {
-               printk(KERN_DEBUG "PCI: Failed to allocate %s resource "
-                               "#%d:%llx@%llx for %s\n",
-                       res->flags & IORESOURCE_IO ? "I/O" : "mem",
-                       resno, (unsigned long long)(res->end - res->start + 1),
-                       (unsigned long long)res->start, pci_name(dev));
-       } else if (resno < PCI_BRIDGE_RESOURCES) {
-               pci_update_resource(dev, res, resno);
-       }
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(pci_assign_resource_fixed);
-#endif
-
 /* Sort resources by alignment */
 void __devinit
 pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
@@ -209,7 +164,7 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
                struct resource *r;
                struct resource_list *list, *tmp;
-               resource_size_t r_align;
+               unsigned long r_align;
 
                r = &dev->resource[i];
                r_align = r->end - r->start;
@@ -218,14 +173,13 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
                        continue;
                if (!r_align) {
                        printk(KERN_WARNING "PCI: Ignore bogus resource %d "
-                               "[%llx:%llx] of %s\n",
-                               i, (unsigned long long)r->start,
-                               (unsigned long long)r->end, pci_name(dev));
+                                           "[%lx:%lx] of %s\n",
+                                           i, r->start, r->end, pci_name(dev));
                        continue;
                }
                r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start;
                for (list = head; ; list = list->next) {
-                       resource_size_t align = 0;
+                       unsigned long align = 0;
                        struct resource_list *ln = list->next;
                        int idx;