Patchwork [U-Boot,4/5] sf: sst: inline duplicate write enable helper funcs

login
register
mail settings
Submitter Mike Frysinger
Date March 5, 2012, 4:21 a.m.
Message ID <1330921319-19419-4-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/144595/
State Accepted
Commit 7a6d2a7ec1afb53df8b78185fe77d66423c8dcea
Delegated to: Mike Frysinger
Headers show

Comments

Mike Frysinger - March 5, 2012, 4:21 a.m.
The local sst enable/disable write funcs don't really add anything
over the common API, so just inline the common calls directly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 drivers/mtd/spi/sst.c |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

Patch

diff --git a/drivers/mtd/spi/sst.c b/drivers/mtd/spi/sst.c
index dcc0bbe..04cc50a 100644
--- a/drivers/mtd/spi/sst.c
+++ b/drivers/mtd/spi/sst.c
@@ -94,24 +94,6 @@  static const struct sst_spi_flash_params sst_spi_flash_table[] = {
 };
 
 static int
-sst_enable_writing(struct spi_flash *flash)
-{
-	int ret = spi_flash_cmd_write_enable(flash);
-	if (ret)
-		debug("SF: Enabling Write failed\n");
-	return ret;
-}
-
-static int
-sst_disable_writing(struct spi_flash *flash)
-{
-	int ret = spi_flash_cmd_write_disable(flash);
-	if (ret)
-		debug("SF: Disabling Write failed\n");
-	return ret;
-}
-
-static int
 sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
 {
 	int ret;
@@ -125,7 +107,7 @@  sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
 	debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
 		spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset);
 
-	ret = sst_enable_writing(flash);
+	ret = spi_flash_cmd_write_enable(flash);
 	if (ret)
 		return ret;
 
@@ -158,7 +140,7 @@  sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 	}
 	offset += actual;
 
-	ret = sst_enable_writing(flash);
+	ret = spi_flash_cmd_write_enable(flash);
 	if (ret)
 		goto done;
 
@@ -189,7 +171,7 @@  sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 	}
 
 	if (!ret)
-		ret = sst_disable_writing(flash);
+		ret = spi_flash_cmd_write_disable(flash);
 
 	/* If there is a single trailing byte, write it out */
 	if (!ret && actual != len)
@@ -209,7 +191,7 @@  sst_unlock(struct spi_flash *flash)
 	int ret;
 	u8 cmd, status;
 
-	ret = sst_enable_writing(flash);
+	ret = spi_flash_cmd_write_enable(flash);
 	if (ret)
 		return ret;