From patchwork Tue Aug 6 00:00:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 817071 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 (unknown [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 17F02C3DA7F for ; Tue, 6 Aug 2024 00:03:42 +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 0D88B588C; Tue, 6 Aug 2024 02:03:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0D88B588C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1722902615; bh=Y8d2OkqWeVfA0AtEq+lEv4r26E6ksOADaa/uO/6MsoY=; h=From:Subject:To:Cc:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=ClI1WrAcQhN8EvyD+Ue1Pqe1VAtt1vzxO4RhAYNw60SPBgF1dfIu18XrxEcHCtDBp VY5ji434nrn0BUbnbfM9tUA100iFlEYUbvsYk+wdoBeFpt4x3A64CMNtJX8YL0qQV6 KioMHQCsed7IXIaCyHZvMHEXg308nnxKQG/QhVJ0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B6F80F805B5; Tue, 6 Aug 2024 02:03:01 +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 4A37AF805B6; Tue, 6 Aug 2024 02:03:01 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A99ADF802DB; Tue, 6 Aug 2024 02:01:09 +0200 (CEST) Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c405::1]) (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 CAAB9F80236 for ; Tue, 6 Aug 2024 02:01:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CAAB9F80236 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=YZLU89bw ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o734HGGDUlI9RHX3x/wLwnYeDpvO4B5wwVl/T1DPHU00skuepnHPfwFcotwMp/28EUP8juBUcVTJu2jDq3WnyONpUL99EMF7TL3FBMdp5qfmACn6pwLgUSU0WsEQobZ3UjV/B1QvN7CjVhZPLdGDgjoZUhitknN8Y0AuCn1E1WwpGE68CC27hZ2XpEb14r0NKCYhBdfMZfosDnnb1YrfJ/kEOWmdwJCxT22xv716dTMO9Wy1cCh8H5xNNOB/bRmmPmjZ4/NR95FsdPOUyDc9IZhmafNHggjzVC9P60yAyPhY4dYXM47kq8Cwi2HU+ZYVv4nhGhLDrvobhrDPHSgseA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YAh4dsqO+Du7vr/WusCvFFUhfuck5oFbXA+7+5137DE=; b=Wohhi+WgOE9o/Iz0v0gCBkEzp1hJqXSFfHHS5PXmgl/fEzhsrNvPIgeUw1NAak98tvbuSbn5LTC3EXnWaCMaFRPI7VLenG3qUpyxAVVZjwDbbIwEwOJQjybes3hQGeEFyb7/zivjD7Pc5A9H8fKOpbiGJ5RAK9i+5k2Y+SS78QIYL7Y9YI60oHJfcn4vrloeeoQvj0fpkG+DZyKCiNgZFuVahDTjrjQJ65cHsx0LFvYU3+4ZrI/C6OcoCrxQMMM+OMS4reWsu5Yly1BhWof/5cVYazbU4FX+/K8eoBYMueOockyQyGSw0Xhz32Qd9NYg1cpl+EoN3iTx0F0NqJzBRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YAh4dsqO+Du7vr/WusCvFFUhfuck5oFbXA+7+5137DE=; b=YZLU89bwfb/bBev2wRsVUyPKv12EaH0RbG2JLc27sWFhuT/re4SnrxffyAtKGFyD+UUpsJTB71TWvx/Kd0JjDoGVAdoWCvAqbdwPPxsFbePtjQxkBCbs54igktARxGym+x64qEzp1THkWokpJts108680lurf2upNHp9RR8+V68= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by TYYPR01MB6778.jpnprd01.prod.outlook.com (2603:1096:400:cd::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.27; Tue, 6 Aug 2024 00:00:58 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.7828.023; Tue, 6 Aug 2024 00:00:58 +0000 Message-ID: <87v80ewmdi.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2] ASoC: remove bespoke trigger support User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: Linux-ALSA Date: Tue, 6 Aug 2024 00:00:57 +0000 X-ClientProxiedBy: TY2PR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404:a::36) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|TYYPR01MB6778:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f0c560b-c2e0-48a8-867b-08dcb5aad98e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: I2MFh4tTcAf7EsomQBOGp/o283DttP7FF7PoBnn+/2wBPJDMxBV3cQnUir7hVyrQ7pbk9wcEwo91znlS9KOxbxYk1FvVIIBdNjKO/ob8AnZAoz/3zq1NSLPM0D0cgQ0onIQ89pDicZs0mLbTZdm1ExCjzexinBjvGQfVyc+7v3cyDhQQ/BRyJzDAEtAO8thnavkTLO+kKmWBVnA+CP4GcKGizY5FKrnsEQ+ZHHw2IGfU2rQxuq7ToOdrCGOs6i688uyX6krgGIFD/8T+/EMRg+qDVmF8R7Z5Nn0DDlfiOztJozuNsCPXnbCBU5T7tyv6hSDy3mF8pxc67zHnxleB3moK5keg86+C0gVDY+rIk9SvrgN38+xBpRXJH/829bkfu8yyPpgWbxYJQ0Y5kEDOZe1iLBjt2UYjzkASU9WZSD4XjlYAFJavlTBzkxp5kAPRR0IUcOjg5B2bzw9bvQSZHV4JfdVEfqwXUkxIlyaUGqPeaYihzich74rJl5nzhO8A4OfP+03ctneKYlycuafmvWLCXWEeNcYsp/iUUk9ry7bzSnDd8xeI8X1bzJJI/c0qYyBj4nN+J5CCpgHxMMtjXsHYlOxWOddHBV3KfGI6VzpK6HDLA6qAy4WRNcFSDXkGH43Z20zobMKac2a/lqiohX5mciUvjQ7XQ6Sr7UJajvm5hgoU3k6spvusCDNFKpLkR3dS3KTiNK607vv8tmGG5tzzHOD6q/2Jigbn4AojS/vQctXVh1hoHVuOaU7ALSm1Vvx7CFm9g63tA+Lcx+9u3E102ChHWu+Z+mhhoKGc9usEytf2MJxRMJQgyDA1aBSbgG2WXszpz5aLEzHGdR6uQ+TTsNS6+hYZxWJQxmhqArQW0fL2lwyWC5rvnw6Fz5i0gCHZkKv25YS1QVJE7mzQ6R7czpszOfNvfRmKlqq4Io5qqa55+/+xhNQmH6GFG1G6Z/LIjV9wzosW22o8YzPZu9uSgkhnueoGcgUwFPfm5riMbs7897UFt0vXFilcMOeDHPIXkT3PGJ7Tki9uJYtulZVs8IuW1qruVB5cqqCkQYDibvp2QEdI5ZW4P3M0AH6OrGGHUUvx3R5LvHTvrJr+WUjhyX1AmWnxenJwRLUS6UJnc45v6bQlVodl1vpLgcwUNuwDld1zIfx2ws7x9AyJiqAUrfatQ9TbpgmBjL3SI0wd8/kmtsluwhNmRW8nqd8Tjghssu+BYT+wDnhgRLa7Nci1zTUIENaTXo8KpFcHkZAUUYGUAun6pyqKoLVm6qOnfRmgnyi1Fzzduq0eRcrCXQ3BjdvB4HoWRaVkq7+OvaGat0eIJjdj+CgjaqaRx70YwLxgRl44QGneDl2E/AkawAWs2nDbDaJuQvYcLFlJNMGt+kffXU9RQd2fGbF27502yDINGS7YLi27ROxfa3ZQcw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cUP15UXIlMCH7H+niG6FFfvx9ZeJC2jk9Ypvj+JJKCC3hqo2TTpfSa9KbRBTNuSIWhmxJbm8IGVwJRRI3ltqClTgjF6r+c+XDY2aCNP/T9GHScetgNIu3IfhHWIjEFDBPkTgnbDjAfcVtU709jaH9g0hXn636XqBCQTIZiZ4awKM5q+BkLlChn4tcvHMQPMyXJoIRwrtrUzpBpJoXqWaAo8auy+dTYbaZUI8NhSs//g7sMvpDLLUmPl+tJPhKvVpUQgOtLxBe7yjk76qlQrHPg6hI+o7kaOHiFLVc+bMHre6TcSvpE8anDeo6cNCBf1fkx1WGfLUTfeYdyHnTz5dU3r656PwdAYWCptRSR3jjT2srgeGFIkukzmCD9ROaSOtBiw9Lo1SEcA9CWYAOUyz2V4djM9enlD4H4IMH1lUS98UDawr3h+pQvHOkVT1WZn7393Mwz6tbDN1iPiCpGzv8Tm8w21dyCH1QoZ3goc9UFDAhv5sdYVhNSo+mGlDIjPzSfIwmuu+6SUuyzWIjjOUzf5UW3nxfMrwWEmpeM0NE3gbbdKtjavCDxQw2BNt6mVXvOtKN6X9/GlTTKIu6BGt8aHZDAutL4TTk0BfvOWYLQOSOCGm9gXbakDTMvX7c8uDOdBcZXH1iMlC+CVKNUSsfnVS3A0tS9xWA4fD+atxIlWOu7sM0V86h/97V67NrbG1A1ngg8JBc9hXsxTzaNOSfAES41NK8RHk5XGU9kBaYHx57xLHL82Z1ApQNY2bCx5HFsp60WrgJAvV5wUWi2U+Kz3yCot7bta/+FzQcUeBSQI75jqvZkAXzdOEoYkd2jbV68/eIjKy+2vBTBsBbbV5okfCJeXiRwJDsfJjTeqJJvkCsjyawk9eDCmV3h+0snxWNA5jPYCDsNHJpnZn6tXkQ89eZuRJvWIs6qDlhErYahnMQl0kxYJ9FiPv+6YrIucPLj/9N+VpY+MRn7NZ29j15Yc2ne3qorce4QPidxTQCu1qIG0FP21sKyuHlhmXLApYUA0dI4TZ5YOtDti1+bnbd1+aIOvOUInQuYHhw5f97zUjQYNqQBl95U7URnDNXb7wx2c8bmACmAzNbgF/vNx/xoN1JGGmQr0KrnzRFpD4u+bXe2wF+8FtawLeS932ypLwMdHQcvtXPw8gdlcCeII+OK0z2HQSDdWeaNtSnnI6wOxbSUtlP9/oqabhotEyDP1fkqFCAy8YZih4IcskjS+1nKyXy7gezaZNlN+gFfQghrJ7D3NrQ8p/uSKRCsjV7icY3Y5EeszVC4YV2J0EHdXfRVoFJTRwnlXM5Ug+IrVsetvUdlUq2eo+0/gmZUkia2zhCqpHv/ptE6V2R746cSV1Eaa7mdvVD7x7NjhInslSi+DGuAN8gXbcnz3ACKN6vyUcRBMeoY0vY0cg/wFb8EizChj1AXAvzo67xN52upwqsgyJHv87fyYUDzz0a6zGlb6Vv3wD7DdyCBJYNTeMPJqEIUBKh4fQdFOXZvGQz1Hnuta2T08HN+kUAwbohncUL5loUmCdz6rDe2hCGiwj2MUqHAh7J3O98192z3PyC0vBO++k5bYW1wgpeRbealc9tXLv83JY/lohfw/gxQUOnJbZL15eeRPnCZEZ3ET0ZK4WZnw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f0c560b-c2e0-48a8-867b-08dcb5aad98e X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2024 00:00:57.9960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RJOrzEx9grYox3xBRxGxsMVjgb14kl6eLzwtt4HwRj5/d9A/oDqfwLJWyOGarBHWRuqhOe2kxpLPmzOIfd4M+R5RWXXVrHt4j8BolZRFdGqM8Vqeoza65Yy3RrbyRnyf X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB6778 Message-ID-Hash: Y4ZSCABDX633LNTCEY5TQSVYPZ7FIMSL X-Message-ID-Hash: Y4ZSCABDX633LNTCEY5TQSVYPZ7FIMSL X-MailFrom: kuninori.morimoto.gx@renesas.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.9 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: Bespoke trigger support was added when Linux v3.5 by this patch. commit 07bf84aaf736781a283b1bd36eaa911453b14574 ("ASoC: dpcm: Add bespoke trigger()") test-component driver is using it, but this is because it indicates used function for debug/trace purpose. Except test-component driver, bespoke trigger has never been used over 10 years in upstream. We can re-support it if needed in the future, but let's remove it for now, because it just noise in upstream. Signed-off-by: Kuninori Morimoto --- v1 -> v2 - rebased to latest asoc/for-6.12 branch include/sound/soc-dai.h | 5 +--- include/sound/soc-dpcm.h | 1 - sound/soc/generic/test-component.c | 9 ------ sound/soc/soc-dai.c | 20 ------------- sound/soc/soc-pcm.c | 47 +++--------------------------- 5 files changed, 5 insertions(+), 77 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index bbb72ad4c9518..ab4e109fe71d2 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -240,8 +240,6 @@ int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd); int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream); int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int cmd, int rollback); -int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream, - int cmd); void snd_soc_pcm_dai_delay(struct snd_pcm_substream *substream, snd_pcm_sframes_t *cpu_delay, snd_pcm_sframes_t *codec_delay); @@ -345,8 +343,7 @@ struct snd_soc_dai_ops { */ int (*trigger)(struct snd_pcm_substream *, int, struct snd_soc_dai *); - int (*bespoke_trigger)(struct snd_pcm_substream *, int, - struct snd_soc_dai *); + /* * For hardware based FIFO caused delay reporting. * Optional. diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index ebd24753dd000..773f2db8c31c8 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -58,7 +58,6 @@ enum snd_soc_dpcm_state { enum snd_soc_dpcm_trigger { SND_SOC_DPCM_TRIGGER_PRE = 0, SND_SOC_DPCM_TRIGGER_POST, - SND_SOC_DPCM_TRIGGER_BESPOKE, }; /* diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c index e9e5e235a8a65..df2487b700cca 100644 --- a/sound/soc/generic/test-component.c +++ b/sound/soc/generic/test-component.c @@ -181,14 +181,6 @@ static int test_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct return 0; } -static int test_dai_bespoke_trigger(struct snd_pcm_substream *substream, - int cmd, struct snd_soc_dai *dai) -{ - mile_stone(dai); - - return 0; -} - static const u64 test_dai_formats = /* * Select below from Sound Card, not auto @@ -228,7 +220,6 @@ static const struct snd_soc_dai_ops test_verbose_ops = { .hw_params = test_dai_hw_params, .hw_free = test_dai_hw_free, .trigger = test_dai_trigger, - .bespoke_trigger = test_dai_bespoke_trigger, .auto_selectable_formats = &test_dai_formats, .num_auto_selectable_formats = 1, }; diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 9e47053419c16..302ca753a1f35 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -685,26 +685,6 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, return ret; } -int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream, - int cmd) -{ - struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); - struct snd_soc_dai *dai; - int i, ret; - - for_each_rtd_dais(rtd, i, dai) { - if (dai->driver->ops && - dai->driver->ops->bespoke_trigger) { - ret = dai->driver->ops->bespoke_trigger(substream, - cmd, dai); - if (ret < 0) - return soc_dai_ret(dai, ret); - } - } - - return 0; -} - void snd_soc_pcm_dai_delay(struct snd_pcm_substream *substream, snd_pcm_sframes_t *cpu_delay, snd_pcm_sframes_t *codec_delay) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5520944ac9ddc..1edcb8d6f6eea 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2388,14 +2388,6 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) break; } break; - case SND_SOC_DPCM_TRIGGER_BESPOKE: - /* bespoke trigger() - handles both FE and BEs */ - - dev_dbg(fe->dev, "ASoC: bespoke trigger FE %s cmd %d\n", - fe->dai_link->name, cmd); - - ret = snd_soc_pcm_dai_bespoke_trigger(substream, cmd); - break; default: dev_err(fe->dev, "ASoC: invalid trigger cmd %d for %s\n", cmd, fe->dai_link->name); @@ -2525,26 +2517,12 @@ static int dpcm_fe_dai_prepare(struct snd_pcm_substream *substream) static int dpcm_run_update_shutdown(struct snd_soc_pcm_runtime *fe, int stream) { - struct snd_pcm_substream *substream = - snd_soc_dpcm_get_substream(fe, stream); - enum snd_soc_dpcm_trigger trigger = fe->dai_link->trigger[stream]; int err; dev_dbg(fe->dev, "ASoC: runtime %s close on FE %s\n", snd_pcm_direction_name(stream), fe->dai_link->name); - if (trigger == SND_SOC_DPCM_TRIGGER_BESPOKE) { - /* call bespoke trigger - FE takes care of all BE triggers */ - dev_dbg(fe->dev, "ASoC: bespoke trigger FE %s cmd stop\n", - fe->dai_link->name); - - err = snd_soc_pcm_dai_bespoke_trigger(substream, SNDRV_PCM_TRIGGER_STOP); - } else { - dev_dbg(fe->dev, "ASoC: trigger FE %s cmd stop\n", - fe->dai_link->name); - - err = dpcm_be_dai_trigger(fe, stream, SNDRV_PCM_TRIGGER_STOP); - } + err = dpcm_be_dai_trigger(fe, stream, SNDRV_PCM_TRIGGER_STOP); dpcm_be_dai_hw_free(fe, stream); @@ -2558,10 +2536,7 @@ static int dpcm_run_update_shutdown(struct snd_soc_pcm_runtime *fe, int stream) static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) { - struct snd_pcm_substream *substream = - snd_soc_dpcm_get_substream(fe, stream); struct snd_soc_dpcm *dpcm; - enum snd_soc_dpcm_trigger trigger = fe->dai_link->trigger[stream]; int ret = 0; dev_dbg(fe->dev, "ASoC: runtime %s open on FE %s\n", @@ -2605,23 +2580,9 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) fe->dpcm[stream].state == SND_SOC_DPCM_STATE_STOP) return 0; - if (trigger == SND_SOC_DPCM_TRIGGER_BESPOKE) { - /* call trigger on the frontend - FE takes care of all BE triggers */ - dev_dbg(fe->dev, "ASoC: bespoke trigger FE %s cmd start\n", - fe->dai_link->name); - - ret = snd_soc_pcm_dai_bespoke_trigger(substream, SNDRV_PCM_TRIGGER_START); - if (ret < 0) - goto hw_free; - } else { - dev_dbg(fe->dev, "ASoC: trigger FE %s cmd start\n", - fe->dai_link->name); - - ret = dpcm_be_dai_trigger(fe, stream, - SNDRV_PCM_TRIGGER_START); - if (ret < 0) - goto hw_free; - } + ret = dpcm_be_dai_trigger(fe, stream, SNDRV_PCM_TRIGGER_START); + if (ret < 0) + goto hw_free; return 0;