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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22C8DC7EE25 for ; Mon, 12 Jun 2023 13:35:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83CEC10E04D; Mon, 12 Jun 2023 13:35:49 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id C6FE710E04D; Mon, 12 Jun 2023 13:35:47 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E30E1616FD; Mon, 12 Jun 2023 13:35:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1F1AC433D2; Mon, 12 Jun 2023 13:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686576946; bh=qAGctGPmTEGb8Q322023xH/8ic4A2qSPM1FKoiXCBSk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QvDxDyruXr+m7Nhq2DHbE0eMq5Bv0/Vs2UIxhO1PWnbg0RpNbROQQ5QB/y1lEB1nt ZL1O4J8dEmi33KST4wq8FgbUVFfzUMR6n3Z3R1GTC4IyWFW00ncK7P51eA08JXQPze Zp4+Te3auFeleRBfNrA0AX+fzfh1CHJ3EsEq6/Wt0UQfsyFPxI3bpRPyCW8dShDV4v AOWIm/TJhAPQ4S9N56JhjTxGWe71+OEYKlxPdyW2zPQCcAcgtjnx6CZUQqOXsD/dJb IoMN2TehnUo8DvHbJvllWjDXLgB252JvWBVLkyeBVog4bKehA2aflV1oxP5+W+PYH1 tk1qIdNsos5hA== Date: Mon, 12 Jun 2023 15:35:42 +0200 From: Andi Shyti To: Arnd Bergmann Message-ID: <20230612133542.knm4edwlk2nhfboj@intel.intel> References: <20230612124408.521325-1-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230612124408.521325-1-arnd@kernel.org> Subject: Re: [Intel-gfx] [PATCH] drm/i915/gmch: avoid unused variable warning X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Rodrigo Vivi , David Airlie Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Arnd, On Mon, Jun 12, 2023 at 02:43:59PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann > > When CONFIG_PNP is disabled, the mchbar_addr variable is only written but > not read: > > drivers/gpu/drm/i915/soc/intel_gmch.c: In function 'intel_alloc_mchbar_resource': > drivers/gpu/drm/i915/soc/intel_gmch.c:41:13: error: variable 'mchbar_addr' set but not used [-Werror=unused-but-set-variable] > 41 | u64 mchbar_addr; > | ^~~~~~~~~~~ > > No idea why this showed up now, but it's easy to fix by changing the #ifdef to > an IS_ENABLED() check that the compiler can see through. > > Signed-off-by: Arnd Bergmann Reviewed-by: Andi Shyti Andi > --- > I saw this last week already, so it's likely that someone else already sent > a fix for it. > > drivers/gpu/drm/i915/soc/intel_gmch.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.c b/drivers/gpu/drm/i915/soc/intel_gmch.c > index 6d0204942f7a5..49c7fb16e934f 100644 > --- a/drivers/gpu/drm/i915/soc/intel_gmch.c > +++ b/drivers/gpu/drm/i915/soc/intel_gmch.c > @@ -47,11 +47,9 @@ intel_alloc_mchbar_resource(struct drm_i915_private *i915) > mchbar_addr = ((u64)temp_hi << 32) | temp_lo; > > /* If ACPI doesn't have it, assume we need to allocate it ourselves */ > -#ifdef CONFIG_PNP > - if (mchbar_addr && > + if (IS_ENABLED(CONFIG_PNP) && mchbar_addr && > pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE)) > return 0; > -#endif > > /* Get some space for it */ > i915->gmch.mch_res.name = "i915 MCHBAR"; > -- > 2.39.2 >