From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C36DFC47094 for ; Mon, 7 Jun 2021 16:25:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A68A56141E for ; Mon, 7 Jun 2021 16:25:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233561AbhFGQ1R (ORCPT ); Mon, 7 Jun 2021 12:27:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:60286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233736AbhFGQYY (ORCPT ); Mon, 7 Jun 2021 12:24:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A0F8B6193A; Mon, 7 Jun 2021 16:15:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623082551; bh=rZ+JedCEiYdwJLZb9Oyw/qaUMaGTkv+dKrVKQXVQz+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QNBVekV1ZlFzznxNQWTFoY6CSimvjJbt51C7Jsndu41271bc7Usc/Z+H6q+UGMVnF pX63Wzayyhvbd/Sklpj4umYAGa/V5Kt9yl9JtKfn/DCXIHLqc21URpldNethHLtH6o WQUeTtuOBsUJ/gFYhO22K0RIsKkhgM8XYDsWsTgc/YKvFR/+6g+7WF4q5acBil1jXM CZq8wLIN7B1VicRMRFmTBWGXX+w62bhLCisXTo1HbJnaIuLTdX2Tq82rV9nmLqvfOF /eD5XBSEEV2qgFWczfYvgcb4pdAQjA4VsEN+RJttjajvxW7hd4IXkBq/0cJOuoSEAc wBLxHPCxg08cA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yongqiang Liu , Tony Lindgren , Sasha Levin , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 05/15] ARM: OMAP2+: Fix build warning when mmc_omap is not built Date: Mon, 7 Jun 2021 12:15:33 -0400 Message-Id: <20210607161543.3584778-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210607161543.3584778-1-sashal@kernel.org> References: <20210607161543.3584778-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yongqiang Liu [ 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 Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- 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 6b6fda65fb3b..5eeecf83c9e6 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -327,6 +327,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()) { @@ -344,7 +345,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