Merge tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.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 9dba16f1fac4c0266c08a3eb233348827b0faad6..47bb56f1f8c0d65c93aa5c50435f982603ed1a05 100644 (file)
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -613,7 +613,8 @@ static int spinand_erase_block(struct spi_device *spi_nand, u16 block_id)
 #ifdef CONFIG_MTD_SPINAND_ONDIEECC
 static int spinand_write_page_hwecc(struct mtd_info *mtd,
                                    struct nand_chip *chip,
-                                   const u8 *buf, int oob_required)
+                                   const u8 *buf, int oob_required,
+                                   int page)
 {
        const u8 *p = buf;
        int eccsize = chip->ecc.size;
@@ -909,8 +910,7 @@ static int spinand_probe(struct spi_device *spi_nand)
        dev_set_drvdata(&spi_nand->dev, mtd);
 
        mtd->priv = chip;
-       mtd->name = dev_name(&spi_nand->dev);
-       mtd->owner = THIS_MODULE;
+       mtd->dev.parent = &spi_nand->dev;
        mtd->oobsize = 64;
 
        if (nand_scan(mtd, 1))