From patchwork Fri Oct 20 01:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 155754 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp765576vqb; Thu, 19 Oct 2023 18:44:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFy6kyrabMhYbb1IQ5yLkOkWeBT2LZarADFguEuQ0SWGoiV+drT2TU1xRb30eykz2qH0Iup X-Received: by 2002:a17:90b:8c:b0:27d:2ed1:6b87 with SMTP id bb12-20020a17090b008c00b0027d2ed16b87mr595965pjb.40.1697766248622; Thu, 19 Oct 2023 18:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697766248; cv=none; d=google.com; s=arc-20160816; b=pNeG4iY3oQCmv/55WqVI7VJO8kiWDBQhNSfxb1wikAeIpayyIcCEV7KJhxl5oSmONH mHVz4rL+t4F5VmrUI8cWQq7NJ+LWEy0tWqoDFAPbbKLOQGOH4nlPkEBAm/i9iS+whkr9 6kSUPg2zHD6S70zTCoU7vi7z8Ln6IPG64hmMkAY1yTYiPkkG1UYGjqnLF9k6F40a97/0 d71epaXkMq2HSQYtGWZoC9UdioiPia0Ey+YiPPhPFMS1pzaxK2tsd0KxwyYJM5RM1BcI rXBT/dOi7gO7EfvKkf5E2tacQ2jqRZnBQzYK37JEPGEZavtI0ef1hDKWOuNN8RhBklRa PIbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=RcONGGUP+t0yTiKTpy5L7tV29oN1Vf/lUY4ZI43AkQc=; fh=SxnwXaIsnBK8PETE4UK92gpFMu3P7x2XxyvDn39LXPE=; b=J1Fe+M8LmNz+INb7rXJ3geW+NzfefwfVKNUiAxpsHxmqwt9geGH0oryWifbuz+txO0 eg14zB4rGKAa7JHgM3mvfT9xLwdxwvi2IdVxgC4yZt7j9top+tA93NmufDZ7WCx31AJn dGWLyQNiuR0vOoPhCg0NNjztIAtX3VuE7ag6epCdM/bY1AmlXyMP6SFR8X9O/j3/evbk WxCxeMPbo3nZA/7dvHSM/zPdERlLdcBWVry/FFfVaBJn6zsbFQ/6O79xVyqZm78ELdyC 9TJaK9fdAG2QvgnSGXDUHpoaqtvlnpXyFfYYtTdQP39FbBKmXRzpSZs0JUKGyVtYhfoW W0EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LL8WP0Qb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id om8-20020a17090b3a8800b002792c288cc3si888698pjb.169.2023.10.19.18.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 18:44:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LL8WP0Qb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 5E67D80EE7D9; Thu, 19 Oct 2023 18:43:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346810AbjJTBnG (ORCPT + 25 others); Thu, 19 Oct 2023 21:43:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346809AbjJTBnE (ORCPT ); Thu, 19 Oct 2023 21:43:04 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 431ED119; Thu, 19 Oct 2023 18:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697766180; bh=RcONGGUP+t0yTiKTpy5L7tV29oN1Vf/lUY4ZI43AkQc=; h=Date:From:To:Cc:Subject:From; b=LL8WP0QbE4BK9Tnt4Qnp6mPi9IYZ8kedhEiHglDyZYXnXYVBSRWRlya8AwoqvJIF+ 13rauMxbbwrD2/Nrz0khQIE1PEEv3+ex1gmPxegiAFYpf7S8IodR51W405Ulsfh0F3 uQrkhSpo/SWChMbf5uQGVhos8qkudDler4oQDKzM1LFo7UJ+auiL/RkwyCUpHzB5Wm QsymJd9cIo/0mA8k+0RS5fNhFbyVc8FxgOWMr77LLUkYEjtqpIws1MifLtQ06PRAVo kub+w+HltR+d+xn0Euy5QHUuYaNfZoLUhwUwXDzsSKzVoogr2kElE0cU57vFLKeRnY Yb1fFWnjcLHSQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SBS5c0RDpz4wnx; Fri, 20 Oct 2023 12:43:00 +1100 (AEDT) Date: Fri, 20 Oct 2023 12:42:59 +1100 From: Stephen Rothwell To: Mark Brown , Liam Girdwood , Takashi Iwai Cc: Maarten Lankhorst , Pierre-Louis Bossart , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the sound-asoc tree Message-ID: <20231020124259.7d77b077@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 19 Oct 2023 18:43:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780236942058917552 X-GMAIL-MSGID: 1780236942058917552 Hi all, After merging the sound-asoc tree, today's linux-next build (x86_64 allmodconfig) failed like this: sound/soc/sof/intel/hda.c: In function 'hda_dsp_remove': sound/soc/sof/intel/hda.c:1384:16: error: 'return' with a value, in function returning void [-Werror=return-type] 1384 | return 0; | ^ sound/soc/sof/intel/hda.c:1330:6: note: declared here 1330 | void hda_dsp_remove(struct snd_sof_dev *sdev) | ^~~~~~~~~~~~~~ sound/soc/sof/intel/hda.c: In function 'hda_dsp_remove_late': sound/soc/sof/intel/hda.c:1392:1: error: control reaches end of non-void function [-Werror=return-type] 1392 | } | ^ cc1: all warnings being treated as errors Caused by a bad automatic merge between commit e4d09de3919b ("ASoC: SOF: make .remove callback return void") and commit 3d1a05581361 ("ASoC: SOF: Intel: Move binding to display driver outside of deferred probe") from the sound tree. I have applied the follwoing merge fix patch. From: Stephen Rothwell Date: Fri, 20 Oct 2023 12:37:26 +1100 Subject: [PATCH] fix for bad merge of "ASoC: SOF: Intel: Move binding to display driver outside of deferred probe" with "ASoC: SOF: make .remove callback return void" Signed-off-by: Stephen Rothwell --- sound/soc/sof/intel/hda.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 2f12265c472b..8342fcf52f52 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -1380,8 +1380,6 @@ void hda_dsp_remove(struct snd_sof_dev *sdev) if (!sdev->dspless_mode_selected) iounmap(sdev->bar[HDA_DSP_BAR]); - - return 0; } int hda_dsp_remove_late(struct snd_sof_dev *sdev) @@ -1389,6 +1387,8 @@ int hda_dsp_remove_late(struct snd_sof_dev *sdev) iounmap(sof_to_bus(sdev)->remap_addr); sof_hda_bus_exit(sdev); hda_codec_i915_exit(sdev); + + return 0; } int hda_power_down_dsp(struct snd_sof_dev *sdev)