From 7ef2879c9eee38855f59408500d293c66f0d16e3 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 30 Jul 2012 16:43:40 +0200 Subject: [PATCH] --- yaml --- r: 325815 b: refs/heads/master c: f1d4eb788a007e3816132e6d1d28c25a64e86d24 h: refs/heads/master i: 325813: 9d3ff446c5fdf3f5cfb741125a6ea732ae3898a9 325811: 6eafcfc218d057f196f062df3770b0a7e68a444e 325807: fab473ac5c1e26043cd9b511df1b3783122fcb2d v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-vt8500.c | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index d65f14d55987..366d96a2a633 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc2ff98ffa52d36b5df925a1f783ff2e035ed55e +refs/heads/master: f1d4eb788a007e3816132e6d1d28c25a64e86d24 diff --git a/trunk/drivers/usb/host/ehci-vt8500.c b/trunk/drivers/usb/host/ehci-vt8500.c index 4d147c4e33f5..a8916177bed7 100644 --- a/trunk/drivers/usb/host/ehci-vt8500.c +++ b/trunk/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); - 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; - goto err2; + goto err1; } ehci = hcd_to_ehci(hcd); @@ -129,9 +123,6 @@ static int vt8500_ehci_drv_probe(struct platform_device *pdev) return ret; } - iounmap(hcd->regs); -err2: - release_mem_region(hcd->rsrc_start, hcd->rsrc_len); 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); - iounmap(hcd->regs); - release_mem_region(hcd->rsrc_start, hcd->rsrc_len); usb_put_hcd(hcd); platform_set_drvdata(pdev, NULL);