public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Grygorii Strashko <grygorii.strashko@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 03/18] dfu: dfu_nand: use get_nand_dev_by_index()
Date: Mon, 26 Jun 2017 19:12:53 -0500	[thread overview]
Message-ID: <20170627001308.23513-4-grygorii.strashko@ti.com> (raw)
In-Reply-To: <20170627001308.23513-1-grygorii.strashko@ti.com>

As part of preparation for nand DM conversion the new API has been
introduced to remove direct access to nand_info array. So, use it here
instead of accessing to nand_info array directly.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
 drivers/dfu/dfu_nand.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 23f1571..97cd608 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -37,15 +37,15 @@ static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
 	lim = dfu->data.nand.start + dfu->data.nand.size - start;
 	count = *len;
 
+	mtd = get_nand_dev_by_index(nand_curr_device);
+
 	if (nand_curr_device < 0 ||
 	    nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE ||
-	    !nand_info[nand_curr_device]) {
+	    !mtd) {
 		printf("%s: invalid nand device\n", __func__);
 		return -1;
 	}
 
-	mtd = nand_info[nand_curr_device];
-
 	if (op == DFU_OP_READ) {
 		ret = nand_read_skip_bad(mtd, start, &count, &actual,
 					 lim, buf);
@@ -143,18 +143,16 @@ static int dfu_flush_medium_nand(struct dfu_entity *dfu)
 
 	/* in case of ubi partition, erase rest of the partition */
 	if (dfu->data.nand.ubi) {
-		struct mtd_info *mtd;
+		struct mtd_info *mtd = get_nand_dev_by_index(nand_curr_device);
 		nand_erase_options_t opts;
 
 		if (nand_curr_device < 0 ||
 		    nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE ||
-		    !nand_info[nand_curr_device]) {
+		    !mtd) {
 			printf("%s: invalid nand device\n", __func__);
 			return -1;
 		}
 
-		mtd = nand_info[nand_curr_device];
-
 		memset(&opts, 0, sizeof(opts));
 		off = dfu->offset;
 		if ((off & (mtd->erasesize - 1)) != 0) {
-- 
2.10.1

  parent reply	other threads:[~2017-06-27  0:12 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-27  0:12 [U-Boot] [PATCH v4 00/17] nand: remove direct acces to nand_info array Grygorii Strashko
2017-06-27  0:12 ` [U-Boot] [PATCH v4 01/18] cmd: nand: abstract global variable usage for dm conversion Grygorii Strashko
2017-07-07  3:58   ` Simon Glass
2017-07-08  0:32     ` Grygorii Strashko
2017-07-08 16:08       ` Simon Glass
2017-07-08 18:32         ` Grygorii Strashko
2017-07-12 12:14   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:12 ` [U-Boot] [PATCH v4 02/18] common: env_nand: use get_nand_dev_by_index() Grygorii Strashko
2017-07-12 12:14   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:12 ` Grygorii Strashko [this message]
2017-07-12 12:14   ` [U-Boot] [U-Boot, v4, 03/18] dfu: dfu_nand: " Tom Rini
2017-06-27  0:12 ` [U-Boot] [PATCH v4 04/18] cmd: bootm: " Grygorii Strashko
2017-07-12 12:14   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:12 ` [U-Boot] [PATCH v4 05/18] cmd: jffs2: " Grygorii Strashko
2017-07-12 12:14   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:12 ` [U-Boot] [PATCH v4 06/18] common: " Grygorii Strashko
2017-07-12 12:14   ` [U-Boot] [U-Boot,v4,06/18] " Tom Rini
2017-06-27  0:12 ` [U-Boot] [PATCH v4 07/18] fs: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot,v4,07/18] " Tom Rini
2017-06-27  0:12 ` [U-Boot] [PATCH v4 08/18] cmd: nand: remove direct access to struct mtd_info->priv Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:12 ` [U-Boot] [PATCH v4 09/18] net: phy: cortina: use get_nand_dev_by_index() Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 10/18] net: fm: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 11/18] mtd: nand: drv: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 12/18] cmd: mvebu: bubt: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 13/18] board: atmel: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 14/18] board: ronetix: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 15/18] board: BuR: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 16/18] board: toradex: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 17/18] armv8: fsl-layerscape: " Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-06-27  0:13 ` [U-Boot] [PATCH v4 18/18] mtd: nand: make nand_info array static Grygorii Strashko
2017-07-12 12:15   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-07-02 12:41 ` [U-Boot] [PATCH v4 00/17] nand: remove direct acces to nand_info array Tom Rini
2017-07-03  6:00   ` Lokesh Vutla
2017-07-03 11:17     ` Tom Rini
2017-07-04  6:13       ` Lokesh Vutla

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=20170627001308.23513-4-grygorii.strashko@ti.com \
    --to=grygorii.strashko@ti.com \
    --cc=u-boot@lists.denx.de \
    /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