OSDN Git Service

staging: mt29f_spinand: use the mtd instance embedded in struct nand_chip
authorBoris BREZILLON <boris.brezillon@free-electrons.com>
Thu, 10 Dec 2015 08:00:31 +0000 (09:00 +0100)
committerBrian Norris <computersforpeace@gmail.com>
Fri, 18 Dec 2015 20:44:14 +0000 (12:44 -0800)
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>
drivers/staging/mt29f_spinand/mt29f_spinand.c

index 8924a96..8171b74 100644 (file)
@@ -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);