mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
mtd: sst25l: Use devm_kzalloc
devm_kzalloc is device managed and makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
parent
fcfd9f2dd7
commit
b38be28814
1 changed files with 3 additions and 9 deletions
|
@ -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 = {
|
||||
|
|
Loading…
Reference in a new issue