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

Commit b782a563 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] use resource_size() 



Use resource_size().

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Kevin Hilman <khilman@ti.deeprootsystems.com>
Cc: Ulrik Bech Hald <ubh@ti.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Ming Lei <tom.leiming@gmail.com>
Cc: Vincent Sanders <support@simtec.co.uk>
Acked-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4946f835

drivers/watchdog/adx_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -242,14 +242,14 @@ static int __devinit adx_wdt_probe(struct platform_device *pdev) 
	}



	res = devm_request_mem_region(&pdev->dev, res->start,

			res->end - res->start + 1, res->name);

			resource_size(res), res->name);

	if (!res) {

		dev_err(&pdev->dev, "cannot request I/O memory region\n");

		return -ENXIO;

	}



	wdt->base = devm_ioremap_nocache(&pdev->dev, res->start,

			res->end - res->start + 1);

			resource_size(res));

	if (!wdt->base) {

		dev_err(&pdev->dev, "cannot remap I/O memory region\n");

		return -ENXIO;

drivers/watchdog/at32ap700x_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	wdt->regs = ioremap(regs->start, regs->end - regs->start + 1);

	wdt->regs = ioremap(regs->start, resource_size(regs));

	if (!wdt->regs) {

		ret = -ENOMEM;

		dev_dbg(&pdev->dev, "could not map I/O memory\n");

drivers/watchdog/davinci_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev) 
		return -ENOENT;

	}



	size = res->end - res->start + 1;

	size = resource_size(res);

	wdt_mem = request_mem_region(res->start, size, pdev->name);



	if (wdt_mem == NULL) {

drivers/watchdog/mpcore_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev) 
		ret = -ENXIO;

		goto err_free;

	}

	wdt->base = ioremap(res->start, res->end - res->start + 1);

	wdt->base = ioremap(res->start, resource_size(res));

	if (!wdt->base) {

		ret = -ENOMEM;

		goto err_free;

drivers/watchdog/mv64x60_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int __devinit mv64x60_wdt_probe(struct platform_device *dev) 
	if (!r)

		return -ENODEV;



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

	mv64x60_wdt_regs = ioremap(r->start, resource_size(r));

	if (mv64x60_wdt_regs == NULL)

		return -ENOMEM;