Message ID | 202211092130548796460@zte.com.cn |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp337364wru; Wed, 9 Nov 2022 05:37:20 -0800 (PST) X-Google-Smtp-Source: AMsMyM6wUUq8hmcYrxTyqWItrFVt1FARopR2TNR9qVQQPypHbZyTrZoC0EVayZk0oA4hnmmH0wws X-Received: by 2002:a17:902:c944:b0:186:a7d7:c3b with SMTP id i4-20020a170902c94400b00186a7d70c3bmr61270940pla.55.1668001040304; Wed, 09 Nov 2022 05:37:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668001040; cv=none; d=google.com; s=arc-20160816; b=go87UkQ27hmqaKIU5cZKNOjqM5/FmZaIdouC2/E2w70zjoHzSJrnhc3g+0IeEujxms bHgeWL+KO1tfgi56vEw6AHGrj4kS2eAxEBJEPj/ABU9V8IiOY9ykpLF7p4G2XPCrlaWh AEkLHF2SYaXqRRfyi15x1NxgZQMTYf54R70Gl22zyUUL2pJNwzm8nM4gFOsj4RYC9vBu kxr0ST5/MjeYHLJMbe4Cwxbz7tZCWVAnVaH4rtbatXGUmNrmiJRaVxwRBC/Q2upWDdQc atxdJbZEwfRSZBOFr6leV4G31XbcWaKRUBCBRSKOf40aswFT/QfBnx4wygqgsjeJvgmq esuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=HGr6AThk54BohYZTvYcDDpPkrTSUUUo65lJxAJhz4dk=; b=UhO1gqbAixiLYvN+fLFipcvaizmAJdk6Ree0kEdyg1OTvO6KmmYDFA4myyuM6QYMrR Lo/eOYnLfyWaR/hkNV00wTRYpUbM1bR/OP8hBVa/+XdT5YYU5e/8pwd1G7iIQfP/rLap RvoSBUecolz0KUYtaV6RjJk1Ny9NazU783NnoaTtaIuXvjK0lI16V5KyFzKNXQJP6TIQ /IT34eG+3KqWkGRw8o3MLz33jssE46fxXBK5kc1GAGrvokOv5adjaUmJU6Me2Etta1FB EZ59Z0QgvkegaENXDKkTVQgpTyiQtEbLgtA5pXHl2Wtcxy203F+jjvUsp/KYiqQOUlHt WK2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v12-20020a17090a898c00b00213054baa79si2120155pjn.0.2022.11.09.05.37.07; Wed, 09 Nov 2022 05:37:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230144AbiKINbJ (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Wed, 9 Nov 2022 08:31:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbiKINbH (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 9 Nov 2022 08:31:07 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26D542C106 for <linux-kernel@vger.kernel.org>; Wed, 9 Nov 2022 05:31:02 -0800 (PST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4N6m7m4qfCz5BNS0; Wed, 9 Nov 2022 21:31:00 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl2.zte.com.cn with SMTP id 2A9DUpd7099677; Wed, 9 Nov 2022 21:30:51 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp03[null]) by mapi (Zmail) with MAPI id mid14; Wed, 9 Nov 2022 21:30:54 +0800 (CST) Date: Wed, 9 Nov 2022 21:30:54 +0800 (CST) X-Zmail-TransId: 2b05636bab8effffffffb2f2727a X-Mailer: Zmail v1.0 Message-ID: <202211092130548796460@zte.com.cn> Mime-Version: 1.0 From: <yang.yang29@zte.com.cn> To: <pierre-louis.bossart@linux.intel.com> Cc: <lgirdwood@gmail.com>, <peter.ujfalusi@linux.intel.com>, <yung-chuan.liao@linux.intel.com>, <ranjani.sridharan@linux.intel.com>, <kai.vehmanen@linux.intel.com>, <broonie@kernel.org>, <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>, <xu.panda@zte.com.cn>, <yang.yang29@zte.com.cn> Subject: =?utf-8?q?=5BPATCH_linux-next_v2=5D_ASoC=3A_SOF=3A_remove_duplicate?= =?utf-8?q?d_included_sof-audio=2Eh?= Content-Type: text/plain; charset="UTF-8" X-MAIL: mse-fl2.zte.com.cn 2A9DUpd7099677 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 636BAB94.001 by FangMail milter! X-FangMail-Envelope: 1668000660/4N6m7m4qfCz5BNS0/636BAB94.001/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/<yang.yang29@zte.com.cn> X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 636BAB94.001/4N6m7m4qfCz5BNS0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749025858454097932?= X-GMAIL-MSGID: =?utf-8?q?1749025858454097932?= |
Series |
[linux-next,v2] ASoC: SOF: remove duplicated included sof-audio.h
|
|
Commit Message
Yang Yang
Nov. 9, 2022, 1:30 p.m. UTC
From: Xu Panda <xu.panda@zte.com.cn> The sof-audio.h is included more than once. Reported-by: Zeal Robot <zealci@zte.com.cn> Signed-off-by: Xu Panda <xu.panda@zte.com.cn> Signed-off-by: Yang Yang <yang.yang29@zte.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- change for v2 - add maintainers and the alsa-devel mailing list in CC. --- sound/soc/sof/amd/acp-common.c | 1 - 1 file changed, 1 deletion(-)
Comments
On 09/11/2022 15:30, yang.yang29@zte.com.cn wrote: > From: Xu Panda <xu.panda@zte.com.cn> > > The sof-audio.h is included more than once. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: Xu Panda <xu.panda@zte.com.cn> > Signed-off-by: Yang Yang <yang.yang29@zte.com> > Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> > > --- > change for v2 > - add maintainers and the alsa-devel mailing list in CC. > --- > > sound/soc/sof/amd/acp-common.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/sound/soc/sof/amd/acp-common.c b/sound/soc/sof/amd/acp-common.c > index 27b95187356e..348e70dfe2a5 100644 > --- a/sound/soc/sof/amd/acp-common.c > +++ b/sound/soc/sof/amd/acp-common.c > @@ -13,7 +13,6 @@ > #include "../sof-priv.h" > #include "../sof-audio.h" > #include "../ops.h" > -#include "../sof-audio.h" > #include "acp.h" > #include "acp-dsp-offset.h" >
On Wed, Nov 09, 2022 at 09:30:54PM +0800, yang.yang29@zte.com.cn wrote: > From: Xu Panda <xu.panda@zte.com.cn> > > The sof-audio.h is included more than once. This doesn't apply against current code, please check and resend: Applying: ASoC: SOF: remove duplicated included sof-audio.h error: corrupt patch at line 21 error: could not build fake ancestor Patch failed at 0005 ASoC: SOF: remove duplicated included sof-audio.h
diff --git a/sound/soc/sof/amd/acp-common.c b/sound/soc/sof/amd/acp-common.c index 27b95187356e..348e70dfe2a5 100644 --- a/sound/soc/sof/amd/acp-common.c +++ b/sound/soc/sof/amd/acp-common.c @@ -13,7 +13,6 @@ #include "../sof-priv.h" #include "../sof-audio.h" #include "../ops.h" -#include "../sof-audio.h" #include "acp.h" #include "acp-dsp-offset.h"