Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 727f957a authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by David S. Miller
Browse files

net: mv643xx_eth: use managed devm_kzalloc 



This patch moves shared private data kzalloc to managed devm_kzalloc and
cleans now unneccessary kfree and error handling.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20922486

drivers/net/ethernet/marvell/mv643xx_eth.c

+4 −13
Original line number Diff line number Diff line
@@ -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 -ENOMEM;



	msp->clk = devm_clk_get(&pdev->dev, NULL);

	if (!IS_ERR(msp->clk))
@@ -2585,11 +2582,6 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, msp);



	return 0;



out_free:

	kfree(msp);

out:

	return ret;

}



static int mv643xx_eth_shared_remove(struct platform_device *pdev)
@@ -2599,7 +2591,6 @@ static int mv643xx_eth_shared_remove(struct platform_device *pdev) 
	iounmap(msp->base);

	if (!IS_ERR(msp->clk))

		clk_disable_unprepare(msp->clk);

	kfree(msp);



	return 0;

}