Re: [U-Boot] [PATCH v2 05/18] x86: Use 'unsigned int' in install_e820_map() functions
On Thu, Apr 12, 2018 at 3:27 PM, Christian Gmeinerwrote: > 2018-04-12 7:02 GMT+02:00 Bin Meng : >> This fixes the following checkpatch warning: >> >> warning: Prefer 'unsigned int' to bare use of 'unsigned' >> >> Signed-off-by: Bin Meng > > Reviewed-by: Christian Gmeiner > >> --- >> >> Changes in v2: None >> >> arch/x86/cpu/coreboot/sdram.c | 7 --- >> arch/x86/cpu/qemu/e820.c | 3 ++- >> arch/x86/cpu/tangier/sdram.c | 6 -- >> arch/x86/include/asm/e820.h | 3 ++- >> arch/x86/lib/e820.c | 4 ++-- >> arch/x86/lib/fsp/fsp_dram.c | 5 +++-- >> 6 files changed, 17 insertions(+), 11 deletions(-) >> applied to u-boot-x86, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 05/18] x86: Use 'unsigned int' in install_e820_map() functions
2018-04-12 7:02 GMT+02:00 Bin Meng: > This fixes the following checkpatch warning: > > warning: Prefer 'unsigned int' to bare use of 'unsigned' > > Signed-off-by: Bin Meng Reviewed-by: Christian Gmeiner > --- > > Changes in v2: None > > arch/x86/cpu/coreboot/sdram.c | 7 --- > arch/x86/cpu/qemu/e820.c | 3 ++- > arch/x86/cpu/tangier/sdram.c | 6 -- > arch/x86/include/asm/e820.h | 3 ++- > arch/x86/lib/e820.c | 4 ++-- > arch/x86/lib/fsp/fsp_dram.c | 5 +++-- > 6 files changed, 17 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c > index 82407af..05918bc 100644 > --- a/arch/x86/cpu/coreboot/sdram.c > +++ b/arch/x86/cpu/coreboot/sdram.c > @@ -12,12 +12,13 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) > +unsigned int install_e820_map(unsigned int max_entries, > + struct e820entry *entries) > { > - unsigned num_entries; > + unsigned int num_entries; > int i; > > - num_entries = min((unsigned)lib_sysinfo.n_memranges, max_entries); > + num_entries = min((unsigned int)lib_sysinfo.n_memranges, max_entries); > if (num_entries < lib_sysinfo.n_memranges) { > printf("Warning: Limiting e820 map to %d entries.\n", > num_entries); > diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c > index c1c9b89..11409dd 100644 > --- a/arch/x86/cpu/qemu/e820.c > +++ b/arch/x86/cpu/qemu/e820.c > @@ -9,7 +9,8 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) > +unsigned int install_e820_map(unsigned int max_entries, > + struct e820entry *entries) > { > entries[0].addr = 0; > entries[0].size = ISA_START_ADDRESS; > diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c > index eae8d78..daa9909 100644 > --- a/arch/x86/cpu/tangier/sdram.c > +++ b/arch/x86/cpu/tangier/sdram.c > @@ -99,7 +99,8 @@ static struct sfi_table_simple *sfi_search_mmap(void) > i < SFI_GET_NUM_ENTRIES(sb, struct sfi_mem_entry); \ > i++, mentry++) \ > > -static unsigned sfi_setup_e820(unsigned max_entries, struct e820entry > *entries) > +static unsigned int sfi_setup_e820(unsigned int max_entries, > + struct e820entry *entries) > { > struct sfi_table_simple *sb; > struct sfi_mem_entry *mentry; > @@ -188,7 +189,8 @@ static phys_size_t sfi_get_ram_size(void) > return ram; > } > > -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) > +unsigned int install_e820_map(unsigned int max_entries, > + struct e820entry *entries) > { > return sfi_setup_e820(max_entries, entries); > } > diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h > index 351f021..8355c34 100644 > --- a/arch/x86/include/asm/e820.h > +++ b/arch/x86/include/asm/e820.h > @@ -24,6 +24,7 @@ struct e820entry { > #endif /* __ASSEMBLY__ */ > > /* Implementation defined function to install an e820 map */ > -unsigned install_e820_map(unsigned max_entries, struct e820entry *); > +unsigned int install_e820_map(unsigned int max_entries, > + struct e820entry *); > > #endif /* _ASM_X86_E820_H */ > diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c > index 5babfde..c2595b1 100644 > --- a/arch/x86/lib/e820.c > +++ b/arch/x86/lib/e820.c > @@ -17,8 +17,8 @@ DECLARE_GLOBAL_DATA_PTR; > * 0x10-gd->ram_size Useable RAM > * CONFIG_PCIE_ECAM_BASE PCIe ECAM > */ > -__weak unsigned install_e820_map(unsigned max_entries, > -struct e820entry *entries) > +__weak unsigned int install_e820_map(unsigned int max_entries, > +struct e820entry *entries) > { > entries[0].addr = 0; > entries[0].size = ISA_START_ADDRESS; > diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c > index 1a7af57..c1c6c54 100644 > --- a/arch/x86/lib/fsp/fsp_dram.c > +++ b/arch/x86/lib/fsp/fsp_dram.c > @@ -62,9 +62,10 @@ ulong board_get_usable_ram_top(ulong total_size) > return fsp_get_usable_lowmem_top(gd->arch.hob_list); > } > > -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) > +unsigned int install_e820_map(unsigned int max_entries, > + struct e820entry *entries) > { > - unsigned num_entries = 0; > + unsigned int num_entries = 0; > const struct hob_header *hdr; > struct hob_res_desc *res_desc; > > -- > 2.7.4 > -- greets -- Christian Gmeiner, MSc https://christian-gmeiner.info ___
[U-Boot] [PATCH v2 05/18] x86: Use 'unsigned int' in install_e820_map() functions
This fixes the following checkpatch warning: warning: Prefer 'unsigned int' to bare use of 'unsigned' Signed-off-by: Bin Meng--- Changes in v2: None arch/x86/cpu/coreboot/sdram.c | 7 --- arch/x86/cpu/qemu/e820.c | 3 ++- arch/x86/cpu/tangier/sdram.c | 6 -- arch/x86/include/asm/e820.h | 3 ++- arch/x86/lib/e820.c | 4 ++-- arch/x86/lib/fsp/fsp_dram.c | 5 +++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 82407af..05918bc 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -12,12 +12,13 @@ DECLARE_GLOBAL_DATA_PTR; -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) +unsigned int install_e820_map(unsigned int max_entries, + struct e820entry *entries) { - unsigned num_entries; + unsigned int num_entries; int i; - num_entries = min((unsigned)lib_sysinfo.n_memranges, max_entries); + num_entries = min((unsigned int)lib_sysinfo.n_memranges, max_entries); if (num_entries < lib_sysinfo.n_memranges) { printf("Warning: Limiting e820 map to %d entries.\n", num_entries); diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index c1c9b89..11409dd 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -9,7 +9,8 @@ DECLARE_GLOBAL_DATA_PTR; -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) +unsigned int install_e820_map(unsigned int max_entries, + struct e820entry *entries) { entries[0].addr = 0; entries[0].size = ISA_START_ADDRESS; diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c index eae8d78..daa9909 100644 --- a/arch/x86/cpu/tangier/sdram.c +++ b/arch/x86/cpu/tangier/sdram.c @@ -99,7 +99,8 @@ static struct sfi_table_simple *sfi_search_mmap(void) i < SFI_GET_NUM_ENTRIES(sb, struct sfi_mem_entry); \ i++, mentry++) \ -static unsigned sfi_setup_e820(unsigned max_entries, struct e820entry *entries) +static unsigned int sfi_setup_e820(unsigned int max_entries, + struct e820entry *entries) { struct sfi_table_simple *sb; struct sfi_mem_entry *mentry; @@ -188,7 +189,8 @@ static phys_size_t sfi_get_ram_size(void) return ram; } -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) +unsigned int install_e820_map(unsigned int max_entries, + struct e820entry *entries) { return sfi_setup_e820(max_entries, entries); } diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 351f021..8355c34 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h @@ -24,6 +24,7 @@ struct e820entry { #endif /* __ASSEMBLY__ */ /* Implementation defined function to install an e820 map */ -unsigned install_e820_map(unsigned max_entries, struct e820entry *); +unsigned int install_e820_map(unsigned int max_entries, + struct e820entry *); #endif /* _ASM_X86_E820_H */ diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c index 5babfde..c2595b1 100644 --- a/arch/x86/lib/e820.c +++ b/arch/x86/lib/e820.c @@ -17,8 +17,8 @@ DECLARE_GLOBAL_DATA_PTR; * 0x10-gd->ram_size Useable RAM * CONFIG_PCIE_ECAM_BASE PCIe ECAM */ -__weak unsigned install_e820_map(unsigned max_entries, -struct e820entry *entries) +__weak unsigned int install_e820_map(unsigned int max_entries, +struct e820entry *entries) { entries[0].addr = 0; entries[0].size = ISA_START_ADDRESS; diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 1a7af57..c1c6c54 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -62,9 +62,10 @@ ulong board_get_usable_ram_top(ulong total_size) return fsp_get_usable_lowmem_top(gd->arch.hob_list); } -unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) +unsigned int install_e820_map(unsigned int max_entries, + struct e820entry *entries) { - unsigned num_entries = 0; + unsigned int num_entries = 0; const struct hob_header *hdr; struct hob_res_desc *res_desc; -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot