[U-Boot] [PATCH v2 2/8] sf: Rename SST_WR to SST_WRITE

Jagan Teki jteki at openedev.com
Tue Dec 29 10:49:48 CET 2015


SST_WR => SST_WRITE

Cc: Simon Glass <sjg at chromium.org>
Cc: Bin Meng <bmeng.cn at gmail.com>
CC: Mugunthan V N <mugunthanvnm at ti.com>
Cc: Michal Simek <michal.simek at xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
Signed-off-by: Jagan Teki <jteki at openedev.com>
---
 drivers/mtd/spi/sf_internal.h | 2 +-
 drivers/mtd/spi/spi_flash.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 007a5a0..8eaadd7 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -49,7 +49,7 @@ enum {
 };
 
 enum spi_nor_option_flags {
-	SNOR_F_SST_WR		= BIT(0),
+	SNOR_F_SST_WRITE	= BIT(0),
 	SNOR_F_USE_FSR		= BIT(1),
 };
 
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 2c309e7..bf9ac36 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -1325,14 +1325,14 @@ int spi_flash_scan(struct spi_flash *flash)
 	flash->dual_flash = spi->option;
 
 	/* Assign spi flash flags */
-	if (info->flags & SST_WR)
-		flash->flags |= SNOR_F_SST_WR;
+	if (info->flags & SST_WRITE)
+		flash->flags |= SNOR_F_SST_WRITE;
 
 	/* Assign spi_flash ops */
 #ifndef CONFIG_DM_SPI_FLASH
 	flash->write = spi_flash_cmd_write_ops;
 #if defined(CONFIG_SPI_FLASH_SST)
-	if (flash->flags & SNOR_F_SST_WR) {
+	if (flash->flags & SNOR_F_SST_WRITE) {
 		if (spi->mode & SPI_TX_BYTE)
 			flash->write = sst_write_bp;
 		else
-- 
1.9.1



More information about the U-Boot mailing list