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

Commit e33e640a authored by Russell King's avatar Russell King
Browse files

pcmcia: sa11x0: convert memory allocation to devm_* API 



Convert the sa11x0 socket driver memory allocation to use devm_kzalloc()
to simplify the cleanup path.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 72010aca

drivers/pcmcia/sa1100_generic.c

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev) 
	for (i = 0; i < sinfo->nskt; i++)

		soc_pcmcia_remove_one(&sinfo->skt[i]);



	kfree(sinfo);

	return 0;

}

drivers/pcmcia/sa11xx_base.c

+1 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, 


	sa11xx_drv_pcmcia_ops(ops);



	sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL);

	sinfo = devm_kzalloc(dev, SKT_DEV_INFO_SIZE(nr), GFP_KERNEL);

	if (!sinfo)

		return -ENOMEM;
@@ -251,7 +251,6 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, 
	if (ret) {

		while (--i >= 0)

			soc_pcmcia_remove_one(&sinfo->skt[i]);

		kfree(sinfo);

	} else {

		dev_set_drvdata(dev, sinfo);

	}