efi: Fix compiler warnings (unused, const, type)
authorCatalin Marinas <catalin.marinas@arm.com>
Mon, 2 Jun 2014 10:31:06 +0000 (11:31 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Thu, 19 Jun 2014 14:03:05 +0000 (15:03 +0100)
This patch fixes a few compiler warning in the efi code for unused
variable, discarding const qualifier and wrong pointer type:

drivers/firmware/efi/fdt.c|66 col 22| warning: unused variable ‘name’ [-Wunused-variable]
drivers/firmware/efi/efi.c|368 col 3| warning: passing argument 3 of ‘of_get_flat_dt_prop’ from incompatible pointer type [enabled by default]
drivers/firmware/efi/efi.c|368 col 8| warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
drivers/firmware/efi/efi.c
drivers/firmware/efi/fdt.c

index cd36deb619fa825a9684bfaa073eca3273f7919f..eff1a2f22f09bb4b147488aeb8ae0b11dbb6f6d8 100644 (file)
@@ -353,10 +353,10 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
                                       int depth, void *data)
 {
        struct param_info *info = data;
-       void *prop, *dest;
-       unsigned long len;
+       const void *prop;
+       void *dest;
        u64 val;
-       int i;
+       int i, len;
 
        if (depth != 1 ||
            (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
index 5c6a8e8a9580a11f1b5c16586b647da22eb094b4..82d774161cc9d65783954451aaee771c24e2e2e6 100644 (file)
@@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
         */
        prev = 0;
        for (;;) {
-               const char *type, *name;
+               const char *type;
                int len;
 
                node = fdt_next_node(fdt, prev, NULL);