[v2,02/22] flash: Tidy up coding style for flash functions

Message ID	20200409201506.133129-2-sjg@chromium.org
State	Superseded
Headers	show List-Id: U-Boot discussion <u-boot.lists.denx.de> From: sjg at chromium.org (Simon Glass) Date: Thu, 9 Apr 2020 14:14:46 -0600 Subject: [PATCH v2 02/22] flash: Tidy up coding style for flash functions In-Reply-To: <20200409201506.133129-1-sjg@chromium.org> References: <20200409201506.133129-1-sjg@chromium.org> Message-ID: <20200409201506.133129-2-sjg@chromium.org>
Series	common: Further reduce the size of common.h \| expand [v2,00/22] common: Further reduce the size of common.h [v2,01/22] common: Drop uuid.h from common header [v2,02/22] flash: Tidy up coding style for flash functions [v2,03/22] common: Drop flash.h from common header [v2,04/22] arm: Don't include common.h in header files [v2,05/22] common: Drop net.h from common header [v2,06/22] part: Drop disk_partition_t typedef [v2,07/22] common: Drop part.h from common header [v2,08/22] bootstage: Use BOOTSTAGE instead of BOOTSTATE [v2,09/22] common: Drop bootstage.h from common header [v2,10/22] common: Drop image.h from common header [v2,11/22] common: Drop init.h from common header [v2,12/22] command: Remove the cmd_tbl_t typedef [v2,13/22] Fix some checkpatch warnings in calls to debug() [v2,14/22] common: Drop log.h from common header [v2,15/22] common: Drop asm/ptrace.h from common header [v2,16/22] common: Drop asm_offsets.h from common header [v2,17/22] common: Drop linux/bug.h from common header [v2,18/22] common: Drop linux/stringify.h from common header [v2,19/22] Fix some checkpatch warnings in calls to udelay() [v2,20/22] common: Drop linux/delay.h from common header [v2,21/22] Use __ASSEMBLY__ as the assembly macros [v2,22/22] common: Drop linux/bitops.h from common header

diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c index 7b61fa72260..cfd6490d9dd 100644 --- a/arch/arm/mach-at91/arm926ejs/eflash.c +++ b/arch/arm/mach-at91/arm926ejs/eflash.c @@ -58,7 +58,7 @@ flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; static u32 pagesize; -unsigned long flash_init (void) +unsigned long flash_init(void) { at91_eefc_t *eefc = (at91_eefc_t *) ATMEL_BASE_EEFC; at91_dbu_t *dbu = (at91_dbu_t *) ATMEL_BASE_DBGU; @@ -127,7 +127,7 @@ unsigned long flash_init (void) return size; } -void flash_print_info (flash_info_t *info) +void flash_print_info(flash_info_t *info) { int i; @@ -202,7 +202,7 @@ static u32 erase_write_page (u32 pagenum) & (AT91_EEFC_FSR_FCMDE | AT91_EEFC_FSR_FLOCKE); } -int flash_erase (flash_info_t *info, int s_first, int s_last) +int flash_erase(flash_info_t *info, int s_first, int s_last) { debug("erase first=%d last=%d\n", s_first, s_last); puts("this flash does not need and support erasing!\n"); @@ -215,7 +215,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) * 1 - write timeout */ -int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { u32 pagenum; u32 *src32, *dst32; diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 1d3c5acddf8..e601ed8e720 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -14,7 +14,7 @@ flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; -void flash_print_info (flash_info_t * info) +void flash_print_info(flash_info_t *info) { int i; @@ -55,7 +55,7 @@ Done: } -unsigned long flash_init (void) +unsigned long flash_init(void) { int i, j; ulong size = 0; @@ -98,9 +98,9 @@ unsigned long flash_init (void) size += flash_info[i].size; } - flash_protect (FLAG_PROTECT_SET, - CONFIG_SYS_FLASH_BASE, - CONFIG_SYS_FLASH_BASE + 0x3ffff, &flash_info[0]); + flash_protect(FLAG_PROTECT_SET, + CONFIG_SYS_FLASH_BASE, + CONFIG_SYS_FLASH_BASE + 0x3ffff, &flash_info[0]); return size; } @@ -127,7 +127,7 @@ unsigned long flash_init (void) #define TMO 4 -int flash_erase (flash_info_t * info, int s_first, int s_last) +int flash_erase(flash_info_t *info, int s_first, int s_last) { ulong result; int iflag, cflag, prot, sect; @@ -244,7 +244,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) return rc; } -static int write_word (flash_info_t * info, ulong dest, ulong data) +static int write_word(flash_info_t *info, ulong dest, ulong data) { volatile u16 *addr = (volatile u16 *) dest; ulong result; @@ -311,7 +311,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) } -int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { ulong wp, data; int rc; diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index b0ddee7906a..bd214acc808 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -105,25 +105,26 @@ int misc_init_r (void) /* * Re-do flash protection upon new addresses */ - flash_protect (FLAG_PROTECT_CLEAR, - gd->bd->bi_flashstart, 0xffffffff, - &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); + flash_protect(FLAG_PROTECT_CLEAR, + gd->bd->bi_flashstart, 0xffffffff, + &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); /* Monitor protection ON by default */ - flash_protect (FLAG_PROTECT_SET, - CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, - &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); + flash_protect(FLAG_PROTECT_SET, + CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE + + monitor_flash_len - 1, + &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); /* Environment protection ON by default */ - flash_protect (FLAG_PROTECT_SET, - CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, - &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); + flash_protect(FLAG_PROTECT_SET, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, + &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); /* Redundant environment protection ON by default */ - flash_protect (FLAG_PROTECT_SET, - CONFIG_ENV_ADDR_REDUND, - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, + flash_protect(FLAG_PROTECT_SET, + CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); } diff --git a/cmd/flash.c b/cmd/flash.c index cd1758d7e2e..230d8408a4d 100644 --- a/cmd/flash.c +++ b/cmd/flash.c @@ -88,7 +88,7 @@ abbrev_spec (char *str, flash_info_t ** pinfo, int *psf, int *psl) /* * Take *addr in Flash and adjust it to fall on the end of its sector */ -int flash_sect_roundb (ulong *addr) +int flash_sect_roundb(ulong *addr) { flash_info_t *info; ulong bank, sector_end_addr; @@ -279,7 +279,7 @@ static int do_flinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) for (bank=0; bank <CONFIG_SYS_MAX_FLASH_BANKS; ++bank) { printf ("\nBank # %ld: ", bank+1); - flash_print_info (&flash_info[bank]); + flash_print_info(&flash_info[bank]); } return 0; } @@ -291,7 +291,7 @@ static int do_flinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } printf ("\nBank # %ld: ", bank); - flash_print_info (&flash_info[bank-1]); + flash_print_info(&flash_info[bank - 1]); #endif /* CONFIG_MTD_NOR_FLASH */ return 0; } @@ -316,7 +316,7 @@ static int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) { printf ("Erase Flash Bank # %ld ", bank); info = &flash_info[bank-1]; - rcode = flash_erase (info, 0, info->sector_count-1); + rcode = flash_erase(info, 0, info->sector_count - 1); } return rcode; } @@ -370,7 +370,7 @@ static int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } printf ("Erase Flash Bank # %ld ", bank); info = &flash_info[bank-1]; - rcode = flash_erase (info, 0, info->sector_count-1); + rcode = flash_erase(info, 0, info->sector_count - 1); return rcode; } @@ -390,7 +390,7 @@ static int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } #ifdef CONFIG_MTD_NOR_FLASH -int flash_sect_erase (ulong addr_first, ulong addr_last) +int flash_sect_erase(ulong addr_first, ulong addr_last) { flash_info_t *info; ulong bank; @@ -415,7 +415,8 @@ int flash_sect_erase (ulong addr_first, ulong addr_last) info->start[0] + info->size - 1: info->start[s_last[bank]+1] - 1, bank+1); - rcode = flash_erase (info, s_first[bank], s_last[bank]); + rcode = flash_erase(info, s_first[bank], + s_last[bank]); } } if (rcode == 0) @@ -526,7 +527,8 @@ static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) p ? "" : "Un", argv[1], bank, addr_first, addr_last); - rcode = flash_sect_protect (p, addr_first, addr_last); + rcode = flash_sect_protect(p, addr_first, + addr_last); return rcode; } @@ -580,13 +582,13 @@ static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (addr_first >= addr_last) return CMD_RET_USAGE; - rcode = flash_sect_protect (p, addr_first, addr_last); + rcode = flash_sect_protect(p, addr_first, addr_last); #endif /* CONFIG_MTD_NOR_FLASH */ return rcode; } #ifdef CONFIG_MTD_NOR_FLASH -int flash_sect_protect (int p, ulong addr_first, ulong addr_last) +int flash_sect_protect(int p, ulong addr_first, ulong addr_last) { flash_info_t *info; ulong bank; diff --git a/common/flash.c b/common/flash.c index 5f155aefd1d..9601716c3a2 100644 --- a/common/flash.c +++ b/common/flash.c @@ -24,7 +24,7 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */ * If necessary you have to map the second bank at lower addresses. */ void -flash_protect (int flag, ulong from, ulong to, flash_info_t *info) +flash_protect(int flag, ulong from, ulong to, flash_info_t *info) { ulong b_end; short s_end; @@ -84,7 +84,7 @@ flash_protect (int flag, ulong from, ulong to, flash_info_t *info) */ flash_info_t * -addr2info (ulong addr) +addr2info(ulong addr) { flash_info_t *info; int i; @@ -119,12 +119,12 @@ addr2info (ulong addr) * (only some targets require alignment) */ int -flash_write (char *src, ulong addr, ulong cnt) +flash_write(char *src, ulong addr, ulong cnt) { int i; ulong end = addr + cnt - 1; - flash_info_t *info_first = addr2info (addr); - flash_info_t *info_last = addr2info (end ); + flash_info_t *info_first = addr2info(addr); + flash_info_t *info_last = addr2info(end); flash_info_t *info; __maybe_unused char *src_orig = src; __maybe_unused char *addr_orig = (char *)addr; diff --git a/include/flash.h b/include/flash.h index 2655c72087f..3bf6b22399e 100644 --- a/include/flash.h +++ b/include/flash.h @@ -84,20 +84,20 @@ typedef unsigned long flash_sect_t; /* Prototypes */ -extern unsigned long flash_init (void); -extern void flash_print_info (flash_info_t *); -extern int flash_erase (flash_info_t *, int, int); -extern int flash_sect_erase (ulong addr_first, ulong addr_last); -extern int flash_sect_protect (int flag, ulong addr_first, ulong addr_last); -extern int flash_sect_roundb (ulong *addr); -extern unsigned long flash_sector_size(flash_info_t *info, flash_sect_t sect); -extern void flash_set_verbose(uint); +unsigned long flash_init(void); +void flash_print_info(flash_info_t *info); +int flash_erase(flash_info_t *info, int s_first, int s_last); +int flash_sect_erase(ulong addr_first, ulong addr_last); +int flash_sect_protect(int flag, ulong addr_first, ulong addr_last); +int flash_sect_roundb(ulong *addr); +unsigned long flash_sector_size(flash_info_t *info, flash_sect_t sect); +void flash_set_verbose(uint v); /* common/flash.c */ -extern void flash_protect (int flag, ulong from, ulong to, flash_info_t *info); -extern int flash_write (char *, ulong, ulong); -extern flash_info_t *addr2info (ulong); -extern int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt); +void flash_protect(int flag, ulong from, ulong to, flash_info_t *info); +int flash_write(char *src, ulong addr, ulong cnt); +flash_info_t *addr2info(ulong addr); +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt); /* drivers/mtd/cfi_mtd.c */ #ifdef CONFIG_FLASH_CFI_MTD

[v2,02/22] flash: Tidy up coding style for flash functions

Commit Message

Patch