diff options
author | Julia Lawall <julia@diku.dk> | 2009-07-08 01:04:55 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-08 01:48:14 -0400 |
commit | 72398e4b1a4cf55d3698a4f265b638093a470b04 (patch) | |
tree | 497fd88ccf5d3984b9585f52139e2e3b35bf8798 /drivers/input/touchscreen/w90p910_ts.c | |
parent | 666cbe342622c959ad95515918a1c1f8210c93f2 (diff) |
Input: use resource_size when allocating resources
Use the function resource_size, which reduces the chance of
introducing off-by-one errors in calculating the resource size.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
struct resource *res;
@@
- (res->end - res->start) + 1
+ resource_size(res)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/w90p910_ts.c')
-rw-r--r-- | drivers/input/touchscreen/w90p910_ts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c index 6071f5882572..b3e782fdd2bb 100644 --- a/drivers/input/touchscreen/w90p910_ts.c +++ b/drivers/input/touchscreen/w90p910_ts.c | |||
@@ -241,13 +241,13 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev) | |||
241 | goto fail1; | 241 | goto fail1; |
242 | } | 242 | } |
243 | 243 | ||
244 | if (!request_mem_region(res->start, res->end - res->start + 1, | 244 | if (!request_mem_region(res->start, resource_size(res), |
245 | pdev->name)) { | 245 | pdev->name)) { |
246 | err = -EBUSY; | 246 | err = -EBUSY; |
247 | goto fail1; | 247 | goto fail1; |
248 | } | 248 | } |
249 | 249 | ||
250 | w90p910_ts->ts_reg = ioremap(res->start, res->end - res->start + 1); | 250 | w90p910_ts->ts_reg = ioremap(res->start, resource_size(res)); |
251 | if (!w90p910_ts->ts_reg) { | 251 | if (!w90p910_ts->ts_reg) { |
252 | err = -ENOMEM; | 252 | err = -ENOMEM; |
253 | goto fail2; | 253 | goto fail2; |
@@ -296,7 +296,7 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev) | |||
296 | 296 | ||
297 | fail4: free_irq(w90p910_ts->irq_num, w90p910_ts); | 297 | fail4: free_irq(w90p910_ts->irq_num, w90p910_ts); |
298 | fail3: iounmap(w90p910_ts->ts_reg); | 298 | fail3: iounmap(w90p910_ts->ts_reg); |
299 | fail2: release_mem_region(res->start, res->end - res->start + 1); | 299 | fail2: release_mem_region(res->start, resource_size(res)); |
300 | fail1: input_free_device(input_dev); | 300 | fail1: input_free_device(input_dev); |
301 | kfree(w90p910_ts); | 301 | kfree(w90p910_ts); |
302 | return err; | 302 | return err; |
@@ -312,7 +312,7 @@ static int __devexit w90x900ts_remove(struct platform_device *pdev) | |||
312 | iounmap(w90p910_ts->ts_reg); | 312 | iounmap(w90p910_ts->ts_reg); |
313 | 313 | ||
314 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 314 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
315 | release_mem_region(res->start, res->end - res->start + 1); | 315 | release_mem_region(res->start, resource_size(res)); |
316 | 316 | ||
317 | input_unregister_device(w90p910_ts->input); | 317 | input_unregister_device(w90p910_ts->input); |
318 | kfree(w90p910_ts); | 318 | kfree(w90p910_ts); |