lkml.org 
[lkml]   [2019]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 070/135] arm64/efi: fix variable 'si' set but not used
    Date
    From: Qian Cai <cai@lca.pw>

    [ Upstream commit f1d4836201543e88ebe70237e67938168d5fab19 ]

    GCC throws out this warning on arm64.

    drivers/firmware/efi/libstub/arm-stub.c: In function 'efi_entry':
    drivers/firmware/efi/libstub/arm-stub.c:132:22: warning: variable 'si'
    set but not used [-Wunused-but-set-variable]

    Fix it by making free_screen_info() a static inline function.

    Acked-by: Will Deacon <will@kernel.org>
    Signed-off-by: Qian Cai <cai@lca.pw>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/include/asm/efi.h | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
    index c9e9a6978e73e..d3cb42fd51ec2 100644
    --- a/arch/arm64/include/asm/efi.h
    +++ b/arch/arm64/include/asm/efi.h
    @@ -105,7 +105,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base,
    ((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)

    #define alloc_screen_info(x...) &screen_info
    -#define free_screen_info(x...)
    +
    +static inline void free_screen_info(efi_system_table_t *sys_table_arg,
    + struct screen_info *si)
    +{
    +}

    /* redeclare as 'hidden' so the compiler will generate relative references */
    extern struct screen_info screen_info __attribute__((__visibility__("hidden")));
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-22 19:26    [W:4.144 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site