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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 E2DA3C433FF for ; Fri, 9 Aug 2019 10:04:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA4232171F for ; Fri, 9 Aug 2019 10:04:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406236AbfHIKEZ (ORCPT ); Fri, 9 Aug 2019 06:04:25 -0400 Received: from mx2.suse.de ([195.135.220.15]:56926 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726185AbfHIKEZ (ORCPT ); Fri, 9 Aug 2019 06:04:25 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D5DC8AE36; Fri, 9 Aug 2019 10:04:23 +0000 (UTC) Date: Fri, 09 Aug 2019 12:04:23 +0200 Message-ID: From: Takashi Iwai To: YueHaibing Cc: , , , , , Takashi Iwai , , Subject: Re: [PATCH] ASoC: SOF: Intel: Add missing include file hdac_hda.h In-Reply-To: <20190809095550.71040-1-yuehaibing@huawei.com> References: <20190809095550.71040-1-yuehaibing@huawei.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 09 Aug 2019 11:55:50 +0200, YueHaibing wrote: > > Building with SND_SOC_SOF_HDA_AUDIO_CODEC fails: > > sound/soc/sof/intel/hda-bus.c: In function sof_hda_bus_init: > sound/soc/sof/intel/hda-bus.c:16:25: error: implicit declaration of function > snd_soc_hdac_hda_get_ops; did you mean snd_soc_jack_add_gpiods? [-Werror=implicit-function-declaration] > #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() > > Reported-by: Hulk Robot > Fixes: d4ff1b3917a5 ('ASoC: SOF: Intel: Initialize hdaudio bus properly") > Signed-off-by: YueHaibing Damn, it seems another oversight. And now the inclusion in sound/soc/sof/intel/hda.c is superfluous, too, so we should just move like diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c index 0caec3a070d3..2b384134a3db 100644 --- a/sound/soc/sof/intel/hda-bus.c +++ b/sound/soc/sof/intel/hda-bus.c @@ -11,6 +11,9 @@ #include #include "../sof-priv.h" #include "hda.h" +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) +#include "../../codecs/hdac_hda.h" +#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 7ca27000c34d..dd6c8ad62b3e 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -23,9 +23,6 @@ #include #include "../ops.h" #include "hda.h" -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) -#include "../../codecs/hdac_hda.h" -#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) #include Could you check whether this works instead? BTW, the inclusion of "../../codecs/hdac_hdac.h" is very ugly... In general if a header file is referred from another driver, it should be in a more public place under include/sound. If any, we can create a subdirectory like include/sound/codecs. thanks, Takashi