From: Jagan Teki <jteki@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 06/17] sf: nr_sectors -> n_sectors
Date: Mon, 26 Sep 2016 01:22:54 +0530 [thread overview]
Message-ID: <1474833185-26814-7-git-send-email-jteki@openedev.com> (raw)
In-Reply-To: <1474833185-26814-1-git-send-email-jteki@openedev.com>
Rename nr_sectors as n_sectors to sync with Linux.
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
drivers/mtd/spi/sandbox.c | 2 +-
drivers/mtd/spi/sf_internal.h | 2 +-
drivers/mtd/spi/sf_params.c | 2 +-
drivers/mtd/spi/spi_flash.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 09ce783..4944059 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -289,7 +289,7 @@ static int sandbox_sf_process_cmd(struct sandbox_spi_flash *sbsf, const u8 *rx,
/* we only support erase here */
if (sbsf->cmd == CMD_ERASE_CHIP) {
sbsf->erase_size = sbsf->data->sector_size *
- sbsf->data->nr_sectors;
+ sbsf->data->n_sectors;
} else if (sbsf->cmd == CMD_ERASE_4K && (flags & SECT_4K)) {
sbsf->erase_size = 4 << 10;
} else if (sbsf->cmd == CMD_ERASE_64K && !(flags & SECT_4K)) {
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 4a88cf7..527c252 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -124,7 +124,7 @@ struct spi_flash_info {
* necessarily called a "sector" by the vendor.
*/
u32 sector_size;
- u32 nr_sectors;
+ u32 n_sectors;
u16 page_size;
diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c
index 7314455..8a2a6b2 100644
--- a/drivers/mtd/spi/sf_params.c
+++ b/drivers/mtd/spi/sf_params.c
@@ -19,7 +19,7 @@
}, \
.id_len = (!(_jedec_id) ? 0 : (3 + ((_ext_id) ? 2 : 0))), \
.sector_size = (_sector_size), \
- .nr_sectors = (_n_sectors), \
+ .n_sectors = (_n_sectors), \
.page_size = 256, \
.flags = (_flags),
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index b92b0bf..0777bb5 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -1143,7 +1143,7 @@ int spi_flash_scan(struct spi_flash *flash)
}
flash->page_size <<= flash->shift;
flash->sector_size = info->sector_size << flash->shift;
- flash->size = flash->sector_size * info->nr_sectors << flash->shift;
+ flash->size = flash->sector_size * info->n_sectors << flash->shift;
#ifdef CONFIG_SF_DUAL_FLASH
if (flash->dual_flash & SF_DUAL_STACKED_FLASH)
flash->size <<= 1;
--
2.7.4
next prev parent reply other threads:[~2016-09-25 19:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-25 19:52 [U-Boot] [PATCH v4 00/17] sf:Updates on flash detection Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 01/17] sf: Adopt flash table INFO macro from Linux Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 02/17] sf: Simplify lock ops detection code Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 03/17] sf: sandbox: Use JEDEC_MFR|ID in id exctract Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 04/17] sf: Cleanup spi_flash_info{} Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 05/17] sf: Cleanup sf_params Jagan Teki
2016-09-25 19:52 ` Jagan Teki [this message]
2016-09-25 19:52 ` [U-Boot] [PATCH v4 07/17] sf: Add SPI_FLASH_MAX_ID_LEN Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 08/17] sf: Increase max id length by 1 byte Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 09/17] sf: Add INFO6 flash_info macro Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 10/17] sf: params: Add S25FS256S_64K spi flash support Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 11/17] sf: Remove legacy idcode detection code Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 12/17] sf: Remove non-meaningful comments Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 13/17] sf: Rename sf_params.c to spi_flash_ids Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 14/17] sf: ids: Use small letter's with flash name Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 15/17] sf: ids: Use small letter in ext_jedec Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 16/17] sf: Rename few local functions Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 17/17] spi: Remove dual flash code Jagan Teki
2016-09-27 7:22 ` [U-Boot] [PATCH v4 00/17] sf:Updates on flash detection Bin Meng
2016-10-05 16:58 ` Jagan Teki
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=1474833185-26814-7-git-send-email-jteki@openedev.com \
--to=jteki@openedev.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