Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

treewide: Convert uses of struct resource to resource_size(ptr)

Several fixes as well where the +1 was missing.

Done via coccinelle scripts like:

@@
struct resource *ptr;
@@

- ptr->end - ptr->start + 1
+ resource_size(ptr)

and some grep and typing.

Mostly uncompiled, no cross-compilers.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Joe Perches and committed by
Jiri Kosina
28f65c11 140a1ef2

+308 -333
+1 -1
arch/arm/common/scoop.c
··· 193 193 spin_lock_init(&devptr->scoop_lock); 194 194 195 195 inf = pdev->dev.platform_data; 196 - devptr->base = ioremap(mem->start, mem->end - mem->start + 1); 196 + devptr->base = ioremap(mem->start, resource_size(mem)); 197 197 198 198 if (!devptr->base) { 199 199 ret = -ENOMEM;
+1 -1
arch/arm/mach-at91/at91sam9261_devices.c
··· 525 525 if (ARRAY_SIZE(lcdc_resources) > 2) { 526 526 void __iomem *fb; 527 527 struct resource *fb_res = &lcdc_resources[2]; 528 - size_t fb_len = fb_res->end - fb_res->start + 1; 528 + size_t fb_len = resource_size(fb_res); 529 529 530 530 fb = ioremap(fb_res->start, fb_len); 531 531 if (fb) {
+4 -4
arch/arm/mach-mv78xx0/pcie.c
··· 129 129 struct pcie_port *pp = pcie_port + i; 130 130 131 131 mv78xx0_setup_pcie_io_win(win++, pp->res[0].start, 132 - pp->res[0].end - pp->res[0].start + 1, 133 - pp->maj, pp->min); 132 + resource_size(&pp->res[0]), 133 + pp->maj, pp->min); 134 134 135 135 mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start, 136 - pp->res[1].end - pp->res[1].start + 1, 137 - pp->maj, pp->min); 136 + resource_size(&pp->res[1]), 137 + pp->maj, pp->min); 138 138 } 139 139 } 140 140
+1 -1
arch/arm/mach-u300/core.c
··· 1791 1791 0 == res->start) { 1792 1792 res->start = curr_start; 1793 1793 res->end += curr_start; 1794 - curr_start += (res->end - res->start + 1); 1794 + curr_start += resource_size(res); 1795 1795 1796 1796 printk(KERN_INFO "core.c: Mapping RAM " \ 1797 1797 "%#x-%#x to device %s:%s\n",
+4 -4
arch/arm/plat-mxc/pwm.c
··· 214 214 goto err_free_clk; 215 215 } 216 216 217 - r = request_mem_region(r->start, r->end - r->start + 1, pdev->name); 217 + r = request_mem_region(r->start, resource_size(r), pdev->name); 218 218 if (r == NULL) { 219 219 dev_err(&pdev->dev, "failed to request memory resource\n"); 220 220 ret = -EBUSY; 221 221 goto err_free_clk; 222 222 } 223 223 224 - pwm->mmio_base = ioremap(r->start, r->end - r->start + 1); 224 + pwm->mmio_base = ioremap(r->start, resource_size(r)); 225 225 if (pwm->mmio_base == NULL) { 226 226 dev_err(&pdev->dev, "failed to ioremap() registers\n"); 227 227 ret = -ENODEV; ··· 236 236 return 0; 237 237 238 238 err_free_mem: 239 - release_mem_region(r->start, r->end - r->start + 1); 239 + release_mem_region(r->start, resource_size(r)); 240 240 err_free_clk: 241 241 clk_put(pwm->clk); 242 242 err_free: ··· 260 260 iounmap(pwm->mmio_base); 261 261 262 262 r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 263 - release_mem_region(r->start, r->end - r->start + 1); 263 + release_mem_region(r->start, resource_size(r)); 264 264 265 265 clk_put(pwm->clk); 266 266
+3 -3
arch/arm/plat-s5p/sysmmu.c
··· 232 232 goto err_res; 233 233 } 234 234 235 - mem = request_mem_region(res->start, 236 - ((res->end) - (res->start)) + 1, pdev->name); 235 + mem = request_mem_region(res->start, resource_size(res), 236 + pdev->name); 237 237 if (!mem) { 238 238 dev_err(dev, "Failed to request the memory region of %s.\n", 239 239 sysmmu_ips_name[i]); ··· 241 241 goto err_res; 242 242 } 243 243 244 - sysmmusfrs[i] = ioremap(res->start, res->end - res->start + 1); 244 + sysmmusfrs[i] = ioremap(res->start, resource_size(res)); 245 245 if (!sysmmusfrs[i]) { 246 246 dev_err(dev, "Failed to ioremap() for %s.\n", 247 247 sysmmu_ips_name[i]);
+1 -1
arch/arm/plat-samsung/pm-check.c
··· 72 72 73 73 static u32 *s3c_pm_countram(struct resource *res, u32 *val) 74 74 { 75 - u32 size = (u32)(res->end - res->start)+1; 75 + u32 size = (u32)resource_size(res); 76 76 77 77 size += CHECK_CHUNKSIZE-1; 78 78 size /= CHECK_CHUNKSIZE;
+5 -5
arch/avr32/kernel/setup.c
··· 444 444 find_bootmap_pfn(const struct resource *mem) 445 445 { 446 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 448 unsigned long bootmap_start; 449 449 450 450 bootmap_pages = bootmem_bootmap_pages(node_pages); ··· 541 541 */ 542 542 if (res->start >= PFN_PHYS(first_pfn) 543 543 && res->end < PFN_PHYS(max_pfn)) 544 - reserve_bootmem_node( 545 - NODE_DATA(node), res->start, 546 - res->end - res->start + 1, 547 - BOOTMEM_DEFAULT); 544 + reserve_bootmem_node(NODE_DATA(node), 545 + res->start, 546 + resource_size(res), 547 + BOOTMEM_DEFAULT); 548 548 } 549 549 550 550 node_set_online(node);
+1 -1
arch/avr32/mach-at32ap/extint.c
··· 204 204 } 205 205 206 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 208 if (!eic->regs) { 209 209 dev_dbg(&pdev->dev, "failed to map regs\n"); 210 210 goto err_ioremap;
+1 -1
arch/avr32/mach-at32ap/hsmc.c
··· 245 245 246 246 hsmc->pclk = pclk; 247 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 249 if (!hsmc->regs) 250 250 goto out_disable_clocks; 251 251
+1 -1
arch/avr32/mach-at32ap/intc.c
··· 107 107 108 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 111 if (!intc0.regs) { 112 112 printk(KERN_EMERG "intc: failed to map registers (0x%08lx)\n", 113 113 (unsigned long)regs->start);
+1 -1
arch/avr32/mach-at32ap/pio.c
··· 461 461 clk_enable(pio->clk); 462 462 463 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 466 /* start with irqs disabled and acked */ 467 467 pio_writel(pio, IDR, ~0UL);
+1 -1
arch/microblaze/pci/pci-common.c
··· 89 89 90 90 static resource_size_t pcibios_io_size(const struct pci_controller *hose) 91 91 { 92 - return hose->io_resource.end - hose->io_resource.start + 1; 92 + return resource_size(&hose->io_resource); 93 93 } 94 94 95 95 int pcibios_vaddr_is_ioport(void __iomem *address)
+1 -1
arch/mips/pci/pci-rc32434.c
··· 215 215 rc32434_pcibridge_init(); 216 216 217 217 io_map_base = ioremap(rc32434_res_pci_io1.start, 218 - rc32434_res_pci_io1.end - rc32434_res_pci_io1.start + 1); 218 + resource_size(&rcrc32434_res_pci_io1)); 219 219 220 220 if (!io_map_base) 221 221 return -ENOMEM;
+1 -1
arch/mips/pci/pci-vr41xx.c
··· 305 305 struct resource *res = vr41xx_pci_controller.io_resource; 306 306 master = setup->master_io; 307 307 io_map_base = ioremap(master->bus_base_address, 308 - res->end - res->start + 1); 308 + resource_size(res)); 309 309 if (!io_map_base) 310 310 return -EBUSY; 311 311
+4 -6
arch/mips/powertv/asic/asic_devices.c
··· 394 394 395 395 /* Loop through looking for resources that want a particular address */ 396 396 for (i = 0; gp_resources[i].flags != 0; i++) { 397 - int size = gp_resources[i].end - gp_resources[i].start + 1; 397 + int size = resource_size(&gp_resources[i]); 398 398 if ((gp_resources[i].start != 0) && 399 399 ((gp_resources[i].flags & IORESOURCE_MEM) != 0)) { 400 400 reserve_bootmem(dma_to_phys(gp_resources[i].start), 401 401 size, 0); 402 - total += gp_resources[i].end - 403 - gp_resources[i].start + 1; 402 + total += resource_size(&gp_resources[i]); 404 403 pr_info("reserve resource %s at %08x (%u bytes)\n", 405 404 gp_resources[i].name, gp_resources[i].start, 406 - gp_resources[i].end - 407 - gp_resources[i].start + 1); 405 + resource_size(&gp_resources[i])); 408 406 } 409 407 } 410 408 411 409 /* Loop through assigning addresses for those that are left */ 412 410 for (i = 0; gp_resources[i].flags != 0; i++) { 413 - int size = gp_resources[i].end - gp_resources[i].start + 1; 411 + int size = resource_size(&gp_resources[i]); 414 412 if ((gp_resources[i].start == 0) && 415 413 ((gp_resources[i].flags & IORESOURCE_MEM) != 0)) { 416 414 void *mem = alloc_bootmem_pages(size);
+1 -1
arch/powerpc/include/asm/macio.h
··· 76 76 struct resource *res = &dev->resource[resource_no]; 77 77 if (res->start == 0 || res->end == 0 || res->end < res->start) 78 78 return 0; 79 - return res->end - res->start + 1; 79 + return resource_size(res); 80 80 } 81 81 82 82 extern int macio_enable_devres(struct macio_dev *dev);
+2 -2
arch/powerpc/kernel/machine_kexec.c
··· 126 126 /* We might have got these values via the command line or the 127 127 * device tree, either way sanitise them now. */ 128 128 129 - crash_size = crashk_res.end - crashk_res.start + 1; 129 + crash_size = resource_size(&crashk_res); 130 130 131 131 #ifndef CONFIG_RELOCATABLE 132 132 if (crashk_res.start != KDUMP_KERNELBASE) ··· 222 222 223 223 if (crashk_res.start != 0) { 224 224 prom_add_property(node, &crashk_base_prop); 225 - crashk_size = crashk_res.end - crashk_res.start + 1; 225 + crashk_size = resource_size(&crashk_res); 226 226 prom_add_property(node, &crashk_size_prop); 227 227 } 228 228 }
+1 -1
arch/powerpc/kernel/pci-common.c
··· 107 107 #ifdef CONFIG_PPC64 108 108 return hose->pci_io_size; 109 109 #else 110 - return hose->io_resource.end - hose->io_resource.start + 1; 110 + return resource_size(&hose->io_resource); 111 111 #endif 112 112 } 113 113
+4 -4
arch/powerpc/platforms/52xx/mpc52xx_pci.c
··· 264 264 (unsigned long long)res->flags); 265 265 out_be32(&pci_regs->iw0btar, 266 266 MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start, 267 - res->end - res->start + 1)); 267 + resource_size(res))); 268 268 iwcr0 = MPC52xx_PCI_IWCR_ENABLE | MPC52xx_PCI_IWCR_MEM; 269 269 if (res->flags & IORESOURCE_PREFETCH) 270 270 iwcr0 |= MPC52xx_PCI_IWCR_READ_MULTI; ··· 278 278 res->start, res->end, res->flags); 279 279 out_be32(&pci_regs->iw1btar, 280 280 MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start, 281 - res->end - res->start + 1)); 281 + resource_size(res))); 282 282 iwcr1 = MPC52xx_PCI_IWCR_ENABLE | MPC52xx_PCI_IWCR_MEM; 283 283 if (res->flags & IORESOURCE_PREFETCH) 284 284 iwcr1 |= MPC52xx_PCI_IWCR_READ_MULTI; ··· 300 300 out_be32(&pci_regs->iw2btar, 301 301 MPC52xx_PCI_IWBTAR_TRANSLATION(hose->io_base_phys, 302 302 res->start, 303 - res->end - res->start + 1)); 303 + resource_size(res))); 304 304 iwcr2 = MPC52xx_PCI_IWCR_ENABLE | MPC52xx_PCI_IWCR_IO; 305 305 306 306 /* Set all the IWCR fields at once; they're in the same reg */ ··· 402 402 403 403 hose->ops = &mpc52xx_pci_ops; 404 404 405 - pci_regs = ioremap(rsrc.start, rsrc.end - rsrc.start + 1); 405 + pci_regs = ioremap(rsrc.start, resource_size(&rsrc)); 406 406 if (!pci_regs) 407 407 return -ENOMEM; 408 408
+1 -1
arch/powerpc/platforms/83xx/km83xx.c
··· 101 101 __func__); 102 102 return; 103 103 } 104 - base = ioremap(res.start, res.end - res.start + 1); 104 + base = ioremap(res.start, resource_size(&res)); 105 105 106 106 /* 107 107 * IMMR + 0x14A8[4:5] = 11 (clk delay for UCC 2)
+1 -1
arch/powerpc/platforms/83xx/mpc832x_mds.c
··· 68 68 struct resource res; 69 69 70 70 of_address_to_resource(np, 0, &res); 71 - bcsr_regs = ioremap(res.start, res.end - res.start +1); 71 + bcsr_regs = ioremap(res.start, resource_size(&res)); 72 72 of_node_put(np); 73 73 } 74 74
+1 -1
arch/powerpc/platforms/83xx/mpc834x_mds.c
··· 53 53 struct resource res; 54 54 55 55 of_address_to_resource(np, 0, &res); 56 - bcsr_regs = ioremap(res.start, res.end - res.start + 1); 56 + bcsr_regs = ioremap(res.start, resource_size(&res)); 57 57 of_node_put(np); 58 58 } 59 59 if (!bcsr_regs)
+1 -1
arch/powerpc/platforms/83xx/mpc836x_mds.c
··· 76 76 struct resource res; 77 77 78 78 of_address_to_resource(np, 0, &res); 79 - bcsr_regs = ioremap(res.start, res.end - res.start +1); 79 + bcsr_regs = ioremap(res.start, resource_size(&res)); 80 80 of_node_put(np); 81 81 } 82 82
+1 -1
arch/powerpc/platforms/83xx/usb.c
··· 171 171 of_node_put(np); 172 172 return ret; 173 173 } 174 - usb_regs = ioremap(res.start, res.end - res.start + 1); 174 + usb_regs = ioremap(res.start, resource_size(&res)); 175 175 176 176 /* Using on-chip PHY */ 177 177 if (prop && (!strcmp(prop, "utmi_wide") ||
+1 -1
arch/powerpc/platforms/85xx/sbc8560.c
··· 285 285 286 286 printk(KERN_INFO "sbc8560: Found BRSTCR at i/o 0x%x\n", res.start); 287 287 288 - brstcr = ioremap(res.start, res.end - res.start); 288 + brstcr = ioremap(res.start, resource_size(&res)); 289 289 if(!brstcr) 290 290 printk(KERN_WARNING "sbc8560: ioremap of brstcr failed.\n"); 291 291
+1 -1
arch/powerpc/platforms/85xx/xes_mpc85xx.c
··· 123 123 continue; 124 124 } 125 125 126 - l2_base = ioremap(r[0].start, r[0].end - r[0].start + 1); 126 + l2_base = ioremap(r[0].start, resource_size(&r[0])); 127 127 128 128 xes_mpc85xx_configure_l2(l2_base); 129 129 }
+4 -4
arch/powerpc/platforms/cell/celleb_scc_epci.c
··· 393 393 394 394 if (of_address_to_resource(node, 0, &r)) 395 395 goto error; 396 - hose->cfg_addr = ioremap(r.start, (r.end - r.start + 1)); 396 + hose->cfg_addr = ioremap(r.start, resource_size(&r)); 397 397 if (!hose->cfg_addr) 398 398 goto error; 399 399 pr_debug("EPCI: cfg_addr map 0x%016llx->0x%016lx + 0x%016llx\n", 400 - r.start, (unsigned long)hose->cfg_addr, (r.end - r.start + 1)); 400 + r.start, (unsigned long)hose->cfg_addr, resource_size(&r)); 401 401 402 402 if (of_address_to_resource(node, 2, &r)) 403 403 goto error; 404 - hose->cfg_data = ioremap(r.start, (r.end - r.start + 1)); 404 + hose->cfg_data = ioremap(r.start, resource_size(&r)); 405 405 if (!hose->cfg_data) 406 406 goto error; 407 407 pr_debug("EPCI: cfg_data map 0x%016llx->0x%016lx + 0x%016llx\n", 408 - r.start, (unsigned long)hose->cfg_data, (r.end - r.start + 1)); 408 + r.start, (unsigned long)hose->cfg_data, resource_size(&r)); 409 409 410 410 hose->ops = &celleb_epci_ops; 411 411 celleb_epci_init(hose);
+1 -1
arch/powerpc/platforms/cell/celleb_scc_pciex.c
··· 494 494 pr_err("PCIEXC:Failed to get config resource.\n"); 495 495 return 1; 496 496 } 497 - phb->cfg_addr = ioremap(r.start, r.end - r.start + 1); 497 + phb->cfg_addr = ioremap(r.start, resource_size(&r)); 498 498 if (!phb->cfg_addr) { 499 499 pr_err("PCIEXC:Failed to remap SMMIO region.\n"); 500 500 return 1;
+1 -1
arch/powerpc/platforms/cell/spu_manage.c
··· 222 222 return ret; 223 223 if (phys) 224 224 *phys = resource.start; 225 - len = resource.end - resource.start + 1; 225 + len = resource_size(&resource); 226 226 *virt = ioremap(resource.start, len); 227 227 if (!*virt) 228 228 return -EINVAL;
+1 -1
arch/powerpc/platforms/chrp/pci.c
··· 142 142 return 0; 143 143 } 144 144 of_node_put(np); 145 - Hydra = ioremap(r.start, r.end-r.start); 145 + Hydra = ioremap(r.start, resource_size(&r)); 146 146 printk("Hydra Mac I/O at %llx\n", (unsigned long long)r.start); 147 147 printk("Hydra Feature_Control was %x", 148 148 in_le32(&Hydra->Feature_Control));
+1 -1
arch/powerpc/platforms/pasemi/dma_lib.c
··· 576 576 res.start = 0xfd800000; 577 577 res.end = res.start + 0x1000; 578 578 } 579 - dma_status = __ioremap(res.start, res.end-res.start, 0); 579 + dma_status = __ioremap(res.start, resource_size(&res), 0); 580 580 pci_dev_put(iob_pdev); 581 581 582 582 for (i = 0; i < MAX_TXCH; i++)
+2 -2
arch/powerpc/platforms/powermac/nvram.c
··· 580 580 /* Try to obtain an address */ 581 581 if (of_address_to_resource(dp, 0, &r1) == 0) { 582 582 nvram_naddrs = 1; 583 - s1 = (r1.end - r1.start) + 1; 583 + s1 = resource_size(&r1); 584 584 if (of_address_to_resource(dp, 1, &r2) == 0) { 585 585 nvram_naddrs = 2; 586 - s2 = (r2.end - r2.start) + 1; 586 + s2 = resource_size(&r2); 587 587 } 588 588 } 589 589
+2 -4
arch/powerpc/platforms/powermac/pci.c
··· 838 838 * into cfg_addr 839 839 */ 840 840 hose->cfg_data = ioremap(cfg_res.start, 0x02000000); 841 - hose->cfg_addr = ioremap(self_res.start, 842 - self_res.end - self_res.start + 1); 841 + hose->cfg_addr = ioremap(self_res.start, resource_size(&self_res)); 843 842 844 843 /* 845 844 * /ht node doesn't expose a "ranges" property, we read the register ··· 1322 1323 */ 1323 1324 if (r->start >= 0xf0000000 && r->start < 0xf3000000) 1324 1325 continue; 1325 - if (!region || (r->end - r->start) > 1326 - (region->end - region->start)) 1326 + if (!region || resource_size(r) > resource_size(region)) 1327 1327 region = r; 1328 1328 } 1329 1329 /* Nothing found, bail */
+1 -1
arch/powerpc/platforms/powermac/time.c
··· 274 274 return 0; 275 275 } 276 276 of_node_put(vias); 277 - via = ioremap(rsrc.start, rsrc.end - rsrc.start + 1); 277 + via = ioremap(rsrc.start, resource_size(&rsrc)); 278 278 if (via == NULL) { 279 279 printk(KERN_ERR "Failed to map VIA for timer calibration !\n"); 280 280 return 0;
+1 -1
arch/powerpc/sysdev/axonram.c
··· 203 203 goto failed; 204 204 } 205 205 206 - bank->size = resource.end - resource.start + 1; 206 + bank->size = resource_size(&resource); 207 207 208 208 if (bank->size == 0) { 209 209 dev_err(&device->dev, "No DDR2 memory found for %s%d\n",
+1 -1
arch/powerpc/sysdev/cpm1.c
··· 148 148 if (ret) 149 149 goto end; 150 150 151 - cpic_reg = ioremap(res.start, res.end - res.start + 1); 151 + cpic_reg = ioremap(res.start, resource_size(&res)); 152 152 if (cpic_reg == NULL) 153 153 goto end; 154 154
+1 -1
arch/powerpc/sysdev/cpm_common.c
··· 115 115 max = r.end; 116 116 117 117 rh_attach_region(&cpm_muram_info, r.start - muram_pbase, 118 - r.end - r.start + 1); 118 + resource_size(&r)); 119 119 } 120 120 121 121 muram_vbase = ioremap(muram_pbase, max - muram_pbase + 1);
+1 -1
arch/powerpc/sysdev/dart_iommu.c
··· 239 239 DARTMAP_RPNMASK); 240 240 241 241 /* Map in DART registers */ 242 - dart = ioremap(r.start, r.end - r.start + 1); 242 + dart = ioremap(r.start, resource_size(&r)); 243 243 if (dart == NULL) 244 244 panic("DART: Cannot map registers!"); 245 245
+1 -1
arch/powerpc/sysdev/fsl_msi.c
··· 349 349 goto error_out; 350 350 } 351 351 352 - msi->msi_regs = ioremap(res.start, res.end - res.start + 1); 352 + msi->msi_regs = ioremap(res.start, resource_size(&res)); 353 353 if (!msi->msi_regs) { 354 354 dev_err(&dev->dev, "ioremap problem failed\n"); 355 355 goto error_out;
+6 -6
arch/powerpc/sysdev/fsl_pci.c
··· 64 64 { 65 65 resource_size_t pci_addr = res->start - offset; 66 66 resource_size_t phys_addr = res->start; 67 - resource_size_t size = res->end - res->start + 1; 67 + resource_size_t size = resource_size(res); 68 68 u32 flags = 0x80044000; /* enable & mem R/W */ 69 69 unsigned int i; 70 70 ··· 108 108 char *name = hose->dn->full_name; 109 109 110 110 pr_debug("PCI memory map start 0x%016llx, size 0x%016llx\n", 111 - (u64)rsrc->start, (u64)rsrc->end - (u64)rsrc->start + 1); 111 + (u64)rsrc->start, (u64)resource_size(rsrc)); 112 112 113 113 if (of_device_is_compatible(hose->dn, "fsl,qoriq-pcie-v2.2")) { 114 114 win_idx = 2; ··· 116 116 end_idx = 3; 117 117 } 118 118 119 - pci = ioremap(rsrc->start, rsrc->end - rsrc->start + 1); 119 + pci = ioremap(rsrc->start, resource_size(rsrc)); 120 120 if (!pci) { 121 121 dev_err(hose->parent, "Unable to map ATMU registers\n"); 122 122 return; ··· 153 153 } else { 154 154 pr_debug("PCI IO resource start 0x%016llx, size 0x%016llx, " 155 155 "phy base 0x%016llx.\n", 156 - (u64)hose->io_resource.start, 157 - (u64)hose->io_resource.end - (u64)hose->io_resource.start + 1, 158 - (u64)hose->io_base_phys); 156 + (u64)hose->io_resource.start, 157 + (u64)resource_size(&hose->io_resource), 158 + (u64)hose->io_base_phys); 159 159 out_be32(&pci->pow[j].potar, (hose->io_resource.start >> 12)); 160 160 out_be32(&pci->pow[j].potear, 0); 161 161 out_be32(&pci->pow[j].powbar, (hose->io_base_phys >> 12));
+1 -1
arch/powerpc/sysdev/fsl_rio.c
··· 1523 1523 port->priv = priv; 1524 1524 port->phys_efptr = 0x100; 1525 1525 1526 - priv->regs_win = ioremap(regs.start, regs.end - regs.start + 1); 1526 + priv->regs_win = ioremap(regs.start, resource_size(&regs)); 1527 1527 rio_regs_win = priv->regs_win; 1528 1528 1529 1529 /* Probe the master port phy type */
+1 -1
arch/powerpc/sysdev/ipic.c
··· 736 736 return NULL; 737 737 } 738 738 739 - ipic->regs = ioremap(res.start, res.end - res.start + 1); 739 + ipic->regs = ioremap(res.start, resource_size(&res)); 740 740 741 741 ipic->irqhost->host_data = ipic; 742 742
+1 -1
arch/powerpc/sysdev/mmio_nvram.c
··· 129 129 goto out; 130 130 } 131 131 nvram_addr = r.start; 132 - mmio_nvram_len = r.end - r.start + 1; 132 + mmio_nvram_len = resource_size(&r); 133 133 if ( (!mmio_nvram_len) || (!nvram_addr) ) { 134 134 printk(KERN_WARNING "nvram: address or length is 0\n"); 135 135 ret = -EIO;
+1 -1
arch/powerpc/sysdev/mpc8xx_pic.c
··· 166 166 if (ret) 167 167 goto out; 168 168 169 - siu_reg = ioremap(res.start, res.end - res.start + 1); 169 + siu_reg = ioremap(res.start, resource_size(&res)); 170 170 if (siu_reg == NULL) { 171 171 ret = -EINVAL; 172 172 goto out;
+2 -2
arch/powerpc/sysdev/mv64x60_udbg.c
··· 125 125 126 126 of_node_put(np); 127 127 128 - mpsc_base = ioremap(r[0].start, r[0].end - r[0].start + 1); 128 + mpsc_base = ioremap(r[0].start, resource_size(&r[0])); 129 129 if (!mpsc_base) 130 130 return; 131 131 132 - mpsc_intr_cause = ioremap(r[1].start, r[1].end - r[1].start + 1); 132 + mpsc_intr_cause = ioremap(r[1].start, resource_size(&r[1])); 133 133 if (!mpsc_intr_cause) { 134 134 iounmap(mpsc_base); 135 135 return;
+8 -8
arch/powerpc/sysdev/ppc4xx_pci.c
··· 265 265 if (ppc4xx_setup_one_pci_PMM(hose, reg, 266 266 res->start, 267 267 res->start - hose->pci_mem_offset, 268 - res->end + 1 - res->start, 268 + resource_size(res), 269 269 res->flags, 270 270 j) == 0) { 271 271 j++; ··· 290 290 void __iomem *reg, 291 291 const struct resource *res) 292 292 { 293 - resource_size_t size = res->end - res->start + 1; 293 + resource_size_t size = resource_size(res); 294 294 u32 sa; 295 295 296 296 /* Calculate window size */ ··· 349 349 bus_range = of_get_property(np, "bus-range", NULL); 350 350 351 351 /* Map registers */ 352 - reg = ioremap(rsrc_reg.start, rsrc_reg.end + 1 - rsrc_reg.start); 352 + reg = ioremap(rsrc_reg.start, resource_size(&rsrc_reg)); 353 353 if (reg == NULL) { 354 354 printk(KERN_ERR "%s: Can't map registers !", np->full_name); 355 355 goto fail; ··· 465 465 if (ppc4xx_setup_one_pcix_POM(hose, reg, 466 466 res->start, 467 467 res->start - hose->pci_mem_offset, 468 - res->end + 1 - res->start, 468 + resource_size(res), 469 469 res->flags, 470 470 j) == 0) { 471 471 j++; ··· 492 492 int big_pim, 493 493 int enable_msi_hole) 494 494 { 495 - resource_size_t size = res->end - res->start + 1; 495 + resource_size_t size = resource_size(res); 496 496 u32 sa; 497 497 498 498 /* RAM is always at 0 */ ··· 555 555 bus_range = of_get_property(np, "bus-range", NULL); 556 556 557 557 /* Map registers */ 558 - reg = ioremap(rsrc_reg.start, rsrc_reg.end + 1 - rsrc_reg.start); 558 + reg = ioremap(rsrc_reg.start, resource_size(&rsrc_reg)); 559 559 if (reg == NULL) { 560 560 printk(KERN_ERR "%s: Can't map registers !", np->full_name); 561 561 goto fail; ··· 1604 1604 if (ppc4xx_setup_one_pciex_POM(port, hose, mbase, 1605 1605 res->start, 1606 1606 res->start - hose->pci_mem_offset, 1607 - res->end + 1 - res->start, 1607 + resource_size(res), 1608 1608 res->flags, 1609 1609 j) == 0) { 1610 1610 j++; ··· 1639 1639 void __iomem *mbase, 1640 1640 struct resource *res) 1641 1641 { 1642 - resource_size_t size = res->end - res->start + 1; 1642 + resource_size_t size = resource_size(res); 1643 1643 u64 sa; 1644 1644 1645 1645 if (port->endpoint) {
+1 -1
arch/powerpc/sysdev/qe_lib/qe_ic.c
··· 347 347 return; 348 348 } 349 349 350 - qe_ic->regs = ioremap(res.start, res.end - res.start + 1); 350 + qe_ic->regs = ioremap(res.start, resource_size(&res)); 351 351 352 352 qe_ic->irqhost->host_data = qe_ic; 353 353 qe_ic->hc_irq = qe_ic_irq_chip;
+1 -1
arch/powerpc/sysdev/qe_lib/qe_io.c
··· 41 41 ret = of_address_to_resource(np, 0, &res); 42 42 if (ret) 43 43 return ret; 44 - par_io = ioremap(res.start, res.end - res.start + 1); 44 + par_io = ioremap(res.start, resource_size(&res)); 45 45 46 46 num_ports = of_get_property(np, "num-ports", NULL); 47 47 if (num_ports)
+1 -1
arch/powerpc/sysdev/xics/icp-native.c
··· 247 247 return -1; 248 248 } 249 249 250 - if (icp_native_map_one_cpu(*indx, r.start, r.end - r.start)) 250 + if (icp_native_map_one_cpu(*indx, r.start, resource_size(&r))) 251 251 return -1; 252 252 253 253 (*indx)++;
+4 -4
arch/sh/kernel/io_trapped.c
··· 58 58 59 59 for (k = 0; k < tiop->num_resources; k++) { 60 60 res = tiop->resource + k; 61 - len += roundup((res->end - res->start) + 1, PAGE_SIZE); 61 + len += roundup(resource_size(res), PAGE_SIZE); 62 62 flags |= res->flags; 63 63 } 64 64 ··· 85 85 (unsigned long)(tiop->virt_base + len), 86 86 res->flags & IORESOURCE_IO ? "io" : "mmio", 87 87 (unsigned long)res->start); 88 - len += roundup((res->end - res->start) + 1, PAGE_SIZE); 88 + len += roundup(resource_size(res), PAGE_SIZE); 89 89 } 90 90 91 91 tiop->magic = IO_TRAPPED_MAGIC; ··· 128 128 return tiop->virt_base + voffs; 129 129 } 130 130 131 - len = (res->end - res->start) + 1; 131 + len = resource_size(res); 132 132 voffs += roundup(len, PAGE_SIZE); 133 133 } 134 134 } ··· 173 173 174 174 for (k = 0; k < tiop->num_resources; k++) { 175 175 res = tiop->resource + k; 176 - len = roundup((res->end - res->start) + 1, PAGE_SIZE); 176 + len = roundup(resource_size(res), PAGE_SIZE); 177 177 if (address < (vaddr + len)) 178 178 return res->start + (address - vaddr); 179 179 vaddr += len;
+1 -1
arch/sh/kernel/machine_kexec.c
··· 170 170 if (crashk_res.end == crashk_res.start) 171 171 goto disable; 172 172 173 - crash_size = PAGE_ALIGN(crashk_res.end - crashk_res.start + 1); 173 + crash_size = PAGE_ALIGN(resource_size(&crashk_res)); 174 174 if (!crashk_res.start) { 175 175 unsigned long max = memblock_end_of_DRAM() - memory_limit; 176 176 crashk_res.start = __memblock_alloc_base(crash_size, PAGE_SIZE, max);
+6 -6
arch/sparc/kernel/ioport.c
··· 228 228 } 229 229 230 230 pa &= PAGE_MASK; 231 - sparc_mapiorange(bus, pa, res->start, res->end - res->start + 1); 231 + sparc_mapiorange(bus, pa, res->start, resource_size(res)); 232 232 233 233 return (void __iomem *)(unsigned long)(res->start + offset); 234 234 } ··· 240 240 { 241 241 unsigned long plen; 242 242 243 - plen = res->end - res->start + 1; 243 + plen = resource_size(res); 244 244 BUG_ON((plen & (PAGE_SIZE-1)) != 0); 245 245 sparc_unmapiorange(res->start, plen); 246 246 release_resource(res); ··· 331 331 } 332 332 333 333 n = PAGE_ALIGN(n); 334 - if ((res->end-res->start)+1 != n) { 334 + if (resource_size(res) != n) { 335 335 printk("sbus_free_consistent: region 0x%lx asked 0x%zx\n", 336 - (long)((res->end-res->start)+1), n); 336 + (long)resource_size(res), n); 337 337 return; 338 338 } 339 339 ··· 504 504 } 505 505 506 506 n = PAGE_ALIGN(n); 507 - if ((res->end-res->start)+1 != n) { 507 + if (resource_size(res) != n) { 508 508 printk("pci_free_consistent: region 0x%lx asked 0x%lx\n", 509 - (long)((res->end-res->start)+1), (long)n); 509 + (long)resource_size(res), (long)n); 510 510 return; 511 511 } 512 512
+2 -4
arch/sparc/kernel/pci.c
··· 820 820 unsigned long space_size, user_offset, user_size; 821 821 822 822 if (mmap_state == pci_mmap_io) { 823 - space_size = (pbm->io_space.end - 824 - pbm->io_space.start) + 1; 823 + space_size = resource_size(&pbm->io_space); 825 824 } else { 826 - space_size = (pbm->mem_space.end - 827 - pbm->mem_space.start) + 1; 825 + space_size = resource_size(&pbm->mem_space); 828 826 } 829 827 830 828 /* Make sure the request is in range. */
+1 -2
arch/tile/kernel/setup.c
··· 553 553 554 554 #ifdef CONFIG_KEXEC 555 555 if (crashk_res.start != crashk_res.end) 556 - reserve_bootmem(crashk_res.start, 557 - crashk_res.end - crashk_res.start + 1, 0); 556 + reserve_bootmem(crashk_res.start, resource_size(&crashk_res), 0); 558 557 #endif 559 558 } 560 559
+1 -1
arch/x86/kernel/pci-calgary_64.c
··· 1553 1553 continue; 1554 1554 1555 1555 /* cover the whole region */ 1556 - npages = (r->end - r->start) >> PAGE_SHIFT; 1556 + npages = resource_size(r) >> PAGE_SHIFT; 1557 1557 npages++; 1558 1558 1559 1559 iommu_range_reserve(tbl, r->start, npages);
+1 -1
arch/x86/kernel/probe_roms.c
··· 234 234 /* check for extension rom (ignore length byte!) */ 235 235 rom = isa_bus_to_virt(extension_rom_resource.start); 236 236 if (romsignature(rom)) { 237 - length = extension_rom_resource.end - extension_rom_resource.start + 1; 237 + length = resource_size(&extension_rom_resource); 238 238 if (romchecksum(rom, length)) { 239 239 request_resource(&iomem_resource, &extension_rom_resource); 240 240 upper = extension_rom_resource.start;
+1 -1
drivers/char/bsr.c
··· 212 212 213 213 cur->bsr_minor = i + total_bsr_devs; 214 214 cur->bsr_addr = res.start; 215 - cur->bsr_len = res.end - res.start + 1; 215 + cur->bsr_len = resource_size(&res); 216 216 cur->bsr_bytes = bsr_bytes[i]; 217 217 cur->bsr_stride = bsr_stride[i]; 218 218 cur->bsr_dev = MKDEV(bsr_major, i + total_bsr_devs);
+1 -1
drivers/char/xilinx_hwicap/xilinx_hwicap.c
··· 621 621 622 622 drvdata->mem_start = regs_res->start; 623 623 drvdata->mem_end = regs_res->end; 624 - drvdata->mem_size = regs_res->end - regs_res->start + 1; 624 + drvdata->mem_size = resource_size(regs_res); 625 625 626 626 if (!request_mem_region(drvdata->mem_start, 627 627 drvdata->mem_size, DRIVER_NAME)) {
+2 -3
drivers/dma/mv_xor.c
··· 1304 1304 if (!res) 1305 1305 return -ENODEV; 1306 1306 1307 - msp->xor_base = devm_ioremap(&pdev->dev, res->start, 1308 - res->end - res->start + 1); 1307 + msp->xor_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); 1309 1308 if (!msp->xor_base) 1310 1309 return -EBUSY; 1311 1310 ··· 1313 1314 return -ENODEV; 1314 1315 1315 1316 msp->xor_high_base = devm_ioremap(&pdev->dev, res->start, 1316 - res->end - res->start + 1); 1317 + resource_size(res)); 1317 1318 if (!msp->xor_high_base) 1318 1319 return -EBUSY; 1319 1320
+1 -1
drivers/edac/cell_edac.c
··· 140 140 if (of_node_to_nid(np) != priv->node) 141 141 continue; 142 142 csrow->first_page = r.start >> PAGE_SHIFT; 143 - csrow->nr_pages = (r.end - r.start + 1) >> PAGE_SHIFT; 143 + csrow->nr_pages = resource_size(&r) >> PAGE_SHIFT; 144 144 csrow->last_page = csrow->first_page + csrow->nr_pages - 1; 145 145 csrow->mtype = MEM_XDR; 146 146 csrow->edac_mode = EDAC_SECDED;
+6 -6
drivers/edac/mpc85xx_edac.c
··· 538 538 /* we only need the error registers */ 539 539 r.start += 0xe00; 540 540 541 - if (!devm_request_mem_region(&op->dev, r.start, 542 - r.end - r.start + 1, pdata->name)) { 541 + if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r), 542 + pdata->name)) { 543 543 printk(KERN_ERR "%s: Error while requesting mem region\n", 544 544 __func__); 545 545 res = -EBUSY; 546 546 goto err; 547 547 } 548 548 549 - pdata->l2_vbase = devm_ioremap(&op->dev, r.start, r.end - r.start + 1); 549 + pdata->l2_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r)); 550 550 if (!pdata->l2_vbase) { 551 551 printk(KERN_ERR "%s: Unable to setup L2 err regs\n", __func__); 552 552 res = -ENOMEM; ··· 987 987 goto err; 988 988 } 989 989 990 - if (!devm_request_mem_region(&op->dev, r.start, 991 - r.end - r.start + 1, pdata->name)) { 990 + if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r), 991 + pdata->name)) { 992 992 printk(KERN_ERR "%s: Error while requesting mem region\n", 993 993 __func__); 994 994 res = -EBUSY; 995 995 goto err; 996 996 } 997 997 998 - pdata->mc_vbase = devm_ioremap(&op->dev, r.start, r.end - r.start + 1); 998 + pdata->mc_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r)); 999 999 if (!pdata->mc_vbase) { 1000 1000 printk(KERN_ERR "%s: Unable to setup MC err regs\n", __func__); 1001 1001 res = -ENOMEM;
+4 -4
drivers/gpio/gpio-u300.c
··· 581 581 if (!memres) 582 582 goto err_no_resource; 583 583 584 - if (request_mem_region(memres->start, memres->end - memres->start, "GPIO Controller") 585 - == NULL) { 584 + if (!request_mem_region(memres->start, resource_size(memres), 585 + "GPIO Controller")) { 586 586 err = -ENODEV; 587 587 goto err_no_ioregion; 588 588 } ··· 640 640 free_irq(gpio_ports[i].irq, &gpio_ports[i]); 641 641 iounmap(virtbase); 642 642 err_no_ioremap: 643 - release_mem_region(memres->start, memres->end - memres->start); 643 + release_mem_region(memres->start, resource_size(memres)); 644 644 err_no_ioregion: 645 645 err_no_resource: 646 646 clk_disable(clk); ··· 660 660 for (i = 0 ; i < U300_GPIO_NUM_PORTS; i++) 661 661 free_irq(gpio_ports[i].irq, &gpio_ports[i]); 662 662 iounmap(virtbase); 663 - release_mem_region(memres->start, memres->end - memres->start); 663 + release_mem_region(memres->start, resource_size(memres)); 664 664 clk_disable(clk); 665 665 clk_put(clk); 666 666 return 0;
+1 -1
drivers/ide/palm_bk3710.c
··· 342 342 return -ENODEV; 343 343 } 344 344 345 - mem_size = mem->end - mem->start + 1; 345 + mem_size = resource_size(mem); 346 346 if (request_mem_region(mem->start, mem_size, "palm_bk3710") == NULL) { 347 347 printk(KERN_ERR "failed to request memory region\n"); 348 348 return -EBUSY;
+2 -2
drivers/ide/tx4939ide.c
··· 551 551 return -ENODEV; 552 552 553 553 if (!devm_request_mem_region(&pdev->dev, res->start, 554 - res->end - res->start + 1, "tx4938ide")) 554 + resource_size(res), "tx4938ide")) 555 555 return -EBUSY; 556 556 mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start, 557 - res->end - res->start + 1); 557 + resource_size(res)); 558 558 if (!mapbase) 559 559 return -EBUSY; 560 560 memset(&hw, 0, sizeof(hw));
+2 -4
drivers/input/serio/sa1111ps2.c
··· 300 300 301 301 out: 302 302 sa1111_disable_device(ps2if->dev); 303 - release_mem_region(dev->res.start, 304 - dev->res.end - dev->res.start + 1); 303 + release_mem_region(dev->res.start, resource_size(&dev->res)); 305 304 free: 306 305 sa1111_set_drvdata(dev, NULL); 307 306 kfree(ps2if); ··· 316 317 struct ps2if *ps2if = sa1111_get_drvdata(dev); 317 318 318 319 serio_unregister_port(ps2if->io); 319 - release_mem_region(dev->res.start, 320 - dev->res.end - dev->res.start + 1); 320 + release_mem_region(dev->res.start, resource_size(&dev->res)); 321 321 sa1111_set_drvdata(dev, NULL); 322 322 323 323 kfree(ps2if);
+1 -1
drivers/media/video/davinci/vpif.c
··· 422 422 if (!res) 423 423 return -ENOENT; 424 424 425 - res_len = res->end - res->start + 1; 425 + res_len = resource_size(res); 426 426 427 427 res = request_mem_region(res->start, res_len, res->name); 428 428 if (!res)
+2 -3
drivers/media/video/omap24xxcam.c
··· 1768 1768 dev_err(cam->dev, "no mem resource?\n"); 1769 1769 goto err; 1770 1770 } 1771 - if (!request_mem_region(mem->start, (mem->end - mem->start) + 1, 1772 - pdev->name)) { 1771 + if (!request_mem_region(mem->start, resource_size(mem), pdev->name)) { 1773 1772 dev_err(cam->dev, 1774 1773 "cannot reserve camera register I/O region\n"); 1775 1774 goto err; 1776 1775 } 1777 1776 cam->mmio_base_phys = mem->start; 1778 - cam->mmio_size = (mem->end - mem->start) + 1; 1777 + cam->mmio_size = resource_size(mem); 1779 1778 1780 1779 /* map the region */ 1781 1780 cam->mmio_base = (unsigned long)
+4 -4
drivers/message/i2o/iop.c
··· 681 681 if (root && allocate_resource(root, res, sb->desired_mem_size, sb->desired_mem_size, sb->desired_mem_size, 1 << 20, /* Unspecified, so use 1Mb and play safe */ 682 682 NULL, NULL) >= 0) { 683 683 c->mem_alloc = 1; 684 - sb->current_mem_size = 1 + res->end - res->start; 684 + sb->current_mem_size = resource_size(res); 685 685 sb->current_mem_base = res->start; 686 686 osm_info("%s: allocated %llu bytes of PCI memory at " 687 687 "0x%016llX.\n", c->name, 688 - (unsigned long long)(1 + res->end - res->start), 688 + (unsigned long long)resource_size(res), 689 689 (unsigned long long)res->start); 690 690 } 691 691 } ··· 703 703 if (root && allocate_resource(root, res, sb->desired_io_size, sb->desired_io_size, sb->desired_io_size, 1 << 20, /* Unspecified, so use 1Mb and play safe */ 704 704 NULL, NULL) >= 0) { 705 705 c->io_alloc = 1; 706 - sb->current_io_size = 1 + res->end - res->start; 706 + sb->current_io_size = resource_size(res); 707 707 sb->current_mem_base = res->start; 708 708 osm_info("%s: allocated %llu bytes of PCI I/O at " 709 709 "0x%016llX.\n", c->name, 710 - (unsigned long long)(1 + res->end - res->start), 710 + (unsigned long long)resource_size(res), 711 711 (unsigned long long)res->start); 712 712 } 713 713 }
+1 -1
drivers/mfd/tc6387xb.c
··· 177 177 if (ret) 178 178 goto err_resource; 179 179 180 - tc6387xb->scr = ioremap(rscr->start, rscr->end - rscr->start + 1); 180 + tc6387xb->scr = ioremap(rscr->start, resource_size(rscr)); 181 181 if (!tc6387xb->scr) { 182 182 ret = -ENOMEM; 183 183 goto err_ioremap;
+1 -1
drivers/misc/atmel-ssc.c
··· 95 95 } 96 96 97 97 ssc->pdev = pdev; 98 - ssc->regs = ioremap(regs->start, regs->end - regs->start + 1); 98 + ssc->regs = ioremap(regs->start, resource_size(regs)); 99 99 if (!ssc->regs) { 100 100 dev_dbg(&pdev->dev, "ioremap failed\n"); 101 101 retval = -EINVAL;
+1 -1
drivers/misc/atmel_pwm.c
··· 329 329 p->pdev = pdev; 330 330 p->mask = *mp; 331 331 p->irq = irq; 332 - p->base = ioremap(r->start, r->end - r->start + 1); 332 + p->base = ioremap(r->start, resource_size(r)); 333 333 if (!p->base) 334 334 goto fail; 335 335 p->clk = clk_get(&pdev->dev, "pwm_clk");
+1 -1
drivers/mmc/host/dw_mmc.c
··· 1595 1595 INIT_LIST_HEAD(&host->queue); 1596 1596 1597 1597 ret = -ENOMEM; 1598 - host->regs = ioremap(regs->start, regs->end - regs->start + 1); 1598 + host->regs = ioremap(regs->start, resource_size(regs)); 1599 1599 if (!host->regs) 1600 1600 goto err_freehost; 1601 1601
+1 -1
drivers/mtd/maps/bfin-async-flash.c
··· 142 142 state->map.write = bfin_flash_write; 143 143 state->map.copy_to = bfin_flash_copy_to; 144 144 state->map.bankwidth = pdata->width; 145 - state->map.size = memory->end - memory->start + 1; 145 + state->map.size = resource_size(memory); 146 146 state->map.virt = (void __iomem *)memory->start; 147 147 state->map.phys = memory->start; 148 148 state->map.map_priv_1 = (unsigned long)state;
+6 -5
drivers/mtd/maps/ixp2000.c
··· 155 155 if (!plat) 156 156 return -ENODEV; 157 157 158 - window_size = dev->resource->end - dev->resource->start + 1; 158 + window_size = resource_size(dev->resource); 159 159 dev_info(&dev->dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n", 160 160 ixp_data->nr_banks, ((u32)window_size >> 20)); 161 161 ··· 194 194 info->map.copy_to = ixp2000_flash_copy_to; 195 195 196 196 info->res = request_mem_region(dev->resource->start, 197 - dev->resource->end - dev->resource->start + 1, 198 - dev_name(&dev->dev)); 197 + resource_size(dev->resource), 198 + dev_name(&dev->dev)); 199 199 if (!info->res) { 200 200 dev_err(&dev->dev, "Could not reserve memory region\n"); 201 201 err = -ENOMEM; 202 202 goto Error; 203 203 } 204 204 205 - info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start, 206 - dev->resource->end - dev->resource->start + 1); 205 + info->map.map_priv_1 = 206 + (unsigned long)ioremap(dev->resource->start, 207 + resource_size(dev->resource)); 207 208 if (!info->map.map_priv_1) { 208 209 dev_err(&dev->dev, "Failed to ioremap flash region\n"); 209 210 err = -EIO;
+1 -1
drivers/mtd/maps/pxa2xx-flash.c
··· 70 70 info->map.name = (char *) flash->name; 71 71 info->map.bankwidth = flash->width; 72 72 info->map.phys = res->start; 73 - info->map.size = res->end - res->start + 1; 73 + info->map.size = resource_size(res); 74 74 info->parts = flash->parts; 75 75 info->nr_parts = flash->nr_parts; 76 76
+2 -2
drivers/mtd/nand/atmel_nand.c
··· 513 513 514 514 host->io_phys = (dma_addr_t)mem->start; 515 515 516 - host->io_base = ioremap(mem->start, mem->end - mem->start + 1); 516 + host->io_base = ioremap(mem->start, resource_size(mem)); 517 517 if (host->io_base == NULL) { 518 518 printk(KERN_ERR "atmel_nand: ioremap failed\n"); 519 519 res = -EIO; ··· 547 547 if (no_ecc) 548 548 nand_chip->ecc.mode = NAND_ECC_NONE; 549 549 if (hard_ecc && regs) { 550 - host->ecc = ioremap(regs->start, regs->end - regs->start + 1); 550 + host->ecc = ioremap(regs->start, resource_size(regs)); 551 551 if (host->ecc == NULL) { 552 552 printk(KERN_ERR "atmel_nand: ioremap failed\n"); 553 553 res = -EIO;
+1 -1
drivers/mtd/nand/bcm_umi_nand.c
··· 380 380 return -ENXIO; 381 381 382 382 /* map physical address */ 383 - bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1); 383 + bcm_umi_io_base = ioremap(r->start, resource_size(r)); 384 384 385 385 if (!bcm_umi_io_base) { 386 386 printk(KERN_ERR "ioremap to access BCM UMI NAND chip failed\n");
+1 -1
drivers/mtd/nand/mpc5121_nfc.c
··· 713 713 } 714 714 715 715 regs_paddr = res.start; 716 - regs_size = res.end - res.start + 1; 716 + regs_size = resource_size(&res); 717 717 718 718 if (!devm_request_mem_region(dev, regs_paddr, regs_size, DRV_NAME)) { 719 719 dev_err(dev, "Error requesting memory region!\n");
+4 -4
drivers/net/bcm63xx_enet.c
··· 1646 1646 if (ret) 1647 1647 goto out; 1648 1648 1649 - iomem_size = res_mem->end - res_mem->start + 1; 1649 + iomem_size = resource_size(res_mem); 1650 1650 if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) { 1651 1651 ret = -EBUSY; 1652 1652 goto out; ··· 1861 1861 /* release device resources */ 1862 1862 iounmap(priv->base); 1863 1863 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1864 - release_mem_region(res->start, res->end - res->start + 1); 1864 + release_mem_region(res->start, resource_size(res)); 1865 1865 1866 1866 /* disable hw block clocks */ 1867 1867 if (priv->phy_clk) { ··· 1897 1897 if (!res) 1898 1898 return -ENODEV; 1899 1899 1900 - iomem_size = res->end - res->start + 1; 1900 + iomem_size = resource_size(res); 1901 1901 if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma")) 1902 1902 return -EBUSY; 1903 1903 ··· 1915 1915 1916 1916 iounmap(bcm_enet_shared_base); 1917 1917 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1918 - release_mem_region(res->start, res->end - res->start + 1); 1918 + release_mem_region(res->start, resource_size(res)); 1919 1919 return 0; 1920 1920 } 1921 1921
+1 -1
drivers/net/can/softing/softing_main.c
··· 799 799 if (!pres) 800 800 goto platform_resource_failed; 801 801 card->dpram_phys = pres->start; 802 - card->dpram_size = pres->end - pres->start + 1; 802 + card->dpram_size = resource_size(pres); 803 803 card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size); 804 804 if (!card->dpram) { 805 805 dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
+3 -3
drivers/net/davinci_emac.c
··· 1821 1821 } 1822 1822 1823 1823 priv->emac_base_phys = res->start + pdata->ctrl_reg_offset; 1824 - size = res->end - res->start + 1; 1824 + size = resource_size(res); 1825 1825 if (!request_mem_region(res->start, size, ndev->name)) { 1826 1826 dev_err(&pdev->dev, "failed request_mem_region() for regs\n"); 1827 1827 rc = -ENXIO; ··· 1926 1926 cpdma_ctlr_destroy(priv->dma); 1927 1927 no_dma: 1928 1928 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1929 - release_mem_region(res->start, res->end - res->start + 1); 1929 + release_mem_region(res->start, resource_size(res)); 1930 1930 iounmap(priv->remap_addr); 1931 1931 1932 1932 probe_quit: ··· 1960 1960 cpdma_chan_destroy(priv->rxchan); 1961 1961 cpdma_ctlr_destroy(priv->dma); 1962 1962 1963 - release_mem_region(res->start, res->end - res->start + 1); 1963 + release_mem_region(res->start, resource_size(res)); 1964 1964 1965 1965 unregister_netdev(ndev); 1966 1966 iounmap(priv->remap_addr);
+1 -1
drivers/net/ethoc.c
··· 965 965 priv = netdev_priv(netdev); 966 966 priv->netdev = netdev; 967 967 priv->dma_alloc = 0; 968 - priv->io_region_size = mmio->end - mmio->start + 1; 968 + priv->io_region_size = resource_size(mmio); 969 969 970 970 priv->iobase = devm_ioremap_nocache(&pdev->dev, netdev->base_addr, 971 971 resource_size(mmio));
+4 -3
drivers/net/fec_mpc52xx.c
··· 867 867 "Error while parsing device node resource\n" ); 868 868 goto err_netdev; 869 869 } 870 - if ((mem.end - mem.start + 1) < sizeof(struct mpc52xx_fec)) { 870 + if (resource_size(&mem) < sizeof(struct mpc52xx_fec)) { 871 871 printk(KERN_ERR DRIVER_NAME 872 - " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n", 873 - (unsigned long)(mem.end - mem.start + 1), sizeof(struct mpc52xx_fec)); 872 + " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n", 873 + (unsigned long)resource_size(&mem), 874 + sizeof(struct mpc52xx_fec)); 874 875 rv = -EINVAL; 875 876 goto err_netdev; 876 877 }
+2 -2
drivers/net/fs_enet/mii-bitbang.c
··· 120 120 if (ret) 121 121 return ret; 122 122 123 - if (res.end - res.start < 13) 123 + if (resource_size(&res) <= 13) 124 124 return -ENODEV; 125 125 126 126 /* This should really encode the pin number as well, but all ··· 139 139 return -ENODEV; 140 140 mdc_pin = *data; 141 141 142 - bitbang->dir = ioremap(res.start, res.end - res.start + 1); 142 + bitbang->dir = ioremap(res.start, resource_size(&res)); 143 143 if (!bitbang->dir) 144 144 return -ENOMEM; 145 145
+1 -1
drivers/net/fs_enet/mii-fec.c
··· 136 136 137 137 snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", res.start); 138 138 139 - fec->fecp = ioremap(res.start, res.end - res.start + 1); 139 + fec->fecp = ioremap(res.start, resource_size(&res)); 140 140 if (!fec->fecp) 141 141 goto out_fec; 142 142
+1 -1
drivers/net/gianfar_ptp.c
··· 491 491 spin_lock_init(&etsects->lock); 492 492 493 493 etsects->regs = ioremap(etsects->rsrc->start, 494 - 1 + etsects->rsrc->end - etsects->rsrc->start); 494 + resource_size(etsects->rsrc)); 495 495 if (!etsects->regs) { 496 496 pr_err("ioremap ptp registers failed\n"); 497 497 goto no_ioremap;
+1 -1
drivers/net/ibm_newemac/core.c
··· 2770 2770 } 2771 2771 // TODO : request_mem_region 2772 2772 dev->emacp = ioremap(dev->rsrc_regs.start, 2773 - dev->rsrc_regs.end - dev->rsrc_regs.start + 1); 2773 + resource_size(&dev->rsrc_regs)); 2774 2774 if (dev->emacp == NULL) { 2775 2775 printk(KERN_ERR "%s: Can't map device registers!\n", 2776 2776 np->full_name);
+1 -1
drivers/net/macb.c
··· 1169 1169 clk_enable(bp->hclk); 1170 1170 #endif 1171 1171 1172 - bp->regs = ioremap(regs->start, regs->end - regs->start + 1); 1172 + bp->regs = ioremap(regs->start, resource_size(regs)); 1173 1173 if (!bp->regs) { 1174 1174 dev_err(&pdev->dev, "failed to map registers, aborting.\n"); 1175 1175 err = -ENOMEM;
+1 -1
drivers/net/mv643xx_eth.c
··· 2593 2593 if (msp == NULL) 2594 2594 goto out; 2595 2595 2596 - msp->base = ioremap(res->start, res->end - res->start + 1); 2596 + msp->base = ioremap(res->start, resource_size(res)); 2597 2597 if (msp->base == NULL) 2598 2598 goto out_free; 2599 2599
+1 -1
drivers/net/pxa168_eth.c
··· 1502 1502 err = -ENODEV; 1503 1503 goto err_netdev; 1504 1504 } 1505 - pep->base = ioremap(res->start, res->end - res->start + 1); 1505 + pep->base = ioremap(res->start, resource_size(res)); 1506 1506 if (pep->base == NULL) { 1507 1507 err = -ENOMEM; 1508 1508 goto err_netdev;
+1 -1
drivers/net/sb1250-mac.c
··· 2597 2597 2598 2598 res = platform_get_resource(pldev, IORESOURCE_MEM, 0); 2599 2599 BUG_ON(!res); 2600 - sbm_base = ioremap_nocache(res->start, res->end - res->start + 1); 2600 + sbm_base = ioremap_nocache(res->start, resource_size(res)); 2601 2601 if (!sbm_base) { 2602 2602 printk(KERN_ERR "%s: unable to map device registers\n", 2603 2603 dev_name(&pldev->dev));
+1 -1
drivers/parport/parport_ax88796.c
··· 293 293 goto exit_mem; 294 294 } 295 295 296 - size = (res->end - res->start) + 1; 296 + size = resource_size(res); 297 297 spacing = size / 3; 298 298 299 299 dd->io = request_mem_region(res->start, size, pdev->name);
+9 -12
drivers/pci/hotplug/shpchp_sysfs.c
··· 50 50 pci_bus_for_each_resource(bus, res, index) { 51 51 if (res && (res->flags & IORESOURCE_MEM) && 52 52 !(res->flags & IORESOURCE_PREFETCH)) { 53 - out += sprintf(out, "start = %8.8llx, " 54 - "length = %8.8llx\n", 55 - (unsigned long long)res->start, 56 - (unsigned long long)(res->end - res->start)); 53 + out += sprintf(out, "start = %8.8llx, length = %8.8llx\n", 54 + (unsigned long long)res->start, 55 + (unsigned long long)resource_size(res)); 57 56 } 58 57 } 59 58 out += sprintf(out, "Free resources: prefetchable memory\n"); 60 59 pci_bus_for_each_resource(bus, res, index) { 61 60 if (res && (res->flags & IORESOURCE_MEM) && 62 61 (res->flags & IORESOURCE_PREFETCH)) { 63 - out += sprintf(out, "start = %8.8llx, " 64 - "length = %8.8llx\n", 65 - (unsigned long long)res->start, 66 - (unsigned long long)(res->end - res->start)); 62 + out += sprintf(out, "start = %8.8llx, length = %8.8llx\n", 63 + (unsigned long long)res->start, 64 + (unsigned long long)resource_size(res)); 67 65 } 68 66 } 69 67 out += sprintf(out, "Free resources: IO\n"); 70 68 pci_bus_for_each_resource(bus, res, index) { 71 69 if (res && (res->flags & IORESOURCE_IO)) { 72 - out += sprintf(out, "start = %8.8llx, " 73 - "length = %8.8llx\n", 74 - (unsigned long long)res->start, 75 - (unsigned long long)(res->end - res->start)); 70 + out += sprintf(out, "start = %8.8llx, length = %8.8llx\n", 71 + (unsigned long long)res->start, 72 + (unsigned long long)resource_size(res)); 76 73 } 77 74 } 78 75 out += sprintf(out, "Free resources: bus numbers\n");
+3 -4
drivers/pcmcia/at91_cf.c
··· 283 283 } 284 284 285 285 /* reserve chip-select regions */ 286 - if (!request_mem_region(io->start, io->end + 1 - io->start, 287 - driver_name)) { 286 + if (!request_mem_region(io->start, resource_size(io), driver_name)) { 288 287 status = -ENXIO; 289 288 goto fail1; 290 289 } ··· 307 308 return 0; 308 309 309 310 fail2: 310 - release_mem_region(io->start, io->end + 1 - io->start); 311 + release_mem_region(io->start, resource_size(io)); 311 312 fail1: 312 313 if (cf->socket.io_offset) 313 314 iounmap((void __iomem *) cf->socket.io_offset); ··· 338 339 struct resource *io = cf->socket.io[0].res; 339 340 340 341 pcmcia_unregister_socket(&cf->socket); 341 - release_mem_region(io->start, io->end + 1 - io->start); 342 + release_mem_region(io->start, resource_size(io)); 342 343 iounmap((void __iomem *) cf->socket.io_offset); 343 344 if (board->irq_pin) { 344 345 free_irq(board->irq_pin, cf);
+2 -2
drivers/pcmcia/electra_cf.c
··· 209 209 210 210 cf->ofdev = ofdev; 211 211 cf->mem_phys = mem.start; 212 - cf->mem_size = PAGE_ALIGN(mem.end - mem.start); 212 + cf->mem_size = PAGE_ALIGN(resource_size(&mem)); 213 213 cf->mem_base = ioremap(cf->mem_phys, cf->mem_size); 214 - cf->io_size = PAGE_ALIGN(io.end - io.start); 214 + cf->io_size = PAGE_ALIGN(resource_size(&io)); 215 215 216 216 area = __get_vm_area(cf->io_size, 0, PHB_IO_BASE, PHB_IO_END); 217 217 if (area == NULL)
+3 -3
drivers/pcmcia/rsrc_iodyn.c
··· 135 135 try = res->end + 1; 136 136 if ((*base == 0) || (*base == try)) { 137 137 if (adjust_resource(s->io[i].res, res->start, 138 - res->end - res->start + num + 1)) 138 + resource_size(res) + num)) 139 139 continue; 140 140 *base = try; 141 141 s->io[i].InUse += num; ··· 147 147 try = res->start - num; 148 148 if ((*base == 0) || (*base == try)) { 149 149 if (adjust_resource(s->io[i].res, 150 - res->start - num, 151 - res->end - res->start + num + 1)) 150 + res->start - num, 151 + resource_size(res) + num)) 152 152 continue; 153 153 *base = try; 154 154 s->io[i].InUse += num;
+3 -3
drivers/pcmcia/rsrc_nonstatic.c
··· 770 770 res->end + num); 771 771 if (!ret) { 772 772 ret = adjust_resource(s->io[i].res, res->start, 773 - res->end - res->start + num + 1); 773 + resource_size(res) + num); 774 774 if (ret) 775 775 continue; 776 776 *base = try; ··· 788 788 res->end); 789 789 if (!ret) { 790 790 ret = adjust_resource(s->io[i].res, 791 - res->start - num, 792 - res->end - res->start + num + 1); 791 + res->start - num, 792 + resource_size(res) + num); 793 793 if (ret) 794 794 continue; 795 795 *base = try;
+5 -5
drivers/pnp/pnpacpi/rsparser.c
··· 1018 1018 io->minimum = p->start; 1019 1019 io->maximum = p->end; 1020 1020 io->alignment = 0; /* Correct? */ 1021 - io->address_length = p->end - p->start + 1; 1021 + io->address_length = resource_size(p); 1022 1022 } else { 1023 1023 io->minimum = 0; 1024 1024 io->address_length = 0; ··· 1036 1036 1037 1037 if (pnp_resource_enabled(p)) { 1038 1038 fixed_io->address = p->start; 1039 - fixed_io->address_length = p->end - p->start + 1; 1039 + fixed_io->address_length = resource_size(p); 1040 1040 } else { 1041 1041 fixed_io->address = 0; 1042 1042 fixed_io->address_length = 0; ··· 1059 1059 memory24->minimum = p->start; 1060 1060 memory24->maximum = p->end; 1061 1061 memory24->alignment = 0; 1062 - memory24->address_length = p->end - p->start + 1; 1062 + memory24->address_length = resource_size(p); 1063 1063 } else { 1064 1064 memory24->minimum = 0; 1065 1065 memory24->address_length = 0; ··· 1083 1083 memory32->minimum = p->start; 1084 1084 memory32->maximum = p->end; 1085 1085 memory32->alignment = 0; 1086 - memory32->address_length = p->end - p->start + 1; 1086 + memory32->address_length = resource_size(p); 1087 1087 } else { 1088 1088 memory32->minimum = 0; 1089 1089 memory32->alignment = 0; ··· 1106 1106 p->flags & IORESOURCE_MEM_WRITEABLE ? 1107 1107 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY; 1108 1108 fixed_memory32->address = p->start; 1109 - fixed_memory32->address_length = p->end - p->start + 1; 1109 + fixed_memory32->address_length = resource_size(p); 1110 1110 } else { 1111 1111 fixed_memory32->address = 0; 1112 1112 fixed_memory32->address_length = 0;
+6 -6
drivers/pnp/pnpbios/rsparser.c
··· 505 505 506 506 if (pnp_resource_enabled(res)) { 507 507 base = res->start; 508 - len = res->end - res->start + 1; 508 + len = resource_size(res); 509 509 } else { 510 510 base = 0; 511 511 len = 0; ··· 529 529 530 530 if (pnp_resource_enabled(res)) { 531 531 base = res->start; 532 - len = res->end - res->start + 1; 532 + len = resource_size(res); 533 533 } else { 534 534 base = 0; 535 535 len = 0; ··· 559 559 560 560 if (pnp_resource_enabled(res)) { 561 561 base = res->start; 562 - len = res->end - res->start + 1; 562 + len = resource_size(res); 563 563 } else { 564 564 base = 0; 565 565 len = 0; ··· 617 617 618 618 if (pnp_resource_enabled(res)) { 619 619 base = res->start; 620 - len = res->end - res->start + 1; 620 + len = resource_size(res); 621 621 } else { 622 622 base = 0; 623 623 len = 0; ··· 636 636 struct resource *res) 637 637 { 638 638 unsigned long base = res->start; 639 - unsigned long len = res->end - res->start + 1; 639 + unsigned long len = resource_size(res); 640 640 641 641 if (pnp_resource_enabled(res)) { 642 642 base = res->start; 643 - len = res->end - res->start + 1; 643 + len = resource_size(res); 644 644 } else { 645 645 base = 0; 646 646 len = 0;
+1 -1
drivers/rtc/rtc-at32ap700x.c
··· 223 223 } 224 224 225 225 rtc->irq = irq; 226 - rtc->regs = ioremap(regs->start, regs->end - regs->start + 1); 226 + rtc->regs = ioremap(regs->start, resource_size(regs)); 227 227 if (!rtc->regs) { 228 228 ret = -ENOMEM; 229 229 dev_dbg(&pdev->dev, "could not map I/O memory\n");
+3 -3
drivers/rtc/rtc-cmos.c
··· 606 606 * (needing ioremap etc), not i/o space resources like this ... 607 607 */ 608 608 ports = request_region(ports->start, 609 - ports->end + 1 - ports->start, 609 + resource_size(ports), 610 610 driver_name); 611 611 if (!ports) { 612 612 dev_dbg(dev, "i/o registers already in use\n"); ··· 750 750 cmos_rtc.dev = NULL; 751 751 rtc_device_unregister(cmos_rtc.rtc); 752 752 cleanup0: 753 - release_region(ports->start, ports->end + 1 - ports->start); 753 + release_region(ports->start, resource_size(ports)); 754 754 return retval; 755 755 } 756 756 ··· 779 779 cmos->rtc = NULL; 780 780 781 781 ports = cmos->iomem; 782 - release_region(ports->start, ports->end + 1 - ports->start); 782 + release_region(ports->start, resource_size(ports)); 783 783 cmos->iomem = NULL; 784 784 785 785 cmos->dev = NULL;
+1 -1
drivers/rtc/rtc-ds1286.c
··· 343 343 if (!priv) 344 344 return -ENOMEM; 345 345 346 - priv->size = res->end - res->start + 1; 346 + priv->size = resource_size(res); 347 347 if (!request_mem_region(res->start, priv->size, pdev->name)) { 348 348 ret = -EBUSY; 349 349 goto out;
+1 -1
drivers/rtc/rtc-ds1511.c
··· 490 490 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); 491 491 if (!pdata) 492 492 return -ENOMEM; 493 - pdata->size = res->end - res->start + 1; 493 + pdata->size = resource_size(res); 494 494 if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size, 495 495 pdev->name)) 496 496 return -EBUSY;
+1 -1
drivers/rtc/rtc-ds1742.c
··· 173 173 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); 174 174 if (!pdata) 175 175 return -ENOMEM; 176 - pdata->size = res->end - res->start + 1; 176 + pdata->size = resource_size(res); 177 177 if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size, 178 178 pdev->name)) 179 179 return -EBUSY;
+1 -1
drivers/rtc/rtc-m48t35.c
··· 154 154 if (!priv) 155 155 return -ENOMEM; 156 156 157 - priv->size = res->end - res->start + 1; 157 + priv->size = resource_size(res); 158 158 /* 159 159 * kludge: remove the #ifndef after ioc3 resource 160 160 * conflicts are resolved
+1 -1
drivers/rtc/rtc-m48t59.c
··· 433 433 434 434 if (!m48t59->ioaddr) { 435 435 /* ioaddr not mapped externally */ 436 - m48t59->ioaddr = ioremap(res->start, res->end - res->start + 1); 436 + m48t59->ioaddr = ioremap(res->start, resource_size(res)); 437 437 if (!m48t59->ioaddr) 438 438 goto out; 439 439 }
+2 -3
drivers/rtc/rtc-mrst.c
··· 332 332 if (!iomem) 333 333 return -ENODEV; 334 334 335 - iomem = request_mem_region(iomem->start, 336 - iomem->end + 1 - iomem->start, 337 - driver_name); 335 + iomem = request_mem_region(iomem->start, resource_size(iomem), 336 + driver_name); 338 337 if (!iomem) { 339 338 dev_dbg(dev, "i/o mem already in use.\n"); 340 339 return -EBUSY;
+2 -3
drivers/rtc/rtc-puv3.c
··· 267 267 return -ENOENT; 268 268 } 269 269 270 - puv3_rtc_mem = request_mem_region(res->start, 271 - res->end-res->start+1, 272 - pdev->name); 270 + puv3_rtc_mem = request_mem_region(res->start, resource_size(res), 271 + pdev->name); 273 272 274 273 if (puv3_rtc_mem == NULL) { 275 274 dev_err(&pdev->dev, "failed to reserve memory region\n");
+2 -3
drivers/rtc/rtc-s3c.c
··· 455 455 return -ENOENT; 456 456 } 457 457 458 - s3c_rtc_mem = request_mem_region(res->start, 459 - res->end-res->start+1, 458 + s3c_rtc_mem = request_mem_region(res->start, resource_size(res), 460 459 pdev->name); 461 460 462 461 if (s3c_rtc_mem == NULL) { ··· 464 465 goto err_nores; 465 466 } 466 467 467 - s3c_rtc_base = ioremap(res->start, res->end - res->start + 1); 468 + s3c_rtc_base = ioremap(res->start, resource_size(res)); 468 469 if (s3c_rtc_base == NULL) { 469 470 dev_err(&pdev->dev, "failed ioremap()\n"); 470 471 ret = -EINVAL;
+2 -1
drivers/staging/generic_serial/ser_a2232.c
··· 746 746 zd_a2232[nr_a2232] = z; 747 747 748 748 boardaddr = ZTWO_VADDR( z->resource.start ); 749 - printk("Board is located at address 0x%x, size is 0x%x.\n", boardaddr, (unsigned int) ((z->resource.end+1) - (z->resource.start))); 749 + printk("Board is located at address 0x%x, size is 0x%x\n", 750 + boardaddr, (unsigned int)resource_size(&z->resource)); 750 751 751 752 mem = (volatile struct a2232memory *) boardaddr; 752 753
+4 -4
drivers/staging/gma500/psb_gtt.c
··· 80 80 { 81 81 struct drm_psb_private *dev_priv = dev->dev_private; 82 82 u32 *gtt_slot, pte; 83 - int numpages = (r->resource.end + 1 - r->resource.start) >> PAGE_SHIFT; 83 + int numpages = resource_size(&r->resource) >> PAGE_SHIFT; 84 84 struct page **pages; 85 85 int i; 86 86 ··· 121 121 { 122 122 struct drm_psb_private *dev_priv = dev->dev_private; 123 123 u32 *gtt_slot, pte; 124 - int numpages = (r->resource.end + 1 - r->resource.start) >> PAGE_SHIFT; 124 + int numpages = resource_size(&r->resource) >> PAGE_SHIFT; 125 125 int i; 126 126 127 127 WARN_ON(r->stolen); ··· 149 149 struct address_space *mapping; 150 150 int i; 151 151 struct page *p; 152 - int pages = (gt->resource.end + 1 - gt->resource.start) >> PAGE_SHIFT; 152 + int pages = resource_size(&gt->resource) >> PAGE_SHIFT; 153 153 154 154 WARN_ON(gt->pages); 155 155 ··· 191 191 static void psb_gtt_detach_pages(struct gtt_range *gt) 192 192 { 193 193 int i; 194 - int pages = (gt->resource.end + 1 - gt->resource.start) >> PAGE_SHIFT; 194 + int pages = resource_size(&gt->resource) >> PAGE_SHIFT; 195 195 196 196 for (i = 0; i < pages; i++) { 197 197 /* FIXME: do we need to force dirty */
+2 -3
drivers/tty/serial/bfin_5xx.c
··· 1304 1304 goto out_error_free_peripherals; 1305 1305 } 1306 1306 1307 - uart->port.membase = ioremap(res->start, 1308 - res->end - res->start); 1307 + uart->port.membase = ioremap(res->start, resource_size(res)); 1309 1308 if (!uart->port.membase) { 1310 1309 dev_err(&pdev->dev, "Cannot map uart IO\n"); 1311 1310 ret = -ENXIO; ··· 1482 1483 } 1483 1484 1484 1485 bfin_earlyprintk_port.port.membase = ioremap(res->start, 1485 - res->end - res->start); 1486 + resource_size(res)); 1486 1487 if (!bfin_earlyprintk_port.port.membase) { 1487 1488 dev_err(&pdev->dev, "Cannot map uart IO\n"); 1488 1489 ret = -ENXIO;
+2 -3
drivers/tty/serial/imx.c
··· 954 954 struct resource *mmres; 955 955 956 956 mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); 957 - release_mem_region(mmres->start, mmres->end - mmres->start + 1); 957 + release_mem_region(mmres->start, resource_size(mmres)); 958 958 } 959 959 960 960 /* ··· 970 970 if (!mmres) 971 971 return -ENODEV; 972 972 973 - ret = request_mem_region(mmres->start, mmres->end - mmres->start + 1, 974 - "imx-uart"); 973 + ret = request_mem_region(mmres->start, resource_size(mmres), "imx-uart"); 975 974 976 975 return ret ? 0 : -EBUSY; 977 976 }
+1 -1
drivers/tty/serial/m32r_sio.c
··· 892 892 * If we have a mapbase, then request that as well. 893 893 */ 894 894 if (ret == 0 && up->port.flags & UPF_IOREMAP) { 895 - int size = res->end - res->start + 1; 895 + int size = resource_size(res); 896 896 897 897 up->port.membase = ioremap(up->port.mapbase, size); 898 898 if (!up->port.membase)
+3 -3
drivers/tty/serial/omap-serial.c
··· 1241 1241 return -ENODEV; 1242 1242 } 1243 1243 1244 - if (!request_mem_region(mem->start, (mem->end - mem->start) + 1, 1245 - pdev->dev.driver->name)) { 1244 + if (!request_mem_region(mem->start, resource_size(mem), 1245 + pdev->dev.driver->name)) { 1246 1246 dev_err(&pdev->dev, "memory region already claimed\n"); 1247 1247 return -EBUSY; 1248 1248 } ··· 1308 1308 dev_err(&pdev->dev, "[UART%d]: failure [%s]: %d\n", 1309 1309 pdev->id, __func__, ret); 1310 1310 do_release_region: 1311 - release_mem_region(mem->start, (mem->end - mem->start) + 1); 1311 + release_mem_region(mem->start, resource_size(mem)); 1312 1312 return ret; 1313 1313 } 1314 1314
+1 -1
drivers/tty/serial/pxa.c
··· 803 803 break; 804 804 } 805 805 806 - sport->port.membase = ioremap(mmres->start, mmres->end - mmres->start + 1); 806 + sport->port.membase = ioremap(mmres->start, resource_size(mmres)); 807 807 if (!sport->port.membase) { 808 808 ret = -ENOMEM; 809 809 goto err_clk;
+1 -1
drivers/tty/serial/sunsu.c
··· 1435 1435 1436 1436 rp = &op->resource[0]; 1437 1437 up->port.mapbase = rp->start; 1438 - up->reg_size = (rp->end - rp->start) + 1; 1438 + up->reg_size = resource_size(rp); 1439 1439 up->port.membase = of_ioremap(rp, 0, up->reg_size, "su"); 1440 1440 if (!up->port.membase) { 1441 1441 if (type != SU_PORT_PORT)
+1 -2
drivers/tty/serial/vt8500_serial.c
··· 573 573 snprintf(vt8500_port->name, sizeof(vt8500_port->name), 574 574 "VT8500 UART%d", pdev->id); 575 575 576 - vt8500_port->uart.membase = ioremap(mmres->start, 577 - mmres->end - mmres->start + 1); 576 + vt8500_port->uart.membase = ioremap(mmres->start, resource_size(mmres)); 578 577 if (!vt8500_port->uart.membase) { 579 578 ret = -ENOMEM; 580 579 goto err;
+1 -1
drivers/uio/uio_pdrv.c
··· 58 58 59 59 uiomem->memtype = UIO_MEM_PHYS; 60 60 uiomem->addr = r->start; 61 - uiomem->size = r->end - r->start + 1; 61 + uiomem->size = resource_size(r); 62 62 ++uiomem; 63 63 } 64 64
+1 -1
drivers/uio/uio_pdrv_genirq.c
··· 137 137 138 138 uiomem->memtype = UIO_MEM_PHYS; 139 139 uiomem->addr = r->start; 140 - uiomem->size = r->end - r->start + 1; 140 + uiomem->size = resource_size(r); 141 141 ++uiomem; 142 142 } 143 143
+1 -1
drivers/usb/gadget/atmel_usba_udc.c
··· 272 272 273 273 regs_resource = platform_get_resource(udc->pdev, IORESOURCE_MEM, 274 274 CTRL_IOMEM_ID); 275 - regs->d_inode->i_size = regs_resource->end - regs_resource->start + 1; 275 + regs->d_inode->i_size = resource_size(regs_resource); 276 276 udc->debugfs_regs = regs; 277 277 278 278 usba_ep_init_debugfs(udc, to_usba_ep(udc->gadget.ep0));
+3 -3
drivers/usb/gadget/fsl_udc_core.c
··· 2445 2445 } 2446 2446 2447 2447 if (pdata->operating_mode == FSL_USB2_DR_DEVICE) { 2448 - if (!request_mem_region(res->start, res->end - res->start + 1, 2448 + if (!request_mem_region(res->start, resource_size(res), 2449 2449 driver_name)) { 2450 2450 ERR("request mem region for %s failed\n", pdev->name); 2451 2451 ret = -EBUSY; ··· 2593 2593 iounmap(dr_regs); 2594 2594 err_release_mem_region: 2595 2595 if (pdata->operating_mode == FSL_USB2_DR_DEVICE) 2596 - release_mem_region(res->start, res->end - res->start + 1); 2596 + release_mem_region(res->start, resource_size(res)); 2597 2597 err_kfree: 2598 2598 kfree(udc_controller); 2599 2599 udc_controller = NULL; ··· 2628 2628 free_irq(udc_controller->irq, udc_controller); 2629 2629 iounmap(dr_regs); 2630 2630 if (pdata->operating_mode == FSL_USB2_DR_DEVICE) 2631 - release_mem_region(res->start, res->end - res->start + 1); 2631 + release_mem_region(res->start, resource_size(res)); 2632 2632 2633 2633 device_unregister(&udc_controller->gadget.dev); 2634 2634 /* free udc --wait for the release() finished */
+1 -1
drivers/usb/host/ehci-ath79.c
··· 146 146 return -ENOMEM; 147 147 148 148 hcd->rsrc_start = res->start; 149 - hcd->rsrc_len = res->end - res->start + 1; 149 + hcd->rsrc_len = resource_size(res); 150 150 151 151 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 152 152 dev_dbg(&pdev->dev, "controller already in use\n");
+1 -1
drivers/usb/host/ehci-cns3xxx.c
··· 107 107 } 108 108 109 109 hcd->rsrc_start = res->start; 110 - hcd->rsrc_len = res->end - res->start + 1; 110 + hcd->rsrc_len = resource_size(res); 111 111 112 112 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, 113 113 driver->description)) {
+1 -1
drivers/usb/host/ehci-fsl.c
··· 100 100 goto err2; 101 101 } 102 102 hcd->rsrc_start = res->start; 103 - hcd->rsrc_len = res->end - res->start + 1; 103 + hcd->rsrc_len = resource_size(res); 104 104 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, 105 105 driver->description)) { 106 106 dev_dbg(&pdev->dev, "controller already in use\n");
+1 -1
drivers/usb/host/ehci-grlib.c
··· 130 130 return -ENOMEM; 131 131 132 132 hcd->rsrc_start = res.start; 133 - hcd->rsrc_len = res.end - res.start + 1; 133 + hcd->rsrc_len = resource_size(&res); 134 134 135 135 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 136 136 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
+1 -1
drivers/usb/host/ehci-ixp4xx.c
··· 100 100 goto fail_request_resource; 101 101 } 102 102 hcd->rsrc_start = res->start; 103 - hcd->rsrc_len = res->end - res->start + 1; 103 + hcd->rsrc_len = resource_size(res); 104 104 105 105 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, 106 106 driver->description)) {
+1 -1
drivers/usb/host/ehci-octeon.c
··· 124 124 return -ENOMEM; 125 125 126 126 hcd->rsrc_start = res_mem->start; 127 - hcd->rsrc_len = res_mem->end - res_mem->start + 1; 127 + hcd->rsrc_len = resource_size(res_mem); 128 128 129 129 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, 130 130 OCTEON_EHCI_HCD_NAME)) {
+5 -5
drivers/usb/host/ehci-pmcmsp.c
··· 124 124 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 125 125 if (res == NULL) 126 126 return -ENOMEM; 127 - res_len = res->end - res->start + 1; 127 + res_len = resource_size(res); 128 128 if (!request_mem_region(res->start, res_len, "mab regs")) 129 129 return -EBUSY; 130 130 ··· 140 140 retval = -ENOMEM; 141 141 goto err2; 142 142 } 143 - res_len = res->end - res->start + 1; 143 + res_len = resource_size(res); 144 144 if (!request_mem_region(res->start, res_len, "usbid regs")) { 145 145 retval = -EBUSY; 146 146 goto err2; ··· 154 154 return 0; 155 155 err3: 156 156 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); 157 - res_len = res->end - res->start + 1; 157 + res_len = resource_size(res); 158 158 release_mem_region(res->start, res_len); 159 159 err2: 160 160 iounmap(dev->mab_regs); 161 161 err1: 162 162 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 163 - res_len = res->end - res->start + 1; 163 + res_len = resource_size(res); 164 164 release_mem_region(res->start, res_len); 165 165 dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n"); 166 166 return retval; ··· 194 194 goto err1; 195 195 } 196 196 hcd->rsrc_start = res->start; 197 - hcd->rsrc_len = res->end - res->start + 1; 197 + hcd->rsrc_len = resource_size(res); 198 198 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) { 199 199 retval = -EBUSY; 200 200 goto err1;
+1 -1
drivers/usb/host/ehci-ppc-of.c
··· 130 130 return -ENOMEM; 131 131 132 132 hcd->rsrc_start = res.start; 133 - hcd->rsrc_len = res.end - res.start + 1; 133 + hcd->rsrc_len = resource_size(&res); 134 134 135 135 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 136 136 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
+1 -1
drivers/usb/host/ehci-w90x900.c
··· 41 41 } 42 42 43 43 hcd->rsrc_start = res->start; 44 - hcd->rsrc_len = res->end - res->start + 1; 44 + hcd->rsrc_len = resource_size(res); 45 45 46 46 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 47 47 retval = -EBUSY;
+1 -1
drivers/usb/host/ehci-xilinx-of.c
··· 174 174 return -ENOMEM; 175 175 176 176 hcd->rsrc_start = res.start; 177 - hcd->rsrc_len = res.end - res.start + 1; 177 + hcd->rsrc_len = resource_size(&res); 178 178 179 179 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 180 180 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
+1 -1
drivers/usb/host/fhci-hcd.c
··· 605 605 goto err_regs; 606 606 } 607 607 608 - hcd->regs = ioremap(usb_regs.start, usb_regs.end - usb_regs.start + 1); 608 + hcd->regs = ioremap(usb_regs.start, resource_size(&usb_regs)); 609 609 if (!hcd->regs) { 610 610 dev_err(dev, "could not ioremap regs\n"); 611 611 ret = -ENOMEM;
+2 -2
drivers/usb/host/ohci-ath79.c
··· 93 93 ret = -ENODEV; 94 94 goto err_put_hcd; 95 95 } 96 - hcd->rsrc_start = res->start; 97 - hcd->rsrc_len = res->end - res->start + 1; 96 + hcd->rsrc_start = res->start; 97 + hcd->rsrc_len = resource_size(res); 98 98 99 99 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 100 100 dev_dbg(&pdev->dev, "controller already in use\n");
+1 -1
drivers/usb/host/ohci-cns3xxx.c
··· 100 100 goto err1; 101 101 } 102 102 hcd->rsrc_start = res->start; 103 - hcd->rsrc_len = res->end - res->start + 1; 103 + hcd->rsrc_len = resource_size(res); 104 104 105 105 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, 106 106 driver->description)) {
+1 -1
drivers/usb/host/ohci-da8xx.c
··· 322 322 goto err2; 323 323 } 324 324 hcd->rsrc_start = mem->start; 325 - hcd->rsrc_len = mem->end - mem->start + 1; 325 + hcd->rsrc_len = resource_size(mem); 326 326 327 327 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 328 328 dev_dbg(&pdev->dev, "request_mem_region failed\n");
+1 -1
drivers/usb/host/ohci-octeon.c
··· 135 135 return -ENOMEM; 136 136 137 137 hcd->rsrc_start = res_mem->start; 138 - hcd->rsrc_len = res_mem->end - res_mem->start + 1; 138 + hcd->rsrc_len = resource_size(res_mem); 139 139 140 140 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, 141 141 OCTEON_OHCI_HCD_NAME)) {
+1 -1
drivers/usb/host/ohci-ppc-of.c
··· 110 110 return -ENOMEM; 111 111 112 112 hcd->rsrc_start = res.start; 113 - hcd->rsrc_len = res.end - res.start + 1; 113 + hcd->rsrc_len = resource_size(&res); 114 114 115 115 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 116 116 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
+1 -1
drivers/usb/host/ohci-ppc-soc.c
··· 56 56 if (!hcd) 57 57 return -ENOMEM; 58 58 hcd->rsrc_start = res->start; 59 - hcd->rsrc_len = res->end - res->start + 1; 59 + hcd->rsrc_len = resource_size(res); 60 60 61 61 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 62 62 pr_debug("%s: request_mem_region failed\n", __FILE__);
+1 -1
drivers/usb/host/ohci-sa1111.c
··· 131 131 if (!hcd) 132 132 return -ENOMEM; 133 133 hcd->rsrc_start = dev->res.start; 134 - hcd->rsrc_len = dev->res.end - dev->res.start + 1; 134 + hcd->rsrc_len = resource_size(&dev->res); 135 135 136 136 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 137 137 dbg("request_mem_region failed");
+5 -6
drivers/usb/host/ohci-sm501.c
··· 103 103 goto err0; 104 104 } 105 105 106 - if (!request_mem_region(mem->start, mem->end - mem->start + 1, 107 - pdev->name)) { 106 + if (!request_mem_region(mem->start, resource_size(mem), pdev->name)) { 108 107 dev_err(dev, "request_mem_region failed\n"); 109 108 retval = -EBUSY; 110 109 goto err0; ··· 125 126 126 127 if (!dma_declare_coherent_memory(dev, mem->start, 127 128 mem->start - mem->parent->start, 128 - (mem->end - mem->start) + 1, 129 + resource_size(mem), 129 130 DMA_MEMORY_MAP | 130 131 DMA_MEMORY_EXCLUSIVE)) { 131 132 dev_err(dev, "cannot declare coherent memory\n"); ··· 148 149 } 149 150 150 151 hcd->rsrc_start = res->start; 151 - hcd->rsrc_len = res->end - res->start + 1; 152 + hcd->rsrc_len = resource_size(res); 152 153 153 154 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, pdev->name)) { 154 155 dev_err(dev, "request_mem_region failed\n"); ··· 184 185 err2: 185 186 dma_release_declared_memory(dev); 186 187 err1: 187 - release_mem_region(mem->start, mem->end - mem->start + 1); 188 + release_mem_region(mem->start, resource_size(mem)); 188 189 err0: 189 190 return retval; 190 191 } ··· 200 201 dma_release_declared_memory(&pdev->dev); 201 202 mem = platform_get_resource(pdev, IORESOURCE_MEM, 1); 202 203 if (mem) 203 - release_mem_region(mem->start, mem->end - mem->start + 1); 204 + release_mem_region(mem->start, resource_size(mem)); 204 205 205 206 /* mask interrupts and disable power */ 206 207
+3 -3
drivers/usb/host/ohci-tmio.c
··· 208 208 } 209 209 210 210 hcd->rsrc_start = regs->start; 211 - hcd->rsrc_len = regs->end - regs->start + 1; 211 + hcd->rsrc_len = resource_size(regs); 212 212 213 213 tmio = hcd_to_tmio(hcd); 214 214 215 215 spin_lock_init(&tmio->lock); 216 216 217 - tmio->ccr = ioremap(config->start, config->end - config->start + 1); 217 + tmio->ccr = ioremap(config->start, resource_size(config)); 218 218 if (!tmio->ccr) { 219 219 ret = -ENOMEM; 220 220 goto err_ioremap_ccr; ··· 228 228 229 229 if (!dma_declare_coherent_memory(&dev->dev, sram->start, 230 230 sram->start, 231 - sram->end - sram->start + 1, 231 + resource_size(sram), 232 232 DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE)) { 233 233 ret = -EBUSY; 234 234 goto err_dma_declare;
+1 -1
drivers/usb/host/oxu210hp-hcd.c
··· 3828 3828 return -ENODEV; 3829 3829 } 3830 3830 memstart = res->start; 3831 - memlen = res->end - res->start + 1; 3831 + memlen = resource_size(res); 3832 3832 dev_dbg(&pdev->dev, "MEM resource %lx-%lx\n", memstart, memlen); 3833 3833 if (!request_mem_region(memstart, memlen, 3834 3834 oxu_hc_driver.description)) {
+1 -1
drivers/usb/host/uhci-grlib.c
··· 111 111 return -ENOMEM; 112 112 113 113 hcd->rsrc_start = res.start; 114 - hcd->rsrc_len = res.end - res.start + 1; 114 + hcd->rsrc_len = resource_size(&res); 115 115 116 116 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { 117 117 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
+1 -1
drivers/usb/host/whci/init.c
··· 178 178 if (whc->qset_pool) 179 179 dma_pool_destroy(whc->qset_pool); 180 180 181 - len = whc->umc->resource.end - whc->umc->resource.start + 1; 181 + len = resource_size(&whc->umc->resource); 182 182 if (whc->base) 183 183 iounmap(whc->base); 184 184 if (whc->base_phys)
+1 -1
drivers/uwb/whc-rc.c
··· 222 222 struct umc_dev *umc_dev = whcrc->umc_dev; 223 223 224 224 whcrc->area = umc_dev->resource.start; 225 - whcrc->rc_len = umc_dev->resource.end - umc_dev->resource.start + 1; 225 + whcrc->rc_len = resource_size(&umc_dev->resource); 226 226 result = -EBUSY; 227 227 if (request_mem_region(whcrc->area, whcrc->rc_len, KBUILD_MODNAME) == NULL) { 228 228 dev_err(dev, "can't request URC region (%zu bytes @ 0x%lx): %d\n",
+2 -2
drivers/video/atmel_lcdfb.c
··· 906 906 if (map) { 907 907 /* use a pre-allocated memory buffer */ 908 908 info->fix.smem_start = map->start; 909 - info->fix.smem_len = map->end - map->start + 1; 909 + info->fix.smem_len = resource_size(map); 910 910 if (!request_mem_region(info->fix.smem_start, 911 911 info->fix.smem_len, pdev->name)) { 912 912 ret = -EBUSY; ··· 932 932 933 933 /* LCDC registers */ 934 934 info->fix.mmio_start = regs->start; 935 - info->fix.mmio_len = regs->end - regs->start + 1; 935 + info->fix.mmio_len = resource_size(regs); 936 936 937 937 if (!request_mem_region(info->fix.mmio_start, 938 938 info->fix.mmio_len, pdev->name)) {
+4 -3
drivers/video/aty/atyfb_base.c
··· 3460 3460 3461 3461 raddr = addr + 0x7ff000UL; 3462 3462 rrp = &pdev->resource[2]; 3463 - if ((rrp->flags & IORESOURCE_MEM) && request_mem_region(rrp->start, rrp->end - rrp->start + 1, "atyfb")) { 3463 + if ((rrp->flags & IORESOURCE_MEM) && 3464 + request_mem_region(rrp->start, resource_size(rrp), "atyfb")) { 3464 3465 par->aux_start = rrp->start; 3465 - par->aux_size = rrp->end - rrp->start + 1; 3466 + par->aux_size = resource_size(rrp); 3466 3467 raddr = rrp->start; 3467 3468 PRINTKI("using auxiliary register aperture\n"); 3468 3469 } ··· 3553 3552 3554 3553 /* Reserve space */ 3555 3554 res_start = rp->start; 3556 - res_size = rp->end - rp->start + 1; 3555 + res_size = resource_size(rp); 3557 3556 if (!request_mem_region(res_start, res_size, "atyfb")) 3558 3557 return -EBUSY; 3559 3558
+1 -1
drivers/video/au1100fb.c
··· 486 486 } 487 487 488 488 au1100fb_fix.mmio_start = regs_res->start; 489 - au1100fb_fix.mmio_len = regs_res->end - regs_res->start + 1; 489 + au1100fb_fix.mmio_len = resource_size(regs_res); 490 490 491 491 if (!request_mem_region(au1100fb_fix.mmio_start, au1100fb_fix.mmio_len, 492 492 DRIVER_NAME)) {
+1 -1
drivers/video/cobalt_lcdfb.c
··· 303 303 return -EBUSY; 304 304 } 305 305 306 - info->screen_size = res->end - res->start + 1; 306 + info->screen_size = resource_size(res); 307 307 info->screen_base = ioremap(res->start, info->screen_size); 308 308 info->fbops = &cobalt_lcd_fbops; 309 309 info->fix = cobalt_lcdfb_fix;
+2 -2
drivers/video/controlfb.c
··· 709 709 710 710 /* Map in frame buffer and registers */ 711 711 p->fb_orig_base = fb_res.start; 712 - p->fb_orig_size = fb_res.end - fb_res.start + 1; 712 + p->fb_orig_size = resource_size(&fb_res); 713 713 /* use the big-endian aperture (??) */ 714 714 p->frame_buffer_phys = fb_res.start + 0x800000; 715 715 p->control_regs_phys = reg_res.start; 716 - p->control_regs_size = reg_res.end - reg_res.start + 1; 716 + p->control_regs_size = resource_size(&reg_res); 717 717 718 718 if (!p->fb_orig_base || 719 719 !request_mem_region(p->fb_orig_base,p->fb_orig_size,"controlfb")) {
+2 -2
drivers/video/mb862xx/mb862xxfbdrv.c
··· 697 697 goto fbrel; 698 698 } 699 699 700 - res_size = 1 + res.end - res.start; 700 + res_size = resource_size(&res); 701 701 par->res = request_mem_region(res.start, res_size, DRV_NAME); 702 702 if (par->res == NULL) { 703 703 dev_err(dev, "Cannot claim framebuffer/mmio\n"); ··· 787 787 { 788 788 struct fb_info *fbi = dev_get_drvdata(&ofdev->dev); 789 789 struct mb862xxfb_par *par = fbi->par; 790 - resource_size_t res_size = 1 + par->res->end - par->res->start; 790 + resource_size_t res_size = resource_size(par->res); 791 791 unsigned long reg; 792 792 793 793 dev_dbg(fbi->dev, "%s release\n", fbi->fix.id);
+1 -2
drivers/video/msm/mdp.c
··· 406 406 goto error_get_irq; 407 407 } 408 408 409 - mdp->base = ioremap(resource->start, 410 - resource->end - resource->start); 409 + mdp->base = ioremap(resource->start, resource_size(resource)); 411 410 if (mdp->base == 0) { 412 411 printk(KERN_ERR "msmfb: cannot allocate mdp regs!\n"); 413 412 ret = -ENOMEM;
+3 -4
drivers/video/msm/msm_fb.c
··· 525 525 return -ENOMEM; 526 526 } 527 527 fb->fix.smem_start = resource->start; 528 - fb->fix.smem_len = resource->end - resource->start; 529 - fbram = ioremap(resource->start, 530 - resource->end - resource->start); 531 - if (fbram == 0) { 528 + fb->fix.smem_len = resource_size(resource); 529 + fbram = ioremap(resource->start, resource_size(resource)); 530 + if (fbram == NULL) { 532 531 printk(KERN_ERR "msmfb: cannot allocate fbram!\n"); 533 532 return -ENOMEM; 534 533 }
+1 -1
drivers/video/nuc900fb.c
··· 551 551 552 552 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 553 553 554 - size = (res->end - res->start) + 1; 554 + size = resource_size(res); 555 555 fbi->mem = request_mem_region(res->start, size, pdev->name); 556 556 if (fbi->mem == NULL) { 557 557 dev_err(&pdev->dev, "failed to alloc memory region\n");
+2 -3
drivers/video/platinumfb.c
··· 567 567 * northbridge and that can fail. Only request framebuffer 568 568 */ 569 569 if (!request_mem_region(pinfo->rsrc_fb.start, 570 - pinfo->rsrc_fb.end - pinfo->rsrc_fb.start + 1, 570 + resource_size(&pinfo->rsrc_fb), 571 571 "platinumfb framebuffer")) { 572 572 printk(KERN_ERR "platinumfb: Can't request framebuffer !\n"); 573 573 framebuffer_release(info); ··· 658 658 iounmap(pinfo->cmap_regs); 659 659 660 660 release_mem_region(pinfo->rsrc_fb.start, 661 - pinfo->rsrc_fb.end - 662 - pinfo->rsrc_fb.start + 1); 661 + resource_size(&pinfo->rsrc_fb)); 663 662 664 663 release_mem_region(pinfo->cmap_regs_phys, 0x1000); 665 664
+1 -1
drivers/video/pxa168fb.c
··· 662 662 info->fix.ypanstep = 0; 663 663 info->fix.ywrapstep = 0; 664 664 info->fix.mmio_start = res->start; 665 - info->fix.mmio_len = res->end - res->start + 1; 665 + info->fix.mmio_len = resource_size(res); 666 666 info->fix.accel = FB_ACCEL_NONE; 667 667 info->fbops = &pxa168fb_ops; 668 668 info->pseudo_palette = fbi->pseudo_palette;
+1 -1
include/linux/dio.h
··· 254 254 255 255 #define dio_resource_start(d) ((d)->resource.start) 256 256 #define dio_resource_end(d) ((d)->resource.end) 257 - #define dio_resource_len(d) ((d)->resource.end-(d)->resource.start+1) 257 + #define dio_resource_len(d) (resource_size(&(d)->resource)) 258 258 #define dio_resource_flags(d) ((d)->resource.flags) 259 259 260 260 #define dio_request_device(d, name) \
+1 -1
include/linux/pnp.h
··· 50 50 { 51 51 if (res->start == 0 && res->end == 0) 52 52 return 0; 53 - return res->end - res->start + 1; 53 + return resource_size(res); 54 54 } 55 55 56 56
+1 -1
include/linux/zorro.h
··· 187 187 188 188 #define zorro_resource_start(z) ((z)->resource.start) 189 189 #define zorro_resource_end(z) ((z)->resource.end) 190 - #define zorro_resource_len(z) ((z)->resource.end-(z)->resource.start+1) 190 + #define zorro_resource_len(z) (resource_size(&(z)->resource)) 191 191 #define zorro_resource_flags(z) ((z)->resource.flags) 192 192 193 193 #define zorro_request_device(z, name) \
+1 -1
kernel/kexec.c
··· 1095 1095 size_t size = 0; 1096 1096 mutex_lock(&kexec_mutex); 1097 1097 if (crashk_res.end != crashk_res.start) 1098 - size = crashk_res.end - crashk_res.start + 1; 1098 + size = resource_size(&crashk_res); 1099 1099 mutex_unlock(&kexec_mutex); 1100 1100 return size; 1101 1101 }
+4 -5
sound/aoa/soundbus/i2sbus/core.c
··· 262 262 */ 263 263 dev->allocated_resource[i] = 264 264 request_mem_region(dev->resources[i].start, 265 - dev->resources[i].end - 266 - dev->resources[i].start + 1, 265 + resource_size(&dev->resources[i]), 267 266 dev->rnames[i]); 268 267 if (!dev->allocated_resource[i]) { 269 268 printk(KERN_ERR "i2sbus: failed to claim resource %d!\n", i); ··· 271 272 } 272 273 273 274 r = &dev->resources[aoa_resource_i2smmio]; 274 - rlen = r->end - r->start + 1; 275 + rlen = resource_size(r); 275 276 if (rlen < sizeof(struct i2s_interface_regs)) 276 277 goto err; 277 278 dev->intfregs = ioremap(r->start, rlen); 278 279 279 280 r = &dev->resources[aoa_resource_txdbdma]; 280 - rlen = r->end - r->start + 1; 281 + rlen = resource_size(r); 281 282 if (rlen < sizeof(struct dbdma_regs)) 282 283 goto err; 283 284 dev->out.dbdma = ioremap(r->start, rlen); 284 285 285 286 r = &dev->resources[aoa_resource_rxdbdma]; 286 - rlen = r->end - r->start + 1; 287 + rlen = resource_size(r); 287 288 if (rlen < sizeof(struct dbdma_regs)) 288 289 goto err; 289 290 dev->in.dbdma = ioremap(r->start, rlen);
+1 -1
sound/atmel/abdac.c
··· 448 448 goto out_free_card; 449 449 } 450 450 451 - dac->regs = ioremap(regs->start, regs->end - regs->start + 1); 451 + dac->regs = ioremap(regs->start, resource_size(regs)); 452 452 if (!dac->regs) { 453 453 dev_dbg(&pdev->dev, "could not remap register memory\n"); 454 454 goto out_free_card;
+1 -1
sound/atmel/ac97c.c
··· 971 971 chip->card = card; 972 972 chip->pclk = pclk; 973 973 chip->pdev = pdev; 974 - chip->regs = ioremap(regs->start, regs->end - regs->start + 1); 974 + chip->regs = ioremap(regs->start, resource_size(regs)); 975 975 976 976 if (!chip->regs) { 977 977 dev_dbg(&pdev->dev, "could not remap register memory\n");
+3 -6
sound/ppc/pmac.c
··· 881 881 for (i = 0; i < 3; i++) { 882 882 if (chip->requested & (1 << i)) 883 883 release_mem_region(chip->rsrc[i].start, 884 - chip->rsrc[i].end - 885 - chip->rsrc[i].start + 1); 884 + resource_size(&chip->rsrc[i])); 886 885 } 887 886 } 888 887 ··· 1227 1228 goto __error; 1228 1229 } 1229 1230 if (request_mem_region(chip->rsrc[i].start, 1230 - chip->rsrc[i].end - 1231 - chip->rsrc[i].start + 1, 1231 + resource_size(&chip->rsrc[i]), 1232 1232 rnames[i]) == NULL) { 1233 1233 printk(KERN_ERR "snd: can't request rsrc " 1234 1234 " %d (%s: %pR)\n", ··· 1252 1254 goto __error; 1253 1255 } 1254 1256 if (request_mem_region(chip->rsrc[i].start, 1255 - chip->rsrc[i].end - 1256 - chip->rsrc[i].start + 1, 1257 + resource_size(&chip->rsrc[i]), 1257 1258 rnames[i]) == NULL) { 1258 1259 printk(KERN_ERR "snd: can't request rsrc " 1259 1260 " %d (%s: %pR)\n",
+1 -1
sound/soc/fsl/fsl_ssi.c
··· 678 678 kfree(ssi_private); 679 679 return ret; 680 680 } 681 - ssi_private->ssi = ioremap(res.start, 1 + res.end - res.start); 681 + ssi_private->ssi = ioremap(res.start, resource_size(&res)); 682 682 ssi_private->ssi_phys = res.start; 683 683 ssi_private->irq = irq_of_parse_and_map(np, 0); 684 684
+1 -1
sound/soc/fsl/mpc5200_dma.c
··· 384 384 dev_err(&op->dev, "Missing reg property\n"); 385 385 return -ENODEV; 386 386 } 387 - regs = ioremap(res.start, 1 + res.end - res.start); 387 + regs = ioremap(res.start, resource_size(&res)); 388 388 if (!regs) { 389 389 dev_err(&op->dev, "Could not map registers\n"); 390 390 return -ENODEV;