mtd: nand: sunxi: remove direct mtd->priv accesses
authorBoris BREZILLON <boris.brezillon@free-electrons.com>
Fri, 4 Mar 2016 23:21:20 +0000 (00:21 +0100)
committerBrian Norris <computersforpeace@gmail.com>
Sat, 5 Mar 2016 00:17:20 +0000 (16:17 -0800)
mtd->priv is no longer pointing to the struct nand_chip it is attached to.
Replace those accesses by mtd_to_nand() calls.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 4be4e03efc7f ("mtd: nand: sunxi: add randomizer support")
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/nand/sunxi_nand.c

index b5ea6b3..1c03eee 100644 (file)
@@ -642,7 +642,7 @@ static u16 sunxi_nfc_randomizer_state(struct mtd_info *mtd, int page, bool ecc)
 static void sunxi_nfc_randomizer_config(struct mtd_info *mtd,
                                        int page, bool ecc)
 {
-       struct nand_chip *nand = mtd->priv;
+       struct nand_chip *nand = mtd_to_nand(mtd);
        struct sunxi_nfc *nfc = to_sunxi_nfc(nand->controller);
        u32 ecc_ctl = readl(nfc->regs + NFC_REG_ECC_CTL);
        u16 state;
@@ -658,7 +658,7 @@ static void sunxi_nfc_randomizer_config(struct mtd_info *mtd,
 
 static void sunxi_nfc_randomizer_enable(struct mtd_info *mtd)
 {
-       struct nand_chip *nand = mtd->priv;
+       struct nand_chip *nand = mtd_to_nand(mtd);
        struct sunxi_nfc *nfc = to_sunxi_nfc(nand->controller);
 
        if (!(nand->options & NAND_NEED_SCRAMBLING))
@@ -670,7 +670,7 @@ static void sunxi_nfc_randomizer_enable(struct mtd_info *mtd)
 
 static void sunxi_nfc_randomizer_disable(struct mtd_info *mtd)
 {
-       struct nand_chip *nand = mtd->priv;
+       struct nand_chip *nand = mtd_to_nand(mtd);
        struct sunxi_nfc *nfc = to_sunxi_nfc(nand->controller);
 
        if (!(nand->options & NAND_NEED_SCRAMBLING))