Messages in this thread Patch in this message | | | Date | Tue, 27 Oct 2015 17:45:11 -0700 | From | Brian Norris <> | Subject | Re: [PATCH 2/5] mtd: nand: drop unnecessary partition parser data |
| |
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 */
| |