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 <bmeng.cn@gmail.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>

diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 82407affaf10c724c1303d82e79a4bfc3d0fe760..05918bce07775a3c9f8e15409c07f6420fbfd822 100644 (file)
--- 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 c1c9b89def798840a4c4bc820cbdc256374fd4f6..11409dd06d828882ca818eab6f5e9b0f8cfa6357 100644 (file)
--- 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 eae8d785df9ed431e1cb59b1cad528ff9b5875d8..daa9909e8f372a8fd8d894eb01fad2be662f1d08 100644 (file)
--- 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 351f02107eb78715f1a6ccc64cc475dceef87871..8355c342b6a27d44341677ad3aff8014372aeb96 100644 (file)
--- 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 5babfde2685e46a54ff2c56c76cfa90186c53ba7..c2595b1e61c4472a64370949746da57911ccbc13 100644 (file)
--- a/arch/x86/lib/e820.c
+++ b/arch/x86/lib/e820.c
@@ -17,8 +17,8 @@ DECLARE_GLOBAL_DATA_PTR;
  *     0x100000-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 1a7af576d549c55c06b930bad34eb60c3b383a44..c1c6c5481a49ccbe1683c5fd207170adbba0a675 100644 (file)
--- 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;