Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28f65c11 authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 140a1ef2

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int __devinit scoop_probe(struct platform_device *pdev) 
	spin_lock_init(&devptr->scoop_lock);



	inf = pdev->dev.platform_data;

	devptr->base = ioremap(mem->start, mem->end - mem->start + 1);

	devptr->base = ioremap(mem->start, resource_size(mem));



	if (!devptr->base) {

		ret = -ENOMEM;

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) 
	if (ARRAY_SIZE(lcdc_resources) > 2) {

		void __iomem *fb;

		struct resource *fb_res = &lcdc_resources[2];

		size_t fb_len = fb_res->end - fb_res->start + 1;

		size_t fb_len = resource_size(fb_res);



		fb = ioremap(fb_res->start, fb_len);

		if (fb) {

arch/arm/mach-mv78xx0/pcie.c

+4 −4
Original line number Diff line number Diff line
@@ -129,11 +129,11 @@ static void __init mv78xx0_pcie_preinit(void) 
		struct pcie_port *pp = pcie_port + i;



		mv78xx0_setup_pcie_io_win(win++, pp->res[0].start,

			pp->res[0].end - pp->res[0].start + 1,

					  resource_size(&pp->res[0]),

					  pp->maj, pp->min);



		mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start,

			pp->res[1].end - pp->res[1].start + 1,

					   resource_size(&pp->res[1]),

					   pp->maj, pp->min);

	}

}

arch/arm/mach-u300/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1791,7 +1791,7 @@ static void __init u300_assign_physmem(void) 
				     0 == res->start) {

				res->start  = curr_start;

				res->end   += curr_start;

				curr_start += (res->end - res->start + 1);

				curr_start += resource_size(res);



				printk(KERN_INFO "core.c: Mapping RAM " \

				       "%#x-%#x to device %s:%s\n",

arch/arm/plat-mxc/pwm.c

+4 −4
Original line number Diff line number Diff line
@@ -214,14 +214,14 @@ static int __devinit mxc_pwm_probe(struct platform_device *pdev) 
		goto err_free_clk;

	}



	r = request_mem_region(r->start, r->end - r->start + 1, pdev->name);

	r = request_mem_region(r->start, resource_size(r), pdev->name);

	if (r == NULL) {

		dev_err(&pdev->dev, "failed to request memory resource\n");

		ret = -EBUSY;

		goto err_free_clk;

	}



	pwm->mmio_base = ioremap(r->start, r->end - r->start + 1);

	pwm->mmio_base = ioremap(r->start, resource_size(r));

	if (pwm->mmio_base == NULL) {

		dev_err(&pdev->dev, "failed to ioremap() registers\n");

		ret = -ENODEV;
@@ -236,7 +236,7 @@ static int __devinit mxc_pwm_probe(struct platform_device *pdev) 
	return 0;



err_free_mem:

	release_mem_region(r->start, r->end - r->start + 1);

	release_mem_region(r->start, resource_size(r));

err_free_clk:

	clk_put(pwm->clk);

err_free:
@@ -260,7 +260,7 @@ static int __devexit mxc_pwm_remove(struct platform_device *pdev) 
	iounmap(pwm->mmio_base);



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	release_mem_region(r->start, r->end - r->start + 1);

	release_mem_region(r->start, resource_size(r));



	clk_put(pwm->clk);