diff mbox

mtd: nand: sunxi: remove direct mtd->priv accesses

Message ID 1457133680-18419-1-git-send-email-boris.brezillon@free-electrons.com
State Accepted
Commit f671a1f3803428b01272b056d6dc0e09e0df6fd4
Headers show

Commit Message

Boris Brezillon March 4, 2016, 11:21 p.m. UTC 
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")
---
Sorry for the inconvenience, but apparently I was not expecting
the mtd_to_nand() rework to be taken before the randomizer patch,
and I forgot to repost a version replacing mtd->priv by mtd_to_nand().
---
 drivers/mtd/nand/sunxi_nand.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Brian Norris March 5, 2016, 12:18 a.m. UTC | #1 
On Sat, Mar 05, 2016 at 12:21:20AM +0100, Boris Brezillon wrote:
> 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")
> ---

Applied, thanks!

> Sorry for the inconvenience, but apparently I was not expecting
> the mtd_to_nand() rework to be taken before the randomizer patch,
> and I forgot to repost a version replacing mtd->priv by mtd_to_nand().

Eh, probably not entirely your fault. I can be erratic with my
review/acceptance times.

Brian
diff mbox

Patch

diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index b5ea6b3..1c03eee 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -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))