Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arun Parameswaran <arun.parameswaran@broadcom.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Arun Parameswaran and committed by
David S. Miller
0fe2cd56 5634cb2b

+2 -5
+2 -5
drivers/net/phy/mdio-mux-bcm-iproc.c
··· 198 198 return PTR_ERR(md->base); 199 199 } 200 200 201 - md->mii_bus = mdiobus_alloc(); 201 + md->mii_bus = devm_mdiobus_alloc(&pdev->dev); 202 202 if (!md->mii_bus) { 203 203 dev_err(&pdev->dev, "mdiomux bus alloc failed\n"); 204 204 return -ENOMEM; ··· 217 217 rc = mdiobus_register(bus); 218 218 if (rc) { 219 219 dev_err(&pdev->dev, "mdiomux registration failed\n"); 220 - goto out; 220 + return rc; 221 221 } 222 222 223 223 platform_set_drvdata(pdev, md); ··· 236 236 237 237 out_register: 238 238 mdiobus_unregister(bus); 239 - out: 240 - mdiobus_free(bus); 241 239 return rc; 242 240 } 243 241 ··· 245 247 246 248 mdio_mux_uninit(md->mux_handle); 247 249 mdiobus_unregister(md->mii_bus); 248 - mdiobus_free(md->mii_bus); 249 250 250 251 return 0; 251 252 }