From patchwork Mon Aug 14 23:42:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 714085 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04934C001DB for ; Mon, 14 Aug 2023 23:44:35 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 57CEE1F2; Tue, 15 Aug 2023 01:43:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 57CEE1F2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1692056672; bh=lp8rCRjGCO/LOKLNJ4DrPihtkVYfEYrRPMDlUYsgkxw=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=fjEykg3Ud7OxJDNAt2df+DjIhHE7J+U2BM+INm1DfUQUSq6hI+SafX00qbWTa8Iaa 6uPff+ljmpipyHDGxEzCN0ccgAZRq7HY5bmZHhmQw1q/XhOtWlHwg43cPKJPx1AjFU bBtCfNn0ikPyWMlFI0SfginViFjGEPw134QIevdI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 19F80F801EB; Tue, 15 Aug 2023 01:43:13 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 580DBF80254; Tue, 15 Aug 2023 01:43:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 52F22F80254; Tue, 15 Aug 2023 01:43:08 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0943DF80074 for ; Tue, 15 Aug 2023 01:42:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0943DF80074 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=CNjZTcHZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692056581; x=1723592581; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lp8rCRjGCO/LOKLNJ4DrPihtkVYfEYrRPMDlUYsgkxw=; b=CNjZTcHZBH5DI4Z7zQTPL6R/rpnYSStFBYuhbjizshCNtW2QYGAJZlxH x1uWSihrT0SSue25M0DRrIZuyekbNKxXuwesZyMX4RmBeMM62LSvKTAjg KI1jv3L7zcif/wBR8V0yLLIvkLjvFAGbbE/dGaTLJFYIjkJsWpBRoJIUv fA39mdDgtQhXAXLi7CNgz3/oVa04eONcZ7yqkUoFf1eLxu1bZ85NsXV3o J1dDXua8oT5XPB7QJOlgXXYa6kcjUPnAOyK3zPGtFm16vqGkB6oSprBNa Y9l3UixO156L3qBlUvN5Pl9DOnIG0aB1Ye2v63jZer0gcVS4w8mFNLPKZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10802"; a="351750782" X-IronPort-AV: E=Sophos;i="6.01,173,1684825200"; d="scan'208";a="351750782" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2023 16:42:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10802"; a="710511253" X-IronPort-AV: E=Sophos;i="6.01,173,1684825200"; d="scan'208";a="710511253" Received: from dishasur-mobl.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.104.139]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2023 16:42:54 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Pierre-Louis Bossart Subject: [PATCH] ASoC: SOF: remove duplicate code due to merge Date: Mon, 14 Aug 2023 18:42:35 -0500 Message-Id: <20230814234235.87268-1-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Message-ID-Hash: WAAZDUKICTPCBQMKISEY2FWWRCUXGNRR X-Message-ID-Hash: WAAZDUKICTPCBQMKISEY2FWWRCUXGNRR X-MailFrom: pierre-louis.bossart@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Commit 81113108491e ("ASoC: Merge up fixes") added the same code twice, remove the extra call. Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/ipc4-topology.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index b43663822613..633f6040d712 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -1734,9 +1734,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, /* update pipeline memory usage */ sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); - /* update pipeline memory usage */ - sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); - /* copy IPC data */ memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data)); if (gtw_cfg_config_length)