From: Brian Norris <computersforpeace@gmail.com>
To: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
Marek Vasut <marex@denx.de>, Scott Wood <scottwood@freescale.com>,
Josh Wu <josh.wu@atmel.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Kyungmin Park <kyungmin.park@samsung.com>,
Han Xu <han.xu@freescale.com>,
Huang Shijie <shijie.huang@arm.com>
Subject: Re: [PATCH 2/5] mtd: nand: drop unnecessary partition parser data
Date: Tue, 27 Oct 2015 17:45:11 -0700 [thread overview]
Message-ID: <20151028004511.GA13239@google.com> (raw)
In-Reply-To: <1445913070-17950-3-git-send-email-computersforpeace@gmail.com>
On Mon, Oct 26, 2015 at 07:31:07PM -0700, Brian Norris wrote:
> All of these drivers set up a parser data struct just to communicate DT
> partition data. This field has been deprecated and is instead supported
> by telling nand_scan_ident() about the 'flash_node'.
>
> This patch:
> * sets chip->flash_node for those drivers that didn't already (but used
> OF partitioning)
> * drops the parser data
> * switches to the simpler mtd_device_register() where possible, now
> that we've eliminated one of the auxiliary parameters
>
> Now that we've assigned chip->flash_node for these drivers, we can
> probably rely on nand_dt_init() to do more of the DT parsing for us, but
> for now, I don't want to fiddle with each of these drivers. The parsing
> is done in duplicate for now on some drivers. I don't think this should
> break things. (Famous last words.)
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> ---
> drivers/mtd/nand/atmel_nand.c | 7 +++----
> drivers/mtd/nand/brcmnand/brcmnand.c | 3 +--
> drivers/mtd/nand/davinci_nand.c | 10 +++-------
> drivers/mtd/nand/fsl_elbc_nand.c | 5 ++---
> drivers/mtd/nand/fsl_ifc_nand.c | 5 ++---
Found some compile errors in the above 2 FSL drivers. Will squash the
below (or similar) into v2.
> drivers/mtd/nand/fsl_upm.c | 5 ++---
> drivers/mtd/nand/fsmc_nand.c | 7 +++----
> drivers/mtd/nand/gpio.c | 8 +++-----
> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 5 ++---
> drivers/mtd/nand/hisi504_nand.c | 5 ++---
> drivers/mtd/nand/lpc32xx_mlc.c | 7 +++----
> drivers/mtd/nand/lpc32xx_slc.c | 7 +++----
> drivers/mtd/nand/mpc5121_nfc.c | 5 ++---
> drivers/mtd/nand/mxc_nand.c | 5 ++---
> drivers/mtd/nand/ndfc.c | 5 ++---
> drivers/mtd/nand/omap2.c | 6 ++----
> drivers/mtd/nand/orion_nand.c | 6 ++----
> drivers/mtd/nand/plat_nand.c | 5 ++---
> drivers/mtd/nand/pxa3xx_nand.c | 10 +++++-----
> drivers/mtd/nand/sh_flctl.c | 6 ++----
> drivers/mtd/nand/socrates_nand.c | 5 ++---
> drivers/mtd/nand/sunxi_nand.c | 4 +---
> drivers/mtd/nand/vf610_nfc.c | 6 +-----
> drivers/staging/mt29f_spinand/mt29f_spinand.c | 5 ++---
> 24 files changed, 54 insertions(+), 88 deletions(-)
Brian
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index f3d6e83e193b..850546dc98c8 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -748,7 +748,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
/* Fill in fsl_elbc_mtd structure */
priv->mtd.priv = chip;
priv->mtd.dev.parent = priv->dev;
- chip->flash_node = priv->dev.of_node;
+ chip->flash_node = priv->dev->of_node;
/* set timeout to maximum */
priv->fmr = 15 << FMR_CWTO_SHIFT;
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 60978b737cac..8ae2a237ed4d 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -883,7 +883,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
/* Fill in fsl_ifc_mtd structure */
priv->mtd.priv = chip;
priv->mtd.dev.parent = priv->dev;
- chip->flash_node = priv->dev.of_node;
+ chip->flash_node = priv->dev->of_node;
/* fill in nand_chip structure */
/* set up function call table */
next prev parent reply other threads:[~2015-10-28 0:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 2:31 [PATCH 0/5] mtd: migrate 'of_node' handling to core, not in mtd_part_parser_data Brian Norris
2015-10-27 2:31 ` [PATCH 1/5] mtd: ofpart: grab device tree node directly from master device node Brian Norris
2015-10-27 7:42 ` Boris Brezillon
2015-10-27 17:54 ` Brian Norris
2015-10-28 1:01 ` Brian Norris
2015-10-28 8:02 ` Boris Brezillon
2015-10-28 7:58 ` Boris Brezillon
2015-10-28 16:11 ` Marek Vasut
2015-10-28 16:32 ` Boris Brezillon
2015-10-28 17:14 ` Brian Norris
2015-10-28 20:55 ` Robert Jarzmik
2015-10-28 22:47 ` Marek Vasut
2015-10-29 6:32 ` Robert Jarzmik
2015-10-29 7:24 ` Boris Brezillon
2015-10-29 17:23 ` Marek Vasut
2015-10-29 17:34 ` Boris Brezillon
2015-10-29 20:28 ` Robert Jarzmik
2015-10-28 20:38 ` Marek Vasut
2015-10-27 2:31 ` [PATCH 2/5] mtd: nand: drop unnecessary partition parser data Brian Norris
2015-10-27 7:52 ` Boris Brezillon
2015-10-28 0:45 ` Brian Norris [this message]
2015-10-27 2:31 ` [PATCH 3/5] mtd: spi-nor: " Brian Norris
2015-10-27 2:31 ` [PATCH 4/5] mtd: " Brian Norris
2015-10-27 2:31 ` [PATCH 5/5] mtd: drop 'of_node' " Brian Norris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151028004511.GA13239@google.com \
--to=computersforpeace@gmail.com \
--cc=boris.brezillon@free-electrons.com \
--cc=ezequiel.garcia@free-electrons.com \
--cc=han.xu@freescale.com \
--cc=josh.wu@atmel.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marex@denx.de \
--cc=robert.jarzmik@free.fr \
--cc=scottwood@freescale.com \
--cc=shijie.huang@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).