summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/arasan_nfc.c
diff options
context:
space:
mode:
authorScott Wood <oss@buserror.net>2016-05-30 18:57:55 (GMT)
committerScott Wood <oss@buserror.net>2016-06-04 01:27:48 (GMT)
commitb616d9b0a708eb90eb474e1b6ec6dfe4c48a1678 (patch)
treee3710a7c0725a062e6049fe6c281575587ea6b66 /drivers/mtd/nand/arasan_nfc.c
parent151c06ec61d74b77cf27d6d622bab6370c949c66 (diff)
downloadu-boot-fsl-qoriq-b616d9b0a708eb90eb474e1b6ec6dfe4c48a1678.tar.xz
nand: Embed mtd_info in struct nand_chip
nand_info[] is now an array of pointers, with the actual mtd_info instance embedded in struct nand_chip. This is in preparation for syncing the NAND code with Linux 4.6, which makes the same change to struct nand_chip. It's in a separate commit due to the large amount of changes required to accommodate the change to nand_info[]. Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'drivers/mtd/nand/arasan_nfc.c')
-rw-r--r--drivers/mtd/nand/arasan_nfc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/arasan_nfc.c b/drivers/mtd/nand/arasan_nfc.c
index caa7982..8f0ae4c 100644
--- a/drivers/mtd/nand/arasan_nfc.c
+++ b/drivers/mtd/nand/arasan_nfc.c
@@ -1101,7 +1101,7 @@ static int arasan_nand_init(struct nand_chip *nand_chip, int devnum)
}
nand->nand_base = arasan_nand_base;
- mtd = &nand_info[0];
+ mtd = &nand_chip->mtd;
nand_chip->priv = nand;
mtd->priv = nand_chip;
@@ -1134,7 +1134,7 @@ static int arasan_nand_init(struct nand_chip *nand_chip, int devnum)
goto fail;
}
- if (nand_register(devnum)) {
+ if (nand_register(devnum, mtd)) {
printf("Nand Register Fail\n");
goto fail;
}