[PATCH 87/133] [Jaunty SRU] ARM.imx51 Freescale:ENGR00112611 use resource_size instead of 'r->end - r->start + 1' in usb dirver.
Brad Figg
brad.figg at canonical.com
Thu Jul 9 16:49:17 UTC 2009
Use resource_size() to get memory resource size instead of
'r->end - r->start + 1' in linux 2.6.28 usb driver.
Signed-off-by: Li Jun <r65092 at freescale.com>
Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
drivers/usb/gadget/arcotg_udc.c | 9 +++++----
drivers/usb/host/ehci-arc.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c
index be979e8..2c2bc92 100644
--- a/drivers/usb/gadget/arcotg_udc.c
+++ b/drivers/usb/gadget/arcotg_udc.c
@@ -2599,14 +2599,15 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
goto err1a;
}
- if (!request_mem_region(res->start, res->end - res->start + 1,
+ if (!request_mem_region(res->start, resource_size(res),
driver_name)) {
ERR("request mem region for %s failed \n", pdev->name);
ret = -EBUSY;
goto err1a;
}
#endif
- dr_regs = ioremap(res->start, res->end - res->start + 1);
+ dr_regs = ioremap(res->start, resource_size(res));
+
if (!dr_regs) {
ret = -ENOMEM;
goto err1;
@@ -2741,7 +2742,7 @@ err2a:
iounmap(dr_regs);
err1:
if (!udc_controller->transceiver)
- release_mem_region(res->start, res->end - res->start + 1);
+ release_mem_region(res->start, resource_size(res));
err1a:
kfree(udc_controller);
udc_controller = NULL;
@@ -2780,7 +2781,7 @@ static int __exit fsl_udc_remove(struct platform_device *pdev)
#ifndef CONFIG_USB_OTG
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(res->start, res->end - res->start + 1);
+ release_mem_region(res->start, resource_size(res));
#endif
device_unregister(&udc_controller->gadget.dev);
diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c
index 49c5347..a0c46fb 100644
--- a/drivers/usb/host/ehci-arc.c
+++ b/drivers/usb/host/ehci-arc.c
@@ -170,7 +170,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
hcd->rsrc_start = res->start;
- hcd->rsrc_len = res->end - res->start + 1;
+ hcd->rsrc_len = resource_size(res);
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
driver->description)) {
--
1.6.0.4
More information about the kernel-team
mailing list