cfi_flash: Rename camel-case variables

[u-boot] / drivers / mtd / cfi_flash.c

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index fced9847efc3f09eb0f2516f680e665368f42f72..e94a7269e1b0e834e545da2b4e44a95c53f073fa 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1255,10 +1255,9 @@ void flash_print_info(flash_info_t *info)
                info->erase_blk_tout,
                info->write_tout);
        if (info->buffer_size > 1) {
-               printf("  Buffer write timeout: %ld ms, "
-                       "buffer size: %d bytes\n",
-               info->buffer_write_tout,
-               info->buffer_size);
+               printf("  Buffer write timeout: %ld ms, ",
+                       info->buffer_write_tout);
+               printf("buffer size: %d bytes\n", info->buffer_size);
        }
 
        puts("\n  Sector Start Addresses:");
@@ -1688,8 +1687,8 @@ static int cmdset_intel_init(flash_info_t *info, struct cfi_qry *qry)
 
 static void cmdset_amd_read_jedec_ids(flash_info_t *info)
 {
-       ushort bankId = 0;
-       uchar  manuId;
+       ushort bank_id = 0;
+       uchar  manu_id;
        uchar  feature;
 
        flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
@@ -1697,14 +1696,14 @@ static void cmdset_amd_read_jedec_ids(flash_info_t *info)
        flash_write_cmd(info, 0, info->addr_unlock1, FLASH_CMD_READ_ID);
        udelay(1000); /* some flash are slow to respond */
 
-       manuId = flash_read_uchar(info, FLASH_OFFSET_MANUFACTURER_ID);
+       manu_id = flash_read_uchar(info, FLASH_OFFSET_MANUFACTURER_ID);
        /* JEDEC JEP106Z specifies ID codes up to bank 7 */
-       while (manuId == FLASH_CONTINUATION_CODE && bankId < 0x800) {
-               bankId += 0x100;
-               manuId = flash_read_uchar(info,
-                       bankId | FLASH_OFFSET_MANUFACTURER_ID);
+       while (manu_id == FLASH_CONTINUATION_CODE && bank_id < 0x800) {
+               bank_id += 0x100;
+               manu_id = flash_read_uchar(info,
+                       bank_id | FLASH_OFFSET_MANUFACTURER_ID);
        }
-       info->manufacturer_id = manuId;
+       info->manufacturer_id = manu_id;
 
        debug("info->ext_addr = 0x%x, cfi_version = 0x%x\n",
              info->ext_addr, info->cfi_version);
@@ -2050,8 +2049,8 @@ static void flash_fixup_num(flash_info_t *info, struct cfi_qry *qry)
                        info->device_id2 == 0x2301 ||
                        info->device_id2 == 0x2801 ||
                        info->device_id2 == 0x4801)) {
-               debug("Adjusted buffer size on Numonyx flash"
-                       " M29EW family in 8 bit mode\n");
+               debug("Adjusted buffer size on Numonyx flash");
+               debug(" M29EW family in 8 bit mode\n");
                qry->max_buf_write_size = 0x8;
        }
 }
@@ -2388,9 +2387,9 @@ unsigned long flash_init(void)
                size += flash_info[i].size;
                if (flash_info[i].flash_id == FLASH_UNKNOWN) {
 #ifndef CONFIG_SYS_FLASH_QUIET_TEST
-                       printf("## Unknown flash on Bank %d "
-                               "- Size = 0x%08lx = %ld MB\n",
-                               i + 1, flash_info[i].size,
+                       printf("## Unknown flash on Bank %d ", i + 1);
+                       printf("- Size = 0x%08lx = %ld MB\n",
+                               flash_info[i].size,
                                flash_info[i].size >> 20);
 #endif /* CONFIG_SYS_FLASH_QUIET_TEST */
                }