Commit cf3a9b56 authored by Sachin Kamat's avatar Sachin Kamat Committed by Brian Norris

mtd: socrates_nand: 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 ecb598d0
......@@ -149,17 +149,13 @@ static int socrates_nand_probe(struct platform_device *ofdev)
struct mtd_part_parser_data ppdata;
/* Allocate memory for the device structure (and zero it) */
host = kzalloc(sizeof(struct socrates_nand_host), GFP_KERNEL);
if (!host) {
printk(KERN_ERR
"socrates_nand: failed to allocate device structure.\n");
host = devm_kzalloc(&ofdev->dev, sizeof(*host), GFP_KERNEL);
if (!host)
return -ENOMEM;
}
host->io_base = of_iomap(ofdev->dev.of_node, 0);
if (host->io_base == NULL) {
printk(KERN_ERR "socrates_nand: ioremap failed\n");
kfree(host);
return -EIO;
}
......@@ -212,7 +208,6 @@ static int socrates_nand_probe(struct platform_device *ofdev)
out:
iounmap(host->io_base);
kfree(host);
return res;
}
......@@ -227,7 +222,6 @@ static int socrates_nand_remove(struct platform_device *ofdev)
nand_release(mtd);
iounmap(host->io_base);
kfree(host);
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment