drivers/usb/host/ehci-tegra.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses these functions for data that is allocated in
the probe function of a platform device and is only freed in the remove
function.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 950e95efa381bce88d7c6c148ac90609755ee83b..ba5039f1c5c2d84e653c4f16885cb90be71ed212 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -634,7 +634,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
        setup_vbus_gpio(pdev, pdata);
 
-       tegra = kzalloc(sizeof(struct tegra_ehci_hcd), GFP_KERNEL);
+       tegra = devm_kzalloc(&pdev->dev, sizeof(struct tegra_ehci_hcd),
+                            GFP_KERNEL);
        if (!tegra)
                return -ENOMEM;
 
@@ -642,13 +643,12 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                                        dev_name(&pdev->dev));
        if (!hcd) {
                dev_err(&pdev->dev, "Unable to create HCD\n");
-               err = -ENOMEM;
-               goto fail_hcd;
+               return -ENOMEM;
        }
 
        platform_set_drvdata(pdev, tegra);
 
-       tegra->clk = clk_get(&pdev->dev, NULL);
+       tegra->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(tegra->clk)) {
                dev_err(&pdev->dev, "Can't get ehci clock\n");
                err = PTR_ERR(tegra->clk);
@@ -657,9 +657,9 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
        err = clk_prepare_enable(tegra->clk);
        if (err)
-               goto fail_clken;
+               goto fail_clk;
 
-       tegra->emc_clk = clk_get(&pdev->dev, "emc");
+       tegra->emc_clk = devm_clk_get(&pdev->dev, "emc");
        if (IS_ERR(tegra->emc_clk)) {
                dev_err(&pdev->dev, "Can't get emc clock\n");
                err = PTR_ERR(tegra->emc_clk);
@@ -677,7 +677,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
        }
        hcd->rsrc_start = res->start;
        hcd->rsrc_len = resource_size(res);
-       hcd->regs = ioremap(res->start, resource_size(res));
+       hcd->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (!hcd->regs) {
                dev_err(&pdev->dev, "Failed to remap I/O memory\n");
                err = -ENOMEM;
@@ -702,7 +702,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                default:
                        err = -ENODEV;
                        dev_err(&pdev->dev, "unknown usb instance\n");
-                       goto fail_phy;
+                       goto fail_io;
                }
        }
 
@@ -712,7 +712,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
        if (IS_ERR(tegra->phy)) {
                dev_err(&pdev->dev, "Failed to open USB phy\n");
                err = -ENXIO;
-               goto fail_phy;
+               goto fail_io;
        }
 
        err = tegra_usb_phy_power_on(tegra->phy);
@@ -733,7 +733,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_USB_OTG_UTILS
        if (pdata->operating_mode == TEGRA_USB_OTG) {
-               tegra->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
+               tegra->transceiver =
+                       devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
                if (!IS_ERR_OR_NULL(tegra->transceiver))
                        otg_set_host(tegra->transceiver->otg, &hcd->self);
        }
@@ -757,25 +758,16 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 fail:
 #ifdef CONFIG_USB_OTG_UTILS
-       if (!IS_ERR_OR_NULL(tegra->transceiver)) {
+       if (!IS_ERR_OR_NULL(tegra->transceiver))
                otg_set_host(tegra->transceiver->otg, NULL);
-               usb_put_phy(tegra->transceiver);
-       }
 #endif
        tegra_usb_phy_close(tegra->phy);
-fail_phy:
-       iounmap(hcd->regs);
 fail_io:
        clk_disable_unprepare(tegra->emc_clk);
-       clk_put(tegra->emc_clk);
 fail_emc_clk:
        clk_disable_unprepare(tegra->clk);
-fail_clken:
-       clk_put(tegra->clk);
 fail_clk:
        usb_put_hcd(hcd);
-fail_hcd:
-       kfree(tegra);
        return err;
 }
 
@@ -792,25 +784,19 @@ static int tegra_ehci_remove(struct platform_device *pdev)
        pm_runtime_put_noidle(&pdev->dev);
 
 #ifdef CONFIG_USB_OTG_UTILS
-       if (!IS_ERR_OR_NULL(tegra->transceiver)) {
+       if (!IS_ERR_OR_NULL(tegra->transceiver))
                otg_set_host(tegra->transceiver->otg, NULL);
-               usb_put_phy(tegra->transceiver);
-       }
 #endif
 
        usb_remove_hcd(hcd);
        usb_put_hcd(hcd);
 
        tegra_usb_phy_close(tegra->phy);
-       iounmap(hcd->regs);
 
        clk_disable_unprepare(tegra->clk);
-       clk_put(tegra->clk);
 
        clk_disable_unprepare(tegra->emc_clk);
-       clk_put(tegra->emc_clk);
 
-       kfree(tegra);
        return 0;
 }