summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris BREZILLON2015-12-10 09:00:31 +0100
committerBrian Norris2015-12-18 21:44:14 +0100
commitba4ed8605cb09b2cb72bf14499cf4605a0f9eb23 (patch)
tree802af440994e28a64647179e21771bb2b35d8e54
parentmtd: nand: docg4: simplify error case (diff)
downloadkernel-qcow2-linux-ba4ed8605cb09b2cb72bf14499cf4605a0f9eb23.tar.gz
kernel-qcow2-linux-ba4ed8605cb09b2cb72bf14499cf4605a0f9eb23.tar.xz
kernel-qcow2-linux-ba4ed8605cb09b2cb72bf14499cf4605a0f9eb23.zip
staging: mt29f_spinand: use the mtd instance embedded in struct nand_chip
struct nand_chip now embeds an mtd device, use it instead of allocating a new one. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r--drivers/staging/mt29f_spinand/mt29f_spinand.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
index 8924a9645a43..8171b741ff86 100644
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -903,9 +903,7 @@ static int spinand_probe(struct spi_device *spi_nand)
chip->options |= NAND_CACHEPRG;
chip->select_chip = spinand_select_chip;
- mtd = devm_kzalloc(&spi_nand->dev, sizeof(struct mtd_info), GFP_KERNEL);
- if (!mtd)
- return -ENOMEM;
+ mtd = nand_to_mtd(chip);
dev_set_drvdata(&spi_nand->dev, mtd);