Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[pandora-kernel.git] / arch / powerpc / platforms / cell / celleb_scc_epci.c

diff --git a/arch/powerpc/platforms/cell/celleb_scc_epci.c b/arch/powerpc/platforms/cell/celleb_scc_epci.c
index 05b0db3..844c0fa 100644 (file)
--- a/arch/powerpc/platforms/cell/celleb_scc_epci.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_epci.c
@@ -393,19 +393,19 @@ static int __init celleb_setup_epci(struct device_node *node,
 
        if (of_address_to_resource(node, 0, &r))
                goto error;
-       hose->cfg_addr = ioremap(r.start, (r.end - r.start + 1));
+       hose->cfg_addr = ioremap(r.start, resource_size(&r));
        if (!hose->cfg_addr)
                goto error;
        pr_debug("EPCI: cfg_addr map 0x%016llx->0x%016lx + 0x%016llx\n",
-                r.start, (unsigned long)hose->cfg_addr, (r.end - r.start + 1));
+                r.start, (unsigned long)hose->cfg_addr, resource_size(&r));
 
        if (of_address_to_resource(node, 2, &r))
                goto error;
-       hose->cfg_data = ioremap(r.start, (r.end - r.start + 1));
+       hose->cfg_data = ioremap(r.start, resource_size(&r));
        if (!hose->cfg_data)
                goto error;
        pr_debug("EPCI: cfg_data map 0x%016llx->0x%016lx + 0x%016llx\n",
-                r.start, (unsigned long)hose->cfg_data, (r.end - r.start + 1));
+                r.start, (unsigned long)hose->cfg_data, resource_size(&r));
 
        hose->ops = &celleb_epci_ops;
        celleb_epci_init(hose);