From patchwork Tue Apr 26 20:05:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 12827885 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 7E4FBC433F5 for ; Tue, 26 Apr 2022 20:06:42 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0177E17F8; Tue, 26 Apr 2022 22:05:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0177E17F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1651003600; bh=OJQ+xzciXDmtWuKjXovfvB1V82bHISNwHbZvbUeNtr0=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=QKXQUfSCjWGrsFtgloY6iPiUsj8gyWeQQOhuJ5qkIOgziwdZDN2kHkAINPmLsW+ke ilmDnJVhCxI6gtLIejzCB7u87McBlTT+RR5EhhOW2BF/kRXlrA4J7uE4szvajPwHKU P4LiA/A6wmvB+Vby2AfO7uNpiS1hLEirnB1+ON8g= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 98C9DF8014B; Tue, 26 Apr 2022 22:05:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2F43CF80171; Tue, 26 Apr 2022 22:05:46 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AF921F800FA for ; Tue, 26 Apr 2022 22:05:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AF921F800FA Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="b5QoKQ43" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651003540; x=1682539540; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=OJQ+xzciXDmtWuKjXovfvB1V82bHISNwHbZvbUeNtr0=; b=b5QoKQ43gomgNLpeBPJMMg8lK4hlAi8Mqddfv83xBtIwRO46h680RUY1 g1hYyNxrZMZxgPNI4RkS2qm+iZYvGqkhuvk21a+zIRwq5qwc5ULxLAtT9 AEJqjVoBIsj/bNm1CnXCg7veusREayLVegJEJqABqgu80QUAyVdpDGnj/ iotJD1Crj4h9cXcqlFnNz0A1GtagyLdCwyrZNl7oIERlU/ghqpugAGQVh MDusKapn+D+QKofC1ZKtBCA/LVFlOJUXe/oyU2rpMHWtl1mLKZQchI0gW iK3BMRAGd+DMKfMa1sjcFGHDyG6bcuc9NcE54jCkz7mTHzUkPiDQKTLEk Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="265230415" X-IronPort-AV: E=Sophos;i="5.90,291,1643702400"; d="scan'208";a="265230415" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 13:05:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,291,1643702400"; d="scan'208";a="679173592" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga004.jf.intel.com with ESMTP; 26 Apr 2022 13:05:33 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Liam Girdwood , Mark Brown Subject: [PATCH v2 1/2] ALSA: hda: intel-nhlt: Move structs out of #define block Date: Tue, 26 Apr 2022 22:05:38 +0200 Message-Id: <20220426200539.894010-1-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Cc: Pierre-Louis Bossart , Cezary Rojewski , kernel test robot , alsa-devel@alsa-project.org, Takashi Iwai , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" As functions prototypes regerdless of CONFIG options as well as some code depend on structures defined in sound/intel-nhlt.h header, move them out of #define block. This allows to compile code depending on mentioned header with "depends on ACPI || COMPILE_TEST" in Kconfig. Fixes: 47a1886a610a ("ASoC: Intel: avs: Enable AVS driver only on x86 platforms") Reported-by: kernel test robot Suggested-by: Pierre-Louis Bossart Reviewed-by: Cezary Rojewski Signed-off-by: Amadeusz Sławiński --- include/sound/intel-nhlt.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/sound/intel-nhlt.h b/include/sound/intel-nhlt.h index 6fb2d5e378fd..3d5cf201cd80 100644 --- a/include/sound/intel-nhlt.h +++ b/include/sound/intel-nhlt.h @@ -25,8 +25,6 @@ enum nhlt_device_type { NHLT_DEVICE_INVALID }; -#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_INTEL_NHLT) - struct wav_fmt { u16 fmt_tag; u16 channels; @@ -126,6 +124,8 @@ enum { NHLT_MIC_ARRAY_VENDOR_DEFINED = 0xf, }; +#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_INTEL_NHLT) + struct nhlt_acpi_table *intel_nhlt_init(struct device *dev); void intel_nhlt_free(struct nhlt_acpi_table *addr); @@ -143,8 +143,6 @@ intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, #else -struct nhlt_acpi_table; - static inline struct nhlt_acpi_table *intel_nhlt_init(struct device *dev) { return NULL; From patchwork Tue Apr 26 20:05:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 12827886 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 45F59C433F5 for ; Tue, 26 Apr 2022 20:07:15 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0E121182B; Tue, 26 Apr 2022 22:06:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0E121182B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1651003633; bh=NzK314Nib1aAhTnYubOE8y+ivu+PU2RrCUv42tj8wBc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lx3yUSbrLY1xm1p6LCC7d54lMxymVNbRymbnoUcxwI9UMW8rdM3wFTszekKlE3w+G za92BxAyVBykstueymYfvf+qt2l/RFc4lMPVCH7GVGYr34hHOHoF4j0x+oOHnCJL3A McRt5HH0+75Myu348qOr6QPkzAPzWX/2Kny+CK3U= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 53514F80171; Tue, 26 Apr 2022 22:05:52 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8B72FF80152; Tue, 26 Apr 2022 22:05:48 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9D072F80105 for ; Tue, 26 Apr 2022 22:05:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9D072F80105 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="j7955WHx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651003542; x=1682539542; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NzK314Nib1aAhTnYubOE8y+ivu+PU2RrCUv42tj8wBc=; b=j7955WHxbhCqiEwDSqBhewpGJnFcdf+Fmu6GXiJ+M77KC3/c65BNSkjk qwoccg/y6H37QQnqDM0ZK3fDREe/NoBQ9qBDVKkM+AtHIDi3AxVNtX++Z syVdWzeF2hnpPNO74AKxAL8TeJaTBUBLS4KMsX4K64hszXzHc8gCW18xW WRPI1w3PzApQKuVNhTMTaCNjeIJtmhX5Tx1yP6hDKmBsfZ9LDK1qbNL4J pl/aj7RMMi9M4HqBfCJelBfdbNYuRiXaTM9c45lpklz+e6PnRqkWMCtbW fKaEFQqTsW0KTDcow8tn7jm9/vMFm09UOX4yaQ67vfPblLiamM1OwOBpR A==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="265230435" X-IronPort-AV: E=Sophos;i="5.90,291,1643702400"; d="scan'208";a="265230435" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 13:05:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,291,1643702400"; d="scan'208";a="679173597" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga004.jf.intel.com with ESMTP; 26 Apr 2022 13:05:35 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Liam Girdwood , Mark Brown Subject: [PATCH v2 2/2] ASoC: Intel: avs: Drop direct ACPI dependency Date: Tue, 26 Apr 2022 22:05:39 +0200 Message-Id: <20220426200539.894010-2-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426200539.894010-1-amadeuszx.slawinski@linux.intel.com> References: <20220426200539.894010-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Cc: Pierre-Louis Bossart , Cezary Rojewski , kernel test robot , alsa-devel@alsa-project.org, Takashi Iwai , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" With previous patch this allows for building driver on architectures without ACPI support present, when building with COMPILE_TEST enabled. Fixes: 47a1886a610a ("ASoC: Intel: avs: Enable AVS driver only on x86 platforms") Reported-by: kernel test robot Reviewed-by: Cezary Rojewski Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index be42c4eff165..039b45a4a799 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -211,10 +211,10 @@ config SND_SOC_INTEL_KEEMBAY config SND_SOC_INTEL_AVS tristate "Intel AVS driver" - depends on (X86 && ACPI) || COMPILE_TEST + depends on X86 || COMPILE_TEST depends on PCI depends on COMMON_CLK - select SND_SOC_ACPI + select SND_SOC_ACPI if ACPI select SND_SOC_TOPOLOGY select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER