aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-06-09 12:13:32 -0400
committerJiri Kosina <jkosina@suse.cz>2011-06-10 08:55:36 -0400
commit28f65c11f2ffb3957259dece647a24f8ad2e241b (patch)
tree6b7621d09d10df89eedd908d4506fb9f457a909f /drivers/ide
parent140a1ef2f91a00e1d25f0878c193abdc25bf6ebe (diff)
treewide: Convert uses of struct resource to resource_size(ptr)
Several fixes as well where the +1 was missing. Done via coccinelle scripts like: @@ struct resource *ptr; @@ - ptr->end - ptr->start + 1 + resource_size(ptr) and some grep and typing. Mostly uncompiled, no cross-compilers. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/palm_bk3710.c2
-rw-r--r--drivers/ide/tx4939ide.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index 9e8f4e1b0cc9..712c7904d03e 100644
--- a/drivers/ide/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
@@ -342,7 +342,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
342 return -ENODEV; 342 return -ENODEV;
343 } 343 }
344 344
345 mem_size = mem->end - mem->start + 1; 345 mem_size = resource_size(mem);
346 if (request_mem_region(mem->start, mem_size, "palm_bk3710") == NULL) { 346 if (request_mem_region(mem->start, mem_size, "palm_bk3710") == NULL) {
347 printk(KERN_ERR "failed to request memory region\n"); 347 printk(KERN_ERR "failed to request memory region\n");
348 return -EBUSY; 348 return -EBUSY;
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index bed3e39aac96..71c231954972 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -551,10 +551,10 @@ static int __init tx4939ide_probe(struct platform_device *pdev)
551 return -ENODEV; 551 return -ENODEV;
552 552
553 if (!devm_request_mem_region(&pdev->dev, res->start, 553 if (!devm_request_mem_region(&pdev->dev, res->start,
554 res->end - res->start + 1, "tx4938ide")) 554 resource_size(res), "tx4938ide"))
555 return -EBUSY; 555 return -EBUSY;
556 mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start, 556 mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
557 res->end - res->start + 1); 557 resource_size(res));
558 if (!mapbase) 558 if (!mapbase)
559 return -EBUSY; 559 return -EBUSY;
560 memset(&hw, 0, sizeof(hw)); 560 memset(&hw, 0, sizeof(hw));