From: Jagan Teki <jteki@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 13/13] sf: Rename read register functions
Date: Wed, 2 Sep 2015 11:39:57 +0530 [thread overview]
Message-ID: <1441174197-5096-14-git-send-email-jteki@openedev.com> (raw)
In-Reply-To: <1441174197-5096-1-git-send-email-jteki@openedev.com>
spi_flash_cmd_read_status -> read_sr
spi_flash_cmd_read_config -> read_cr
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
Changes for v3:
- none
Changes for v2:
- none
drivers/mtd/spi/sf_internal.h | 5 +----
drivers/mtd/spi/sf_ops.c | 8 ++++----
drivers/mtd/spi/sf_probe.c | 4 ++--
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index e4cb198..e618306 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -180,14 +180,11 @@ int spi_flash_cmd_write(struct spi_slave *spi, const u8 *cmd, size_t cmd_len,
/* Flash erase(sectors) operation, support all possible erase commands */
int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len);
-/* Read the status register */
-int spi_flash_cmd_read_status(struct spi_flash *flash);
-
/* Program the status register */
int spi_flash_cmd_write_status(struct spi_flash *flash, u8 ws);
/* Read the config register */
-int spi_flash_cmd_read_config(struct spi_flash *flash);
+int read_cr(struct spi_flash *flash);
/* Program the config register */
int spi_flash_cmd_write_config(struct spi_flash *flash, u8 wc);
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index 77b053a..a27beb5 100644
--- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c
@@ -26,7 +26,7 @@ static void spi_flash_addr(u32 addr, u8 *cmd)
cmd[3] = addr >> 0;
}
-int spi_flash_cmd_read_status(struct spi_flash *flash)
+int read_sr(struct spi_flash *flash)
{
int ret;
u8 rs;
@@ -70,7 +70,7 @@ int spi_flash_cmd_write_status(struct spi_flash *flash, u8 ws)
}
#if defined(CONFIG_SPI_FLASH_SPANSION) || defined(CONFIG_SPI_FLASH_WINBOND)
-int spi_flash_cmd_read_config(struct spi_flash *flash)
+int read_cr(struct spi_flash *flash)
{
int ret;
u8 rc;
@@ -90,7 +90,7 @@ int spi_flash_cmd_write_config(struct spi_flash *flash, u8 wc)
u8 cmd;
int ret, val;
- val = spi_flash_cmd_read_status(flash);
+ val = read_sr(flash);
if (val < 0)
return val;
@@ -160,7 +160,7 @@ static inline int write_cfsr(struct spi_flash *flash)
static inline int spi_flash_sr_ready(struct spi_flash *flash)
{
- int sr = spi_flash_cmd_read_status(flash);
+ int sr = read_sr(flash);
if (sr < 0)
return sr;
else
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 262849e..bf84f06 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -37,7 +37,7 @@ static int spi_flash_set_qeb_mxic(struct spi_flash *flash)
{
int qeb_status, ret;
- qeb_status = spi_flash_cmd_read_config(flash);
+ qeb_status = read_cr(flash);
if (qeb_status < 0)
return qeb_status;
@@ -58,7 +58,7 @@ static int spi_flash_set_qeb_winspan(struct spi_flash *flash)
{
int qeb_status, ret;
- qeb_status = spi_flash_cmd_read_config(flash);
+ qeb_status = read_cr(flash);
if (qeb_status < 0)
return qeb_status;
--
1.9.1
next prev parent reply other threads:[~2015-09-02 6:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 6:09 [U-Boot] [PATCH v3 00/13] sf: BAR/wait_ready logic updates Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 01/13] spi: zynq_spi: Remove unneeded headers Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 02/13] sf: Return bank_sel, if flash->bank_curr == bank_sel Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 03/13] sf: Make BAR discovery, as spi_flash_read_bar Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 04/13] sf: Optimize BAR write code Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 05/13] sf: Make flash->flags use for generic usage Jagan Teki
2015-09-02 9:39 ` Bin Meng
2015-09-03 7:04 ` Jagan Teki
2015-09-15 6:32 ` Bin Meng
2015-09-15 7:49 ` Bin Meng
2015-09-02 6:09 ` [U-Boot] [PATCH v3 06/13] sf: Update status reg check in spi_flash_cmd_wait_ready Jagan Teki
2015-09-15 8:14 ` Bin Meng
2015-09-02 6:09 ` [U-Boot] [PATCH v3 07/13] sf: Add FSR support to spi_flash_cmd_wait_ready Jagan Teki
2015-09-02 8:00 ` Marek Vasut
2015-09-29 11:12 ` Jagan Teki
2015-09-15 8:15 ` Bin Meng
2015-09-02 6:09 ` [U-Boot] [PATCH v3 08/13] sf: Add flash_read_reg support Jagan Teki
2015-09-15 8:17 ` Bin Meng
2015-09-02 6:09 ` [U-Boot] [PATCH v3 09/13] sf: Use flash_read_reg routine Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 10/13] sf: Add flash_read support Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 11/13] sf: Use flash_read routine in spi_flash_read_ops Jagan Teki
2015-09-02 6:09 ` [U-Boot] [PATCH v3 12/13] sf: Add clear flag status register support Jagan Teki
2015-09-02 6:09 ` Jagan Teki [this message]
2015-09-15 8:21 ` [U-Boot] [PATCH v3 13/13] sf: Rename read register functions Bin Meng
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=1441174197-5096-14-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