aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/xilinx_ps2.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2010-01-21 23:52:37 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-24 22:41:49 -0800
commitce841b945b84bf7360aa32e60ddaa1e9ccae3e96 (patch)
tree7572c9a83fac2956b6502c90d021b28cc876689c /drivers/input/serio/xilinx_ps2.c
parentMerge commit 'v2.6.33-rc5' into next (diff)
downloadlinux-dev-ce841b945b84bf7360aa32e60ddaa1e9ccae3e96.tar.xz
linux-dev-ce841b945b84bf7360aa32e60ddaa1e9ccae3e96.zip
Input: xilinx_ps2 - use resource_size
Use the resource_size inline function instead of manually calculating the resource size. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: John Linn <john.linn@xilinx.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/xilinx_ps2.c')
-rw-r--r--drivers/input/serio/xilinx_ps2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 78c64fb8a4b0..8298e1f68234 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -270,7 +270,7 @@ static int __devinit xps2_of_probe(struct of_device *ofdev,
drvdata->irq = r_irq.start;
phys_addr = r_mem.start;
- remap_size = r_mem.end - r_mem.start + 1;
+ remap_size = resource_size(&r_mem);
if (!request_mem_region(phys_addr, remap_size, DRIVER_NAME)) {
dev_err(dev, "Couldn't lock memory region at 0x%08llX\n",
(unsigned long long)phys_addr);
@@ -344,7 +344,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev)
if (of_address_to_resource(of_dev->node, 0, &r_mem))
dev_err(dev, "invalid address\n");
else
- release_mem_region(r_mem.start, r_mem.end - r_mem.start + 1);
+ release_mem_region(r_mem.start, resource_size(&r_mem));
kfree(drvdata);