Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / nand / cafe_nand.c

diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 9a0f45f1d932d987b4ae11c138d7362a6414dc61..9de78d2a2eb189bcf9fd2a630d077d0a34515016 100644 (file)
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -516,7 +516,8 @@ static struct nand_bbt_descr cafe_bbt_mirror_descr_512 = {
 
 static int cafe_nand_write_page_lowlevel(struct mtd_info *mtd,
                                          struct nand_chip *chip,
-                                         const uint8_t *buf, int oob_required)
+                                         const uint8_t *buf, int oob_required,
+                                         int page)
 {
        struct cafe_priv *cafe = mtd->priv;
 
@@ -604,7 +605,6 @@ static int cafe_nand_probe(struct pci_dev *pdev,
 
        mtd->dev.parent = &pdev->dev;
        mtd->priv = cafe;
-       mtd->owner = THIS_MODULE;
 
        cafe->pdev = pdev;
        cafe->mmio = pci_iomap(pdev, 0, 0);