Re: [PATCH] net: mv643xx_eth: use managed devm_kzalloc

[Sebastian Hesselbarth]

On 04/10/2013 08:41 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 04/10/2013 09:38 PM, Sebastian Hesselbarth wrote:
>
> > This patch moves shared private data kzalloc to managed devm_kzalloc and
> > cleans now unneccessary kfree and error handling.
> >
> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>
> > ---
> > Note that there is also an ioremap call, that could be transferred to
> > devm_ioremap_resource. But as long as mv643xx_eth and mvmdio iomem
> > resources overlap, this will throw -EBUSY.
> >
> > Cc: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
> > Cc: Andrew Lunn <andrew@xxxxxxx>
> > Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
> > Cc: Florian Fainelli <florian@xxxxxxxxxxx>
> > Cc: netdev@xxxxxxxxxxxxxxx
> > Cc: linux-kernel@xxxxxxxxxxxxxxx
> > ---
> > drivers/net/ethernet/marvell/mv643xx_eth.c | 17 ++++-------------
> > 1 file changed, 4 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c
> > b/drivers/net/ethernet/marvell/mv643xx_eth.c
> > index bbe6104..955baab 100644
> > --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
> > +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
> > @@ -2547,25 +2547,22 @@ static int mv643xx_eth_shared_probe(struct
> > platform_device *pdev)
> > struct mv643xx_eth_shared_private *msp;
> > const struct mbus_dram_target_info *dram;
> > struct resource *res;
> > - int ret;
> > if (!mv643xx_eth_version_printed++)
> > pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n",
> > mv643xx_eth_driver_version);
> > - ret = -EINVAL;
> > res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > if (res == NULL)
> > - goto out;
> > + return -EINVAL;
> > - ret = -ENOMEM;
> > - msp = kzalloc(sizeof(*msp), GFP_KERNEL);
> > + msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
> > if (msp == NULL)
> > - goto out;
> > + return -ENOMEM;
> > msp->base = ioremap(res->start, resource_size(res));
> > if (msp->base == NULL)
> > - goto out_free;
> > + return -EADDRNOTAVAIL;
>
> -ENOMEM usually.

Sergei,

I was looking at the example for devm_request_and_ioremap() in
lib/devres.c. There it is -EADDRNOTAVAIL which is returned on
failing ioremap.

Actually, I was hoping to also use devm_ioremap_resource() for
the above, but that is too early as mv643xx_eth and mvmdio have
overlapping mem resources. Changing this will require some more
step-by-step patches that get also tested on arch/ppc and others
using platform mv643xx_eth.

But, I can send an updated patch with -ENOMEM above if required.

Sebastian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/