|
@@ -519,23 +519,23 @@ static int davinci_probe(struct platform_device *pdev)
|
|
|
|
|
|
int ret = -ENOMEM;
|
|
|
|
|
|
- glue = kzalloc(sizeof(*glue), GFP_KERNEL);
|
|
|
+ glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
|
|
|
if (!glue) {
|
|
|
dev_err(&pdev->dev, "failed to allocate glue context\n");
|
|
|
goto err0;
|
|
|
}
|
|
|
|
|
|
- clk = clk_get(&pdev->dev, "usb");
|
|
|
+ clk = devm_clk_get(&pdev->dev, "usb");
|
|
|
if (IS_ERR(clk)) {
|
|
|
dev_err(&pdev->dev, "failed to get clock\n");
|
|
|
ret = PTR_ERR(clk);
|
|
|
- goto err3;
|
|
|
+ goto err0;
|
|
|
}
|
|
|
|
|
|
ret = clk_enable(clk);
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev, "failed to enable clock\n");
|
|
|
- goto err4;
|
|
|
+ goto err0;
|
|
|
}
|
|
|
|
|
|
glue->dev = &pdev->dev;
|
|
@@ -579,20 +579,14 @@ static int davinci_probe(struct platform_device *pdev)
|
|
|
if (IS_ERR(musb)) {
|
|
|
ret = PTR_ERR(musb);
|
|
|
dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);
|
|
|
- goto err5;
|
|
|
+ goto err1;
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-err5:
|
|
|
+err1:
|
|
|
clk_disable(clk);
|
|
|
|
|
|
-err4:
|
|
|
- clk_put(clk);
|
|
|
-
|
|
|
-err3:
|
|
|
- kfree(glue);
|
|
|
-
|
|
|
err0:
|
|
|
return ret;
|
|
|
}
|
|
@@ -604,8 +598,6 @@ static int davinci_remove(struct platform_device *pdev)
|
|
|
platform_device_unregister(glue->musb);
|
|
|
usb_phy_generic_unregister();
|
|
|
clk_disable(glue->clk);
|
|
|
- clk_put(glue->clk);
|
|
|
- kfree(glue);
|
|
|
|
|
|
return 0;
|
|
|
}
|