Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit c8a9a82c10e0c55f6cfa71cb174968cb54acfa5d

Authored by Mario Six
Committed by Stefan Roese
1 parent 876c52f3c3
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

cfi_flash: Rename camel-case variables 

Camel-case naming should be avoided. Rename two camel-case variables,
and fix their usage accordingly.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff

drivers/mtd/cfi_flash.c
Diff comments   View file @ c8a9a82
... ... @@ -1687,8 +1687,8 @@
1687 1687  
1688 1688 static void cmdset_amd_read_jedec_ids(flash_info_t *info)
1689 1689 {
1690   - ushort bankId = 0;
1691   - uchar manuId;
  1690 + ushort bank_id = 0;
  1691 + uchar manu_id;
1692 1692 uchar feature;
1693 1693  
1694 1694 flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
1695 1695  
1696 1696  
... ... @@ -1696,14 +1696,14 @@
1696 1696 flash_write_cmd(info, 0, info->addr_unlock1, FLASH_CMD_READ_ID);
1697 1697 udelay(1000); /* some flash are slow to respond */
1698 1698  
1699   - manuId = flash_read_uchar(info, FLASH_OFFSET_MANUFACTURER_ID);
  1699 + manu_id = flash_read_uchar(info, FLASH_OFFSET_MANUFACTURER_ID);
1700 1700 /* JEDEC JEP106Z specifies ID codes up to bank 7 */
1701   - while (manuId == FLASH_CONTINUATION_CODE && bankId < 0x800) {
1702   - bankId += 0x100;
1703   - manuId = flash_read_uchar(info,
1704   - bankId | FLASH_OFFSET_MANUFACTURER_ID);
  1701 + while (manu_id == FLASH_CONTINUATION_CODE && bank_id < 0x800) {
  1702 + bank_id += 0x100;
  1703 + manu_id = flash_read_uchar(info,
  1704 + bank_id | FLASH_OFFSET_MANUFACTURER_ID);
1705 1705 }
1706   - info->manufacturer_id = manuId;
  1706 + info->manufacturer_id = manu_id;
1707 1707  
1708 1708 debug("info->ext_addr = 0x%x, cfi_version = 0x%x\n",
1709 1709 info->ext_addr, info->cfi_version);