xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: davinci_mdio: use devm_* api

Browse Source 
Use devm_* API for memory allocation and to get device's clock
to simplify driver's code.

Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-and-tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Grygorii Strashko
2014-04-30 15:23:34 +03:00
committed by David S. Miller
parent 6d48f44b7b
commit 50d0636eef
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/ti/davinci_mdio.c
View File

@@ -321,15 +321,14 @@ static int davinci_mdio_probe(struct platform_device *pdev)
struct phy_device *phy; struct phy_device *phy;
int ret, addr; int ret, addr;
data = kzalloc(sizeof(*data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
data->bus = mdiobus_alloc(); data->bus = devm_mdiobus_alloc(dev);
if (!data->bus) { if (!data->bus) {
dev_err(dev, "failed to alloc mii bus\n"); dev_err(dev, "failed to alloc mii bus\n");
ret = -ENOMEM; return -ENOMEM;
goto bail_out;
} }
if (dev->of_node) { if (dev->of_node) {
@@ -354,7 +353,7 @@ static int davinci_mdio_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
pm_runtime_get_sync(&pdev->dev); pm_runtime_get_sync(&pdev->dev);
data->clk = clk_get(&pdev->dev, "fck"); data->clk = devm_clk_get(dev, "fck");
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk)) {
dev_err(dev, "failed to get device clock\n"); dev_err(dev, "failed to get device clock\n");
ret = PTR_ERR(data->clk); ret = PTR_ERR(data->clk);
@@ -406,16 +405,9 @@ static int davinci_mdio_probe(struct platform_device *pdev)
return 0; return 0;
bail_out: bail_out:
if (data->bus)
mdiobus_free(data->bus);
if (data->clk)
clk_put(data->clk);
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
kfree(data);
return ret; return ret;
} }
@@ -423,18 +415,12 @@ static int davinci_mdio_remove(struct platform_device *pdev)
{ {
struct davinci_mdio_data *data = platform_get_drvdata(pdev); struct davinci_mdio_data *data = platform_get_drvdata(pdev);
if (data->bus) { if (data->bus)
mdiobus_unregister(data->bus); mdiobus_unregister(data->bus);
mdiobus_free(data->bus);
}
if (data->clk)
clk_put(data->clk);
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
kfree(data);
return 0; return 0;
} }