Merge v4.4-rc1 into MTD development

[karo-tx-linux.git] / drivers / staging / mt29f_spinand / mt29f_spinand.c

diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
index 47bb56f1f8c0d65c93aa5c50435f982603ed1a05..6536066b23490ac91e8504ddc71fab0e6f383b98 100644 (file)
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -850,7 +850,6 @@ static int spinand_probe(struct spi_device *spi_nand)
        struct nand_chip *chip;
        struct spinand_info *info;
        struct spinand_state *state;
-       struct mtd_part_parser_data ppdata;
 
        info  = devm_kzalloc(&spi_nand->dev, sizeof(struct spinand_info),
                             GFP_KERNEL);
@@ -894,6 +893,7 @@ static int spinand_probe(struct spi_device *spi_nand)
                pr_info("%s: disable ecc failed!\n", __func__);
 #endif
 
+       nand_set_flash_node(chip, spi_nand->dev.of_node);
        chip->priv      = info;
        chip->read_buf  = spinand_read_buf;
        chip->write_buf = spinand_write_buf;
@@ -916,8 +916,7 @@ static int spinand_probe(struct spi_device *spi_nand)
        if (nand_scan(mtd, 1))
                return -ENXIO;
 
-       ppdata.of_node = spi_nand->dev.of_node;
-       return mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
+       return mtd_device_register(mtd, NULL, 0);
 }
 
 /*