diff options
| author | Fabio Estevam | 2013-11-05 03:07:05 +0100 |
|---|---|---|
| committer | Brian Norris | 2013-11-07 19:37:32 +0100 |
| commit | edaf4d4aad61134e820c0431cbe3d319794899f9 (patch) | |
| tree | 7119f7fb7d46b083173728f16228e7307327fc4c /drivers/mtd/nand/gpmi-nand/gpmi-nand.c | |
| parent | mtd: atmel_nand: fix bug driver will in a dead lock if no nand detected (diff) | |
| download | kernel-qcow2-linux-edaf4d4aad61134e820c0431cbe3d319794899f9.tar.gz kernel-qcow2-linux-edaf4d4aad61134e820c0431cbe3d319794899f9.tar.xz kernel-qcow2-linux-edaf4d4aad61134e820c0431cbe3d319794899f9.zip | |
mtd: gpmi: Use devm_kzalloc()
Using devm_kzalloc() can make the code simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand/gpmi-nand/gpmi-nand.c')
| -rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 7ac22802e4dc..4b6d802018fb 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -1732,7 +1732,7 @@ static int gpmi_nand_probe(struct platform_device *pdev) return -ENODEV; } - this = kzalloc(sizeof(*this), GFP_KERNEL); + this = devm_kzalloc(&pdev->dev, sizeof(*this), GFP_KERNEL); if (!this) { pr_err("Failed to allocate per-device memory\n"); return -ENOMEM; @@ -1762,7 +1762,6 @@ exit_nfc_init: release_resources(this); exit_acquire_resources: dev_err(this->dev, "driver registration failed: %d\n", ret); - kfree(this); return ret; } @@ -1773,7 +1772,6 @@ static int gpmi_nand_remove(struct platform_device *pdev) gpmi_nfc_exit(this); release_resources(this); - kfree(this); return 0; } |