From fab473ac5c1e26043cd9b511df1b3783122fcb2d Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 29 Jul 2012 21:46:11 +0200 Subject: [PATCH] --- yaml --- r: 325807 b: refs/heads/master c: df5eb3ffa8bfd23be8189cb0c58ed0c4902b6bfd h: refs/heads/master i: 325805: ddbe75b140e1c731f970dd5e8d0706d1d1eee192 325803: b4645a1171792e80040e7b552734a9722f5f623e 325799: 72ef7d53027068d99548373c567ab2299c5727e4 325791: 3270a8204e2d1709e819a11475f5f888ebe61d4a v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-msm.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b6b10666d220..1dd94cc4df23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84b79838b9bcf7a9c2c09f4de930b8d476f1e70b +refs/heads/master: df5eb3ffa8bfd23be8189cb0c58ed0c4902b6bfd diff --git a/trunk/drivers/usb/host/ehci-msm.c b/trunk/drivers/usb/host/ehci-msm.c index 17dd9e94001e..4af4dc5b618c 100644 --- a/trunk/drivers/usb/host/ehci-msm.c +++ b/trunk/drivers/usb/host/ehci-msm.c @@ -133,7 +133,7 @@ static int ehci_msm_probe(struct platform_device *pdev) hcd->rsrc_start = res->start; hcd->rsrc_len = resource_size(res); - hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); + hcd->regs = devm_ioremap(&pdev->dev, hcd->rsrc_start, hcd->rsrc_len); if (!hcd->regs) { dev_err(&pdev->dev, "ioremap failed\n"); ret = -ENOMEM; @@ -145,17 +145,17 @@ static int ehci_msm_probe(struct platform_device *pdev) * powering up VBUS, mapping of registers address space and power * management. */ - phy = usb_get_phy(USB_PHY_TYPE_USB2); + phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); if (IS_ERR_OR_NULL(phy)) { dev_err(&pdev->dev, "unable to find transceiver\n"); ret = -ENODEV; - goto unmap; + goto put_hcd; } ret = otg_set_host(phy->otg, &hcd->self); if (ret < 0) { dev_err(&pdev->dev, "unable to register with transceiver\n"); - goto put_transceiver; + goto put_hcd; } device_init_wakeup(&pdev->dev, 1); @@ -168,10 +168,6 @@ static int ehci_msm_probe(struct platform_device *pdev) return 0; -put_transceiver: - usb_put_phy(phy); -unmap: - iounmap(hcd->regs); put_hcd: usb_put_hcd(hcd); @@ -187,7 +183,6 @@ static int __devexit ehci_msm_remove(struct platform_device *pdev) pm_runtime_set_suspended(&pdev->dev); otg_set_host(phy->otg, NULL); - usb_put_phy(phy); usb_put_hcd(hcd);