| From 7971281425a53ebbe3ce6b0cf01d9f93b1ff1895 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 1 Apr 2021 13:15:33 +0000 |
| Subject: ARM: OMAP2+: Fix build warning when mmc_omap is not built |
| |
| 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 418a61ecb827..5e86145db0e2 100644 |
| --- a/arch/arm/mach-omap2/board-n8x0.c |
| +++ b/arch/arm/mach-omap2/board-n8x0.c |
| @@ -322,6 +322,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()) { |
| @@ -339,7 +340,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 |
| |
