Commit 20b97dc1 authored by Jingoo Han's avatar Jingoo Han Committed by Felipe Balbi

usb: dwc3: exynos: use devm_ functions

The devm_ functions allocate memory that is released when a driver
detaches. This makes the code smaller and a bit simpler.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 5da93478
...@@ -95,13 +95,14 @@ static int dwc3_exynos_probe(struct platform_device *pdev) ...@@ -95,13 +95,14 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
struct platform_device *dwc3; struct platform_device *dwc3;
struct dwc3_exynos *exynos; struct dwc3_exynos *exynos;
struct clk *clk; struct clk *clk;
struct device *dev = &pdev->dev;
int ret = -ENOMEM; int ret = -ENOMEM;
exynos = kzalloc(sizeof(*exynos), GFP_KERNEL); exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
if (!exynos) { if (!exynos) {
dev_err(&pdev->dev, "not enough memory\n"); dev_err(dev, "not enough memory\n");
goto err0; return -ENOMEM;
} }
/* /*
...@@ -116,30 +117,30 @@ static int dwc3_exynos_probe(struct platform_device *pdev) ...@@ -116,30 +117,30 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
ret = dwc3_exynos_register_phys(exynos); ret = dwc3_exynos_register_phys(exynos);
if (ret) { if (ret) {
dev_err(&pdev->dev, "couldn't register PHYs\n"); dev_err(dev, "couldn't register PHYs\n");
goto err1; return ret;
} }
dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO); dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
if (!dwc3) { if (!dwc3) {
dev_err(&pdev->dev, "couldn't allocate dwc3 device\n"); dev_err(dev, "couldn't allocate dwc3 device\n");
goto err1; return -ENOMEM;
} }
clk = clk_get(&pdev->dev, "usbdrd30"); clk = devm_clk_get(dev, "usbdrd30");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "couldn't get clock\n"); dev_err(dev, "couldn't get clock\n");
ret = -EINVAL; ret = -EINVAL;
goto err3; goto err1;
} }
dma_set_coherent_mask(&dwc3->dev, pdev->dev.coherent_dma_mask); dma_set_coherent_mask(&dwc3->dev, dev->coherent_dma_mask);
dwc3->dev.parent = &pdev->dev; dwc3->dev.parent = dev;
dwc3->dev.dma_mask = pdev->dev.dma_mask; dwc3->dev.dma_mask = dev->dma_mask;
dwc3->dev.dma_parms = pdev->dev.dma_parms; dwc3->dev.dma_parms = dev->dma_parms;
exynos->dwc3 = dwc3; exynos->dwc3 = dwc3;
exynos->dev = &pdev->dev; exynos->dev = dev;
exynos->clk = clk; exynos->clk = clk;
clk_enable(exynos->clk); clk_enable(exynos->clk);
...@@ -147,26 +148,23 @@ static int dwc3_exynos_probe(struct platform_device *pdev) ...@@ -147,26 +148,23 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
ret = platform_device_add_resources(dwc3, pdev->resource, ret = platform_device_add_resources(dwc3, pdev->resource,
pdev->num_resources); pdev->num_resources);
if (ret) { if (ret) {
dev_err(&pdev->dev, "couldn't add resources to dwc3 device\n"); dev_err(dev, "couldn't add resources to dwc3 device\n");
goto err4; goto err2;
} }
ret = platform_device_add(dwc3); ret = platform_device_add(dwc3);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register dwc3 device\n"); dev_err(dev, "failed to register dwc3 device\n");
goto err4; goto err2;
} }
return 0; return 0;
err4: err2:
clk_disable(clk); clk_disable(clk);
clk_put(clk);
err3:
platform_device_put(dwc3);
err1: err1:
kfree(exynos); platform_device_put(dwc3);
err0:
return ret; return ret;
} }
...@@ -179,9 +177,6 @@ static int dwc3_exynos_remove(struct platform_device *pdev) ...@@ -179,9 +177,6 @@ static int dwc3_exynos_remove(struct platform_device *pdev)
platform_device_unregister(exynos->usb3_phy); platform_device_unregister(exynos->usb3_phy);
clk_disable(exynos->clk); clk_disable(exynos->clk);
clk_put(exynos->clk);
kfree(exynos);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment