From: Takashi Iwai Subject: Re: [PATCH] ALSA: x86: hdmi: fix build with CONFIG_PM=n Date: Wed, 01 Feb 2017 18:01:44 +0100 Message-ID: References: <20170201162030.2176464-1-arnd@arndb.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id EBAB6267480 for ; Wed, 1 Feb 2017 18:01:46 +0100 (CET) In-Reply-To: <20170201162030.2176464-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Arnd Bergmann Cc: alsa-devel@alsa-project.org, Pierre-Louis Bossart , linux-kernel@vger.kernel.org, Julia Lawall , Jerome Anand List-Id: alsa-devel@alsa-project.org On Wed, 01 Feb 2017 17:19:47 +0100, Arnd Bergmann wrote: > > The runtime_status field is defined conditionally and must not be accessed outside > of #ifdef CONFIG_PM: > > sound/x86/intel_hdmi_audio_if.c: In function 'hdmi_audio_suspend': > sound/x86/intel_hdmi_audio_if.c:112:30: error: 'struct dev_pm_info' has no member named 'runtime_status' > if (intelhaddata->dev->power.runtime_status != RPM_SUSPENDED) { > > pm_runtime_status_suspended() does what we need here. > > Fixes: 5dab11d89777 ("ALSA: x86: hdmi: Add audio support for BYT and CHT") > Signed-off-by: Arnd Bergmann Thanks, I already have a similar fix in my local queue, but it wasn't published yet as it depends on another patchset. Now found in topic/intel-lpe-audio-cleanup branch. Hopefully the whole patches will be merged in this week. Takashi > --- > sound/x86/intel_hdmi_audio_if.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/x86/intel_hdmi_audio_if.c b/sound/x86/intel_hdmi_audio_if.c > index 9ae242d62eb2..99eecef87e62 100644 > --- a/sound/x86/intel_hdmi_audio_if.c > +++ b/sound/x86/intel_hdmi_audio_if.c > @@ -109,7 +109,7 @@ int hdmi_audio_suspend(void *haddata, struct hdmi_audio_event event) > had_stream = intelhaddata->private_data; > substream = intelhaddata->stream_info.had_substream; > > - if (intelhaddata->dev->power.runtime_status != RPM_SUSPENDED) { > + if (!pm_runtime_status_suspended(intelhaddata->dev)) { > pr_err("audio stream is active\n"); > return -EAGAIN; > } > -- > 2.9.0 > >