Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / arch / powerpc / sysdev / ppc4xx_pci.c

diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index ad330fe69c267667e108e7be69f31f3b958554b5..2ec4f3bb8160b09a202461a6e67711ea15bc7c0d 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -265,7 +265,7 @@ static void __init ppc4xx_configure_pci_PMMs(struct pci_controller *hose,
                if (ppc4xx_setup_one_pci_PMM(hose, reg,
                                             res->start,
                                             res->start - hose->pci_mem_offset,
-                                            res->end + 1 - res->start,
+                                            resource_size(res),
                                             res->flags,
                                             j) == 0) {
                        j++;
@@ -290,7 +290,7 @@ static void __init ppc4xx_configure_pci_PTMs(struct pci_controller *hose,
                                             void __iomem *reg,
                                             const struct resource *res)
 {
-       resource_size_t size = res->end - res->start + 1;
+       resource_size_t size = resource_size(res);
        u32 sa;
 
        /* Calculate window size */
@@ -349,7 +349,7 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np)
        bus_range = of_get_property(np, "bus-range", NULL);
 
        /* Map registers */
-       reg = ioremap(rsrc_reg.start, rsrc_reg.end + 1 - rsrc_reg.start);
+       reg = ioremap(rsrc_reg.start, resource_size(&rsrc_reg));
        if (reg == NULL) {
                printk(KERN_ERR "%s: Can't map registers !", np->full_name);
                goto fail;
@@ -465,7 +465,7 @@ static void __init ppc4xx_configure_pcix_POMs(struct pci_controller *hose,
                if (ppc4xx_setup_one_pcix_POM(hose, reg,
                                              res->start,
                                              res->start - hose->pci_mem_offset,
-                                             res->end + 1 - res->start,
+                                             resource_size(res),
                                              res->flags,
                                              j) == 0) {
                        j++;
@@ -492,7 +492,7 @@ static void __init ppc4xx_configure_pcix_PIMs(struct pci_controller *hose,
                                              int big_pim,
                                              int enable_msi_hole)
 {
-       resource_size_t size = res->end - res->start + 1;
+       resource_size_t size = resource_size(res);
        u32 sa;
 
        /* RAM is always at 0 */
@@ -555,7 +555,7 @@ static void __init ppc4xx_probe_pcix_bridge(struct device_node *np)
        bus_range = of_get_property(np, "bus-range", NULL);
 
        /* Map registers */
-       reg = ioremap(rsrc_reg.start, rsrc_reg.end + 1 - rsrc_reg.start);
+       reg = ioremap(rsrc_reg.start, resource_size(&rsrc_reg));
        if (reg == NULL) {
                printk(KERN_ERR "%s: Can't map registers !", np->full_name);
                goto fail;
@@ -679,9 +679,6 @@ static int __init ppc4xx_pciex_wait_on_sdr(struct ppc4xx_pciex_port *port,
 
 static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port)
 {
-       printk(KERN_INFO "PCIE%d: Checking link...\n",
-              port->index);
-
        /* Wait for reset to complete */
        if (ppc4xx_pciex_wait_on_sdr(port, PESDRn_RCSSTS, 1 << 20, 0, 10)) {
                printk(KERN_WARNING "PCIE%d: PGRST failed\n",
@@ -693,6 +690,8 @@ static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port)
 
 static void __init ppc4xx_pciex_check_link_sdr(struct ppc4xx_pciex_port *port)
 {
+       printk(KERN_INFO "PCIE%d: Checking link...\n", port->index);
+
        /* Check for card presence detect if supported, if not, just wait for
         * link unconditionally.
         *
@@ -1622,7 +1621,7 @@ static void __init ppc4xx_configure_pciex_POMs(struct ppc4xx_pciex_port *port,
                if (ppc4xx_setup_one_pciex_POM(port, hose, mbase,
                                               res->start,
                                               res->start - hose->pci_mem_offset,
-                                              res->end + 1 - res->start,
+                                              resource_size(res),
                                               res->flags,
                                               j) == 0) {
                        j++;
@@ -1657,7 +1656,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,
                                               void __iomem *mbase,
                                               struct resource *res)
 {
-       resource_size_t size = res->end - res->start + 1;
+       resource_size_t size = resource_size(res);
        u64 sa;
 
        if (port->endpoint) {