From patchwork Fri Jan 24 09:27:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233273 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 E256AC32771 for ; Fri, 24 Jan 2020 09:43:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B8E17222C2 for ; Fri, 24 Jan 2020 09:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859031; bh=yqDdAP7xTemVVOnjv6iA4MQlsYveHUOMTAuoXetQcgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C2HgHukldikyCk6bZOZT397YWBAa7ENbThYLlUSkIuLBg7ld/GGZbJjvhLz6miJkc Jsu4i2qZVw+VZ59fJPe7w+FX6CHmVVjCOyPtRzt98KK+2/ZDaFOS2DnTpwf+XQ79hQ 4/1Yg3eJFApxxS4DkERTfctyOiUxCYwdsi0d+SA4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733079AbgAXJnV (ORCPT ); Fri, 24 Jan 2020 04:43:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:41250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732137AbgAXJnS (ORCPT ); Fri, 24 Jan 2020 04:43:18 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1F4F20718; Fri, 24 Jan 2020 09:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858998; bh=yqDdAP7xTemVVOnjv6iA4MQlsYveHUOMTAuoXetQcgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wJAShd2jS0B+QRQyi0ybAEbXsvca/0jGIhWt2Yq3k/BoL0S3yLF/DZ1jMmiGu2KfI SiIJVOTmNDQz9Cv9+C7fV0Yx9zEvsQbaN3iRQ0UuaFSH6S7SiF4V/F9MwdZ9ON5Rn0 tU6+BlZxwkVoiZALlMUSJt7exbjaurRSSkSrtiTg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anders Roxell , Takashi Iwai , Sasha Levin Subject: [PATCH 4.14 010/343] ALSA: hda: fix unused variable warning Date: Fri, 24 Jan 2020 10:27:08 +0100 Message-Id: <20200124092920.984673182@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anders Roxell [ Upstream commit 5b03006d5c58ddd31caf542eef4d0269bcf265b3 ] When CONFIG_X86=n function azx_snoop doesn't use the variable chip it only returns true. sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’: sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable] struct azx *chip = bus_to_azx(bus); ^~~~ Create a inline function of azx_snoop. Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object") Signed-off-by: Anders Roxell Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/hda_controller.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index 8a9dd4767b1ec..63cc10604afc7 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -176,11 +176,10 @@ struct azx { #define azx_bus(chip) (&(chip)->bus.core) #define bus_to_azx(_bus) container_of(_bus, struct azx, bus.core) -#ifdef CONFIG_X86 -#define azx_snoop(chip) ((chip)->snoop) -#else -#define azx_snoop(chip) true -#endif +static inline bool azx_snoop(struct azx *chip) +{ + return !IS_ENABLED(CONFIG_X86) || chip->snoop; +} /* * macros for easy use