From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 6 May 2011 09:43:33 +0000 (+0200)
Subject: Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~21890^2~9
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3d1c89b49119820a60c03e718108c553ce9e6b22;p=mirror_ubuntu-focal-kernel.git

Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"

This reverts commit b0c3af5ef0d7b38eb1ba522becd47123ac9736d2.

The driver has been rewritten in ARM tree.
---

diff --git a/arch/arm/mach-u300/gpio.c b/arch/arm/mach-u300/gpio.c
index 94837a4e146b..d92790140fe5 100644
--- a/arch/arm/mach-u300/gpio.c
+++ b/arch/arm/mach-u300/gpio.c
@@ -581,7 +581,8 @@ static int __init gpio_probe(struct platform_device *pdev)
 	if (!memres)
 		goto err_no_resource;
 
-	if (!request_mem_region(memres->start, resource_size(memres), "GPIO Controller")) {
+	if (request_mem_region(memres->start, memres->end - memres->start, "GPIO Controller")
+	    == NULL) {
 		err = -ENODEV;
 		goto err_no_ioregion;
 	}
@@ -639,7 +640,7 @@ static int __init gpio_probe(struct platform_device *pdev)
 		free_irq(gpio_ports[i].irq, &gpio_ports[i]);
 	iounmap(virtbase);
  err_no_ioremap:
-	release_mem_region(memres->start, resource_size(memres));
+	release_mem_region(memres->start, memres->end - memres->start);
  err_no_ioregion:
  err_no_resource:
 	clk_disable(clk);
@@ -659,7 +660,7 @@ static int __exit gpio_remove(struct platform_device *pdev)
 	for (i = 0 ; i < U300_GPIO_NUM_PORTS; i++)
 		free_irq(gpio_ports[i].irq, &gpio_ports[i]);
 	iounmap(virtbase);
-	release_mem_region(memres->start, resource_size(memres));
+	release_mem_region(memres->start, memres->end - memres->start);
 	clk_disable(clk);
 	clk_put(clk);
 	return 0;