aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/kernel/setup.c10
-rw-r--r--arch/avr32/mach-at32ap/extint.c2
-rw-r--r--arch/avr32/mach-at32ap/hsmc.c2
-rw-r--r--arch/avr32/mach-at32ap/intc.c2
-rw-r--r--arch/avr32/mach-at32ap/pio.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index bb0974cce4ac..b4247f478065 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -444,7 +444,7 @@ static unsigned long __init
444find_bootmap_pfn(const struct resource *mem) 444find_bootmap_pfn(const struct resource *mem)
445{ 445{
446 unsigned long bootmap_pages, bootmap_len; 446 unsigned long bootmap_pages, bootmap_len;
447 unsigned long node_pages = PFN_UP(mem->end - mem->start + 1); 447 unsigned long node_pages = PFN_UP(resource_size(mem));
448 unsigned long bootmap_start; 448 unsigned long bootmap_start;
449 449
450 bootmap_pages = bootmem_bootmap_pages(node_pages); 450 bootmap_pages = bootmem_bootmap_pages(node_pages);
@@ -541,10 +541,10 @@ static void __init setup_bootmem(void)
541 */ 541 */
542 if (res->start >= PFN_PHYS(first_pfn) 542 if (res->start >= PFN_PHYS(first_pfn)
543 && res->end < PFN_PHYS(max_pfn)) 543 && res->end < PFN_PHYS(max_pfn))
544 reserve_bootmem_node( 544 reserve_bootmem_node(NODE_DATA(node),
545 NODE_DATA(node), res->start, 545 res->start,
546 res->end - res->start + 1, 546 resource_size(res),
547 BOOTMEM_DEFAULT); 547 BOOTMEM_DEFAULT);
548 } 548 }
549 549
550 node_set_online(node); 550 node_set_online(node);
diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index fbc2aeaebddb..cfb298d66305 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -204,7 +204,7 @@ static int __init eic_probe(struct platform_device *pdev)
204 } 204 }
205 205
206 eic->first_irq = EIM_IRQ_BASE + 32 * pdev->id; 206 eic->first_irq = EIM_IRQ_BASE + 32 * pdev->id;
207 eic->regs = ioremap(regs->start, regs->end - regs->start + 1); 207 eic->regs = ioremap(regs->start, resource_size(regs));
208 if (!eic->regs) { 208 if (!eic->regs) {
209 dev_dbg(&pdev->dev, "failed to map regs\n"); 209 dev_dbg(&pdev->dev, "failed to map regs\n");
210 goto err_ioremap; 210 goto err_ioremap;
diff --git a/arch/avr32/mach-at32ap/hsmc.c b/arch/avr32/mach-at32ap/hsmc.c
index f7672d3e86b8..f66245e6e63e 100644
--- a/arch/avr32/mach-at32ap/hsmc.c
+++ b/arch/avr32/mach-at32ap/hsmc.c
@@ -245,7 +245,7 @@ static int hsmc_probe(struct platform_device *pdev)
245 245
246 hsmc->pclk = pclk; 246 hsmc->pclk = pclk;
247 hsmc->mck = mck; 247 hsmc->mck = mck;
248 hsmc->regs = ioremap(regs->start, regs->end - regs->start + 1); 248 hsmc->regs = ioremap(regs->start, resource_size(regs));
249 if (!hsmc->regs) 249 if (!hsmc->regs)
250 goto out_disable_clocks; 250 goto out_disable_clocks;
251 251
diff --git a/arch/avr32/mach-at32ap/intc.c b/arch/avr32/mach-at32ap/intc.c
index 3e3646186c9f..6c700431e34a 100644
--- a/arch/avr32/mach-at32ap/intc.c
+++ b/arch/avr32/mach-at32ap/intc.c
@@ -107,7 +107,7 @@ void __init init_IRQ(void)
107 107
108 clk_enable(pclk); 108 clk_enable(pclk);
109 109
110 intc0.regs = ioremap(regs->start, regs->end - regs->start + 1); 110 intc0.regs = ioremap(regs->start, resource_size(regs));
111 if (!intc0.regs) { 111 if (!intc0.regs) {
112 printk(KERN_EMERG "intc: failed to map registers (0x%08lx)\n", 112 printk(KERN_EMERG "intc: failed to map registers (0x%08lx)\n",
113 (unsigned long)regs->start); 113 (unsigned long)regs->start);
diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 2e0aa853a4bc..9b39dea6682f 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -461,7 +461,7 @@ void __init at32_init_pio(struct platform_device *pdev)
461 clk_enable(pio->clk); 461 clk_enable(pio->clk);
462 462
463 pio->pdev = pdev; 463 pio->pdev = pdev;
464 pio->regs = ioremap(regs->start, regs->end - regs->start + 1); 464 pio->regs = ioremap(regs->start, resource_size(regs));
465 465
466 /* start with irqs disabled and acked */ 466 /* start with irqs disabled and acked */
467 pio_writel(pio, IDR, ~0UL); 467 pio_writel(pio, IDR, ~0UL);