]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: OMAP2+: Fix build warning when mmc_omap is not built
authorYongqiang Liu <liuyongqiang13@huawei.com>
Thu, 1 Apr 2021 13:15:33 +0000 (13:15 +0000)
committerSasha Levin <sashal@kernel.org>
Wed, 30 Jun 2021 12:49:30 +0000 (08:49 -0400)
[ 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

index b6443a4e0c78002d6665479a608e7915b1801015..68af9d9566cbad2cfd6003577f4a964863956e64 100644 (file)
@@ -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");