net/fsl-pq-mdio: coalesce multiple memory allocations into one

Take advantage of the new mdiobus_alloc_size() function to combine three
different memory allocations into one.  This also simplies the error
handling.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index 7eef1bb0a65f8faf62bab5c1c7409c5095dde240..ebd4638b49770eb966707f5527869802ed870bed 100644 (file)
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -68,6 +68,7 @@ struct fsl_pq_mdio {
 struct fsl_pq_mdio_priv {
        void __iomem *map;
        struct fsl_pq_mii __iomem *regs;
+       int irqs[PHY_MAX_ADDR];
 };
 
 /*
@@ -359,26 +360,21 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "found %s compatible node\n", id->compatible);
 
-       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-       if (!priv)
+       new_bus = mdiobus_alloc_size(sizeof(*priv));
+       if (!new_bus)
                return -ENOMEM;
 
-       new_bus = mdiobus_alloc();
-       if (!new_bus) {
-               err = -ENOMEM;
-               goto err_free_priv;
-       }
-
+       priv = new_bus->priv;
        new_bus->name = "Freescale PowerQUICC MII Bus",
        new_bus->read = &fsl_pq_mdio_read;
        new_bus->write = &fsl_pq_mdio_write;
        new_bus->reset = &fsl_pq_mdio_reset;
-       new_bus->priv = priv;
+       new_bus->irq = priv->irqs;
 
        err = of_address_to_resource(np, 0, &res);
        if (err < 0) {
                dev_err(&pdev->dev, "could not obtain address information\n");
-               goto err_free_bus;
+               goto error;
        }
 
        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s@%llx", np->name,
@@ -387,7 +383,7 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
        priv->map = of_iomap(np, 0);
        if (!priv->map) {
                err = -ENOMEM;
-               goto err_free_bus;
+               goto error;
        }
 
        /*
@@ -399,16 +395,10 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
        if (data->mii_offset > resource_size(&res)) {
                dev_err(&pdev->dev, "invalid register map\n");
                err = -EINVAL;
-               goto err_unmap_regs;
+               goto error;
        }
        priv->regs = priv->map + data->mii_offset;
 
-       new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
-       if (NULL == new_bus->irq) {
-               err = -ENOMEM;
-               goto err_unmap_regs;
-       }
-
        new_bus->parent = &pdev->dev;
        dev_set_drvdata(&pdev->dev, new_bus);
 
@@ -446,19 +436,17 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
        if (err) {
                dev_err(&pdev->dev, "cannot register %s as MDIO bus\n",
                        new_bus->name);
-               goto err_free_irqs;
+               goto error;
        }
 
        return 0;
 
-err_free_irqs:
-       kfree(new_bus->irq);
-err_unmap_regs:
-       iounmap(priv->map);
-err_free_bus:
+error:
+       if (priv->map)
+               iounmap(priv->map);
+
        kfree(new_bus);
-err_free_priv:
-       kfree(priv);
+
        return err;
 }
 
@@ -474,9 +462,7 @@ static int fsl_pq_mdio_remove(struct platform_device *pdev)
        dev_set_drvdata(device, NULL);
 
        iounmap(priv->map);
-       bus->priv = NULL;
        mdiobus_free(bus);
-       kfree(priv);
 
        return 0;
 }