Renamed for more readability
- spi_flash_params => spi_flash_info
- params => info

Cc: Simon Glass <s...@chromium.org>
Cc: Bin Meng <bmeng...@gmail.com>
Cc: York Sun <york....@nxp.com>
Cc: Vignesh R <vigne...@ti.com>
Cc: Mugunthan V N <mugunthan...@ti.com>
Cc: Michal Simek <michal.si...@xilinx.com>
Cc: Siva Durga Prasad Paladugu <siva...@xilinx.com>
Signed-off-by: Jagan Teki <jt...@openedev.com>
---
 drivers/mtd/spi/sandbox.c     |  6 +++---
 drivers/mtd/spi/sf_internal.h | 10 +++++-----
 drivers/mtd/spi/sf_params.c   |  2 +-
 drivers/mtd/spi/spi_flash.c   | 46 +++++++++++++++++++++----------------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 53470b9..0ac7fb7 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -88,7 +88,7 @@ struct sandbox_spi_flash {
        /* The current flash status (see STAT_XXX defines above) */
        u16 status;
        /* Data describing the flash we're emulating */
-       const struct spi_flash_params *data;
+       const struct spi_flash_info *data;
        /* The file on disk to serv up data from */
        int fd;
 };
@@ -112,7 +112,7 @@ static int sandbox_sf_probe(struct udevice *dev)
        struct sandbox_spi_flash *sbsf = dev_get_priv(dev);
        const char *file;
        size_t len, idname_len;
-       const struct spi_flash_params *data;
+       const struct spi_flash_info *data;
        struct sandbox_spi_flash_plat_data *pdata = dev_get_platdata(dev);
        struct sandbox_state *state = state_get_current();
        struct udevice *bus = dev->parent;
@@ -168,7 +168,7 @@ static int sandbox_sf_probe(struct udevice *dev)
        }
        debug("%s: device='%s'\n", __func__, spec);
 
-       for (data = spi_flash_params_table; data->name; data++) {
+       for (data = spi_flash_ids; data->name; data++) {
                len = strlen(data->name);
                if (idname_len != len)
                        continue;
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index a57c330..4e9ae34 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -104,11 +104,11 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, 
size_t len,
 #define CMD_SPANSION_WRAR      0x71 /* Write any device register */
 #endif
 
-#define JEDEC_ID(params)       (((params)->id[1]) << 8 | ((params)->id[2]))
-#define JEDEC_EXT(params)      (((params)->id[3]) << 8 | ((params)->id[4]))
+#define JEDEC_ID(info)         (((info)->id[1]) << 8 | ((info)->id[2]))
+#define JEDEC_EXT(info)        (((info)->id[3]) << 8 | ((info)->id[4]))
 
 /**
- * struct spi_flash_params - SPI/QSPI flash device params structure
+ * struct spi_flash_info - SPI/QSPI flash device params structure
  *
  * @name:              Device name ([MANUFLETTER][DEVTYPE][DENSITY][EXTRAINFO])
  * @sector_size:       Isn't necessarily a sector size from vendor,
@@ -116,7 +116,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, 
size_t len,
  * @nr_sectors:                No.of sectors on this device
  * @flags:             Important param, for flash specific behaviour
  */
-struct spi_flash_params {
+struct spi_flash_info {
        const char *name;
 
        /*
@@ -144,7 +144,7 @@ struct spi_flash_params {
 #define RD_FULL                (RD_QUAD | RD_DUAL | RD_QUADIO | RD_DUALIO)
 };
 
-extern const struct spi_flash_params spi_flash_params_table[];
+extern const struct spi_flash_info spi_flash_ids[];
 
 /* Send a single-byte command to the device and read the response */
 int spi_flash_cmd(struct spi_slave *spi, u8 cmd, void *response, size_t len);
diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c
index 70d9e18..7fcc3bc 100644
--- a/drivers/mtd/spi/sf_params.c
+++ b/drivers/mtd/spi/sf_params.c
@@ -28,7 +28,7 @@
                .flags = (_flags),
 
 /* SPI/QSPI flash device params structure */
-const struct spi_flash_params spi_flash_params_table[] = {
+const struct spi_flash_info spi_flash_ids[] = {
 #ifdef CONFIG_SPI_FLASH_ATMEL          /* ATMEL */
        {"AT45DB011D",     INFO(0x1f2200, 0x0, 64 * 1024,     4, SECT_4K) },
        {"AT45DB021D",     INFO(0x1f2300, 0x0, 64 * 1024,     8, SECT_4K) },
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index c84c6b7..80c96f9 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -924,11 +924,11 @@ static int micron_quad_enable(struct spi_flash *flash)
 }
 #endif
 
-static const struct spi_flash_params *spi_flash_read_id(struct spi_flash 
*flash)
+static const struct spi_flash_info *spi_flash_read_id(struct spi_flash *flash)
 {
        int                             tmp;
        u8                              id[5];
-       const struct spi_flash_params   *params;
+       const struct spi_flash_info     *info;
 
        tmp = spi_flash_cmd(flash->spi, CMD_READ_ID, id, 5);
        if (tmp < 0) {
@@ -936,11 +936,11 @@ static const struct spi_flash_params 
*spi_flash_read_id(struct spi_flash *flash)
                return ERR_PTR(tmp);
        }
 
-       params = spi_flash_params_table;
-       for (; params->name != NULL; params++) {
-               if (params->id_len) {
-                       if (!memcmp(params->id, id, params->id_len))
-                               return params;
+       info = spi_flash_ids;
+       for (; info->name != NULL; info++) {
+               if (info->id_len) {
+                       if (!memcmp(info->id, id, info->id_len))
+                               return info;
                }
        }
 
@@ -1036,13 +1036,13 @@ static int spansion_s25fss_disable_4KB_erase(struct 
spi_slave *spi)
 int spi_flash_scan(struct spi_flash *flash)
 {
        struct spi_slave *spi = flash->spi;
-       const struct spi_flash_params *params = NULL;
+       const struct spi_flash_info *info = NULL;
        u16 jedec, ext_jedec;
        u8 idcode[5];
        int ret;
 
-       params = spi_flash_read_id(flash);
-       if (IS_ERR_OR_NULL(params))
+       info = spi_flash_read_id(flash);
+       if (IS_ERR_OR_NULL(info))
                return -ENOENT;
 
        jedec = idcode[1] << 8 | idcode[2];
@@ -1091,12 +1091,12 @@ int spi_flash_scan(struct spi_flash *flash)
                write_sr(flash, 0);
 
        /* Assign spi data */
-       flash->name = params->name;
+       flash->name = info->name;
        flash->memory_map = spi->memory_map;
        flash->dual_flash = spi->option;
 
        /* Assign spi flash flags */
-       if (params->flags & SST_WR)
+       if (info->flags & SST_WR)
                flash->flags |= SNOR_F_SST_WR;
 
        /* Assign spi_flash ops */
@@ -1130,21 +1130,21 @@ int spi_flash_scan(struct spi_flash *flash)
 
        /* Compute the flash size */
        flash->shift = (flash->dual_flash & SF_DUAL_PARALLEL_FLASH) ? 1 : 0;
-       flash->page_size = params->page_size;
+       flash->page_size = info->page_size;
        /*
         * The Spansion S25FL032P and S25FL064P have 256b pages, yet use the
         * 0x4d00 Extended JEDEC code. The rest of the Spansion flashes with
         * the 0x4d00 Extended JEDEC code have 512b pages. All of the others
         * have 256b pages.
         */
-       if (JEDEC_EXT(params) == 0x4d00) {
-               if ((JEDEC_ID(params) != 0x0215) &&
-                   (JEDEC_ID(params) != 0x0216))
+       if (JEDEC_EXT(info) == 0x4d00) {
+               if ((JEDEC_ID(info) != 0x0215) &&
+                   (JEDEC_ID(info) != 0x0216))
                        flash->page_size = 512;
        }
        flash->page_size <<= flash->shift;
-       flash->sector_size = params->sector_size << flash->shift;
-       flash->size = flash->sector_size * params->nr_sectors << flash->shift;
+       flash->sector_size = info->sector_size << flash->shift;
+       flash->size = flash->sector_size * info->nr_sectors << flash->shift;
 #ifdef CONFIG_SF_DUAL_FLASH
        if (flash->dual_flash & SF_DUAL_STACKED_FLASH)
                flash->size <<= 1;
@@ -1152,7 +1152,7 @@ int spi_flash_scan(struct spi_flash *flash)
 
 #ifdef CONFIG_SPI_FLASH_USE_4K_SECTORS
        /* Compute erase sector and command */
-       if (params->flags & SECT_4K) {
+       if (info->flags & SECT_4K) {
                flash->erase_cmd = CMD_ERASE_4K;
                flash->erase_size = 4096 << flash->shift;
        } else
@@ -1169,13 +1169,13 @@ int spi_flash_scan(struct spi_flash *flash)
        flash->read_cmd = CMD_READ_ARRAY_FAST;
        if (spi->mode & SPI_RX_SLOW)
                flash->read_cmd = CMD_READ_ARRAY_SLOW;
-       else if (spi->mode & SPI_RX_QUAD && params->flags & RD_QUAD)
+       else if (spi->mode & SPI_RX_QUAD && info->flags & RD_QUAD)
                flash->read_cmd = CMD_READ_QUAD_OUTPUT_FAST;
-       else if (spi->mode & SPI_RX_DUAL && params->flags & RD_DUAL)
+       else if (spi->mode & SPI_RX_DUAL && info->flags & RD_DUAL)
                flash->read_cmd = CMD_READ_DUAL_OUTPUT_FAST;
 
        /* Look for write commands */
-       if (params->flags & WR_QPP && spi->mode & SPI_TX_QUAD)
+       if (info->flags & WR_QPP && spi->mode & SPI_TX_QUAD)
                flash->write_cmd = CMD_QUAD_PAGE_PROGRAM;
        else
                /* Go for default supported write cmd */
@@ -1212,7 +1212,7 @@ int spi_flash_scan(struct spi_flash *flash)
        }
 
 #ifdef CONFIG_SPI_FLASH_STMICRO
-       if (params->flags & E_FSR)
+       if (info->flags & E_FSR)
                flash->flags |= SNOR_F_USE_FSR;
 #endif
 
-- 
2.7.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to