]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
net: phy: fixed-phy: Make the error path simpler
authorFabio Estevam <fabio.estevam@nxp.com>
Sun, 24 Jun 2018 00:28:22 +0000 (21:28 -0300)
committerDavid S. Miller <davem@davemloft.net>
Sun, 24 Jun 2018 07:41:58 +0000 (16:41 +0900)
When platform_device_register_simple() fails we can return
the error immediately instead of jumping to the 'err_pdev'
label.

This makes the error path a bit simpler.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/fixed_phy.c

index 001fe1df75572687e527c34eb608370d446bc670..67b260877f305a33c8a8b4aa37d5862478fe7835 100644 (file)
@@ -259,10 +259,8 @@ static int __init fixed_mdio_bus_init(void)
        int ret;
 
        pdev = platform_device_register_simple("Fixed MDIO bus", 0, NULL, 0);
-       if (IS_ERR(pdev)) {
-               ret = PTR_ERR(pdev);
-               goto err_pdev;
-       }
+       if (IS_ERR(pdev))
+               return PTR_ERR(pdev);
 
        fmb->mii_bus = mdiobus_alloc();
        if (fmb->mii_bus == NULL) {
@@ -287,7 +285,6 @@ err_mdiobus_alloc:
        mdiobus_free(fmb->mii_bus);
 err_mdiobus_reg:
        platform_device_unregister(pdev);
-err_pdev:
        return ret;
 }
 module_init(fixed_mdio_bus_init);