From: Jagan Teki Date: Tue, 29 Dec 2015 15:19:48 +0530 Subject: [U-Boot] [PATCH v2 2/8] sf: Rename SST_WR to SST_WRITE In-Reply-To: <1451382594-29532-1-git-send-email-jteki@openedev.com> References: <1451382594-29532-1-git-send-email-jteki@openedev.com> Message-ID: <1451382594-29532-3-git-send-email-jteki@openedev.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de SST_WR => SST_WRITE Cc: Simon Glass Cc: Bin Meng CC: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki --- 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