Commit 0fe2cd56 authored by Arun Parameswaran's avatar Arun Parameswaran Committed by David S. Miller

net: phy: Use devm api for mdio bus allocation in bcm iproc mdio mux

Use devm_mdiobus_alloc() instead of mdiobus_alloc() in the Broadcom
iProc mdio mux driver.
Signed-off-by: default avatarArun Parameswaran <arun.parameswaran@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5634cb2b
...@@ -198,7 +198,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) ...@@ -198,7 +198,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
return PTR_ERR(md->base); return PTR_ERR(md->base);
} }
md->mii_bus = mdiobus_alloc(); md->mii_bus = devm_mdiobus_alloc(&pdev->dev);
if (!md->mii_bus) { if (!md->mii_bus) {
dev_err(&pdev->dev, "mdiomux bus alloc failed\n"); dev_err(&pdev->dev, "mdiomux bus alloc failed\n");
return -ENOMEM; return -ENOMEM;
...@@ -217,7 +217,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) ...@@ -217,7 +217,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
rc = mdiobus_register(bus); rc = mdiobus_register(bus);
if (rc) { if (rc) {
dev_err(&pdev->dev, "mdiomux registration failed\n"); dev_err(&pdev->dev, "mdiomux registration failed\n");
goto out; return rc;
} }
platform_set_drvdata(pdev, md); platform_set_drvdata(pdev, md);
...@@ -236,8 +236,6 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) ...@@ -236,8 +236,6 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
out_register: out_register:
mdiobus_unregister(bus); mdiobus_unregister(bus);
out:
mdiobus_free(bus);
return rc; return rc;
} }
...@@ -247,7 +245,6 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) ...@@ -247,7 +245,6 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev)
mdio_mux_uninit(md->mux_handle); mdio_mux_uninit(md->mux_handle);
mdiobus_unregister(md->mii_bus); mdiobus_unregister(md->mii_bus);
mdiobus_free(md->mii_bus);
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