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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 8469EC169C4 for ; Fri, 8 Feb 2019 07:37:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55CFE21924 for ; Fri, 8 Feb 2019 07:37:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727212AbfBHHh1 (ORCPT ); Fri, 8 Feb 2019 02:37:27 -0500 Received: from mx2.suse.de ([195.135.220.15]:56394 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726115AbfBHHh1 (ORCPT ); Fri, 8 Feb 2019 02:37:27 -0500 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 27F72ADAA; Fri, 8 Feb 2019 07:37:26 +0000 (UTC) Date: Fri, 08 Feb 2019 08:37:25 +0100 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: Mark Brown , Liam Girdwood , Linux Next Mailing List , Linux Kernel Mailing List , Maruthi Srinivas Bayyavarapu Subject: Re: linux-next: build failure after merge of the sound-asoc tree In-Reply-To: <20190208131823.0fd205b5@canb.auug.org.au> References: <20190208131823.0fd205b5@canb.auug.org.au> 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, 08 Feb 2019 03:18:23 +0100, Stephen Rothwell wrote: > > Hi all, > > After merging the sound-asoc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > sound/soc/xilinx/xlnx_formatter_pcm.c: In function 'xlnx_formatter_pcm_new': > sound/soc/xilinx/xlnx_formatter_pcm.c:539:9: error: void value not ignored as it ought to be > return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > SNDRV_DMA_TYPE_DEV, component->dev, > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > xlnx_pcm_hardware.buffer_bytes_max, > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > xlnx_pcm_hardware.buffer_bytes_max); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > sound/soc/xilinx/xlnx_formatter_pcm.c:543:1: warning: control reaches end of non-void function [-Wreturn-type] > } > ^ > > Caused by commit > > 6f6c3c36f091 ("ASoC: xlnx: add pcm formatter platform driver") > > interacting with commit > > 9adb5165f1de ("ALSA: pcm: Define snd_pcm_lib_preallocate_*() as returning void") > > from the sound tree. > > I have applied the following merge fix patch for today: > > From: Stephen Rothwell > Date: Fri, 8 Feb 2019 13:14:24 +1100 > Subject: [PATCH] Asoc: xlnx: fix up for snd_pcm_lib_preallocate_pages_for_all() API change > > Signed-off-by: Stephen Rothwell > --- > sound/soc/xilinx/xlnx_formatter_pcm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c > index 97177d35652e..dc8721f4f56b 100644 > --- a/sound/soc/xilinx/xlnx_formatter_pcm.c > +++ b/sound/soc/xilinx/xlnx_formatter_pcm.c > @@ -536,10 +536,11 @@ static int xlnx_formatter_pcm_new(struct snd_soc_pcm_runtime *rtd) > { > struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, > DRV_NAME); > - return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, > + snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, > SNDRV_DMA_TYPE_DEV, component->dev, > xlnx_pcm_hardware.buffer_bytes_max, > xlnx_pcm_hardware.buffer_bytes_max); > + return 0; > } > > static const struct snd_pcm_ops xlnx_formatter_pcm_ops = { > -- > 2.20.1 Thanks Stephen. Mark, could you apply it on your tree? Or let me pull your tree into mine. Takashi