GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-18 20:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cfi_flash: Fix indention

Browse source 
When long expressions surrounded by parentheses are split into multiple
lines, each consecutive line should be aligned with the corresponding
parenthesis. Fix all instances where this occurs.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Mario Six 2018-01-26 14:43:55 +01:00 • committed by Stefan Roese
parent ddcf05403d
commit c0350fbf4c
1 changed files with 118 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/mtd/cfi_flash.c
View file

@ -408,8 +408,8 @@ static void flash_unlock_seq(flash_info_t *info, flash_sect_t sect)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
static int flash_isequal(flash_info_t *info, flash_sect_t sect, static int flash_isequal(flash_info_t *info, flash_sect_t sect, uint offset,
uint offset, uchar cmd) uchar cmd)
{ {
void *addr; void *addr;
cfiword_t cword; cfiword_t cword;
@ -456,8 +456,8 @@ static int flash_isequal(flash_info_t *info, flash_sect_t sect,
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
static int flash_isset(flash_info_t *info, flash_sect_t sect, static int flash_isset(flash_info_t *info, flash_sect_t sect, uint offset,
uint offset, uchar cmd) uchar cmd)
{ {
void *addr; void *addr;
cfiword_t cword; cfiword_t cword;
@ -489,8 +489,8 @@ static int flash_isset(flash_info_t *info, flash_sect_t sect,
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
static int flash_toggle(flash_info_t *info, flash_sect_t sect, static int flash_toggle(flash_info_t *info, flash_sect_t sect, uint offset,
uint offset, uchar cmd) uchar cmd)
{ {
u8 *addr; u8 *addr;
cfiword_t cword; cfiword_t cword;
@ -781,8 +781,7 @@ static flash_sect_t find_sector(flash_info_t *info, ulong addr)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
static int flash_write_cfiword(flash_info_t *info, ulong dest, static int flash_write_cfiword(flash_info_t *info, ulong dest, cfiword_t cword)
cfiword_t cword)
{ {
void *dstaddr = (void *)dest; void *dstaddr = (void *)dest;
int flag; int flag;
@ -1257,8 +1256,7 @@ void flash_print_info(flash_info_t *info)
if (info->vendor == CFI_CMDSET_AMD_STANDARD && info->legacy_unlock) if (info->vendor == CFI_CMDSET_AMD_STANDARD && info->legacy_unlock)
printf("\n Advanced Sector Protection (PPB) enabled"); printf("\n Advanced Sector Protection (PPB) enabled");
printf("\n Erase timeout: %ld ms, write timeout: %ld ms\n", printf("\n Erase timeout: %ld ms, write timeout: %ld ms\n",
info->erase_blk_tout, info->erase_blk_tout, info->write_tout);
info->write_tout);
if (info->buffer_size > 1) { if (info->buffer_size > 1) {
printf(" Buffer write timeout: %ld ms, ", printf(" Buffer write timeout: %ld ms, ",
info->buffer_write_tout); info->buffer_write_tout);
@ -1684,8 +1682,8 @@ static int cmdset_intel_init(flash_info_t *info, struct cfi_qry *qry)
#ifdef CONFIG_SYS_FLASH_PROTECTION #ifdef CONFIG_SYS_FLASH_PROTECTION
/* read legacy lock/unlock bit from intel flash */ /* read legacy lock/unlock bit from intel flash */
if (info->ext_addr) { if (info->ext_addr) {
info->legacy_unlock = flash_read_uchar(info, info->legacy_unlock =
info->ext_addr + 5) & 0x08; flash_read_uchar(info, info->ext_addr + 5) & 0x08;
} }
#endif #endif
@ -1869,8 +1867,8 @@ static inline int flash_detect_legacy(phys_addr_t base, int banknum)
* detect if flash is compatible with the Common Flash Interface (CFI) * detect if flash is compatible with the Common Flash Interface (CFI)
* http://www.jedec.org/download/search/jesd68.pdf * http://www.jedec.org/download/search/jesd68.pdf
*/ */
static void flash_read_cfi(flash_info_t *info, void *buf, static void flash_read_cfi(flash_info_t *info, void *buf, unsigned int start,
unsigned int start, size_t len) size_t len)
{ {
u8 *p = buf; u8 *p = buf;
unsigned int i; unsigned int i;