Input: pxa27x_keypad - Use resource_size

Commit Message

Tobias Klauser Sept. 18, 2009, 7:13 a.m. UTC

Use resource size from linux/ioport.h instead of the private macro
res_size.

Signed-off-by: Tobias Klauser <[e-mail]>
---
 drivers/input/keyboard/pxa27x_keypad.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

Comments

Dmitry Torokhov Sept. 18, 2009, 7:58 a.m. UTC | #1

Hi Tobias,

On Fri, Sep 18, 2009 at 09:13:41AM +0200, Tobias Klauser wrote:
> Use resource size from linux/ioport.h instead of the private macro
> res_size.
> 
> Signed-off-by: Tobias Klauser <[e-mail]>

Thank you for the patch but a similar change has already been committed.

Patch

diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 0d2fc64..911cebc 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -425,8 +425,6 @@  static int pxa27x_keypad_resume(struct platform_device *pdev)
 #define pxa27x_keypad_resume	NULL
 #endif
 
-#define res_size(res)	((res)->end - (res)->start + 1)
-
 static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
 {
 	struct pxa27x_keypad *keypad;
@@ -461,14 +459,14 @@  static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
 		goto failed_free;
 	}
 
-	res = request_mem_region(res->start, res_size(res), pdev->name);
+	res = request_mem_region(res->start, resource_size(res), pdev->name);
 	if (res == NULL) {
 		dev_err(&pdev->dev, "failed to request I/O memory\n");
 		error = -EBUSY;
 		goto failed_free;
 	}
 
-	keypad->mmio_base = ioremap(res->start, res_size(res));
+	keypad->mmio_base = ioremap(res->start, resource_size(res));
 	if (keypad->mmio_base == NULL) {
 		dev_err(&pdev->dev, "failed to remap I/O memory\n");
 		error = -ENXIO;
@@ -540,7 +538,7 @@  failed_put_clk:
 failed_free_io:
 	iounmap(keypad->mmio_base);
 failed_free_mem:
-	release_mem_region(res->start, res_size(res));
+	release_mem_region(res->start, resource_size(res));
 failed_free:
 	kfree(keypad);
 	return error;
@@ -562,7 +560,7 @@  static int __devexit pxa27x_keypad_remove(struct platform_device *pdev)
 	iounmap(keypad->mmio_base);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	release_mem_region(res->start, res_size(res));
+	release_mem_region(res->start, resource_size(res));
 
 	platform_set_drvdata(pdev, NULL);
 	kfree(keypad);