projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/usb/host/ehci-vt8500.c: use devm_ functions
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
usb
/
host
/
ehci-vt8500.c
diff --git
a/drivers/usb/host/ehci-vt8500.c
b/drivers/usb/host/ehci-vt8500.c
index 4d147c4e33f5343802787d5db358b25fcfae0244..a8916177bed7ade9a08f829739d7894ede4de2e5 100644
(file)
--- a/
drivers/usb/host/ehci-vt8500.c
+++ b/
drivers/usb/host/ehci-vt8500.c
@@
-106,17
+106,11
@@
static int vt8500_ehci_drv_probe(struct platform_device *pdev)
hcd->rsrc_start = res->start;
hcd->rsrc_len = resource_size(res);
hcd->rsrc_start = res->start;
hcd->rsrc_len = resource_size(res);
- if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
- pr_debug("request_mem_region failed");
- ret = -EBUSY;
- goto err1;
- }
-
- hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+ hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
if (!hcd->regs) {
pr_debug("ioremap failed");
ret = -ENOMEM;
if (!hcd->regs) {
pr_debug("ioremap failed");
ret = -ENOMEM;
- goto err
2
;
+ goto err
1
;
}
ehci = hcd_to_ehci(hcd);
}
ehci = hcd_to_ehci(hcd);
@@
-129,9
+123,6
@@
static int vt8500_ehci_drv_probe(struct platform_device *pdev)
return ret;
}
return ret;
}
- iounmap(hcd->regs);
-err2:
- release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err1:
usb_put_hcd(hcd);
return ret;
err1:
usb_put_hcd(hcd);
return ret;
@@
-142,8
+133,6
@@
static int vt8500_ehci_drv_remove(struct platform_device *pdev)
struct usb_hcd *hcd = platform_get_drvdata(pdev);
usb_remove_hcd(hcd);
struct usb_hcd *hcd = platform_get_drvdata(pdev);
usb_remove_hcd(hcd);
- iounmap(hcd->regs);
- release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd);
platform_set_drvdata(pdev, NULL);
usb_put_hcd(hcd);
platform_set_drvdata(pdev, NULL);