lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 04/57] ARM: OMAP2+: Fix build warning when mmc_omap is not built
    Date
    From: Yongqiang Liu <liuyongqiang13@huawei.com>

    [ Upstream commit 040ab72ee10ea88e1883ad143b3e2b77596abc31 ]

    GCC reports the following warning with W=1:

    arch/arm/mach-omap2/board-n8x0.c:325:19: warning:
    variable 'index' set but not used [-Wunused-but-set-variable]
    325 | int bit, *openp, index;
    | ^~~~~

    Fix this by moving CONFIG_MMC_OMAP to cover the rest codes
    in the n8x0_mmc_callback().

    Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-omap2/board-n8x0.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
    index b6443a4e0c78..68af9d9566cb 100644
    --- a/arch/arm/mach-omap2/board-n8x0.c
    +++ b/arch/arm/mach-omap2/board-n8x0.c
    @@ -328,6 +328,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot)

    static void n8x0_mmc_callback(void *data, u8 card_mask)
    {
    +#ifdef CONFIG_MMC_OMAP
    int bit, *openp, index;

    if (board_is_n800()) {
    @@ -345,7 +346,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask)
    else
    *openp = 0;

    -#ifdef CONFIG_MMC_OMAP
    omap_mmc_notify_cover_event(mmc_device, index, *openp);
    #else
    pr_warn("MMC: notify cover event not available\n");
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 17:24    [W:4.115 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site