Commit b38be288 authored by Sachin Kamat's avatar Sachin Kamat Committed by Brian Norris
Browse files

mtd: sst25l: Use devm_kzalloc



devm_kzalloc is device managed and makes code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent fcfd9f2d
Loading
Loading
Loading
Loading
+3 −9
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static int sst25l_probe(struct spi_device *spi)
	if (!flash_info)
		return -ENODEV;

	flash = kzalloc(sizeof(struct sst25l_flash), GFP_KERNEL);
	flash = devm_kzalloc(&spi->dev, sizeof(*flash), GFP_KERNEL);
	if (!flash)
		return -ENOMEM;

@@ -402,10 +402,8 @@ static int sst25l_probe(struct spi_device *spi)
	ret = mtd_device_parse_register(&flash->mtd, NULL, NULL,
					data ? data->parts : NULL,
					data ? data->nr_parts : 0);
	if (ret) {
		kfree(flash);
	if (ret)
		return -ENODEV;
	}

	return 0;
}
@@ -413,12 +411,8 @@ static int sst25l_probe(struct spi_device *spi)
static int sst25l_remove(struct spi_device *spi)
{
	struct sst25l_flash *flash = spi_get_drvdata(spi);
	int ret;

	ret = mtd_device_unregister(&flash->mtd);
	if (ret == 0)
		kfree(flash);
	return ret;
	return mtd_device_unregister(&flash->mtd);
}

static struct spi_driver sst25l_driver = {