From patchwork Fri Jan 20 07:01:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109264 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 4D626C27C76 for ; Fri, 20 Jan 2023 07:02:52 +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 6A9B52DC8; Fri, 20 Jan 2023 08:02:00 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6A9B52DC8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198170; bh=iFCahi2D9P40IVzu0J8iR7GRiaq4eNVcCgXmDn/Q9tg=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=DENfj7ZCUGP1/XitNqpW27NLD8fcC4l37HDp5fWzycnx7P7zGLxmbGcpDiT3eE0m+ CLgcftKvjuUZr0aeY3+BkssLBGl90mgwBaUh/3Yg4QajaHzjXn9zV5TBgeQ4wii0wT CQ+/fy8yxNgvaWuhnxQEwERiqob+DvJ4dGkaQwDE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 166ECF8026D; Fri, 20 Jan 2023 08:02:00 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A7C69F80482; Fri, 20 Jan 2023 08:01:58 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2091.outbound.protection.outlook.com [40.107.113.91]) (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 B787FF800F0 for ; Fri, 20 Jan 2023 08:01:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B787FF800F0 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=YzQ3CiO2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YeoHO7pn1d+CMEwihUUzQhbmDUEYBKTvsUtNDxciN4kvic1vBHgJ0hiE8vTd5HcYp+0uvgWwIHT/b8+fVW7ZzpficBpoxG7lxI0BnSwLbHedxp97sEab4yhYe5/NlvdTqxDd9Zlx6XA50KnFrVpbabKvuNsP0N7i2sHiOmikySt12u9LVC2AB7RmpjLuWEulqt/X7tkALtiWgP4sVOrZRVzo3/LVYMpsogr5UW64Ak8qhRIbHEZUyei9pbJQKs/6mUYI5hF7G4svHozAg4OHTCDU/eNGgHkl5k/pTFJgqQ9CUQD/q/v4YuuV0GRPTE7pIM1zQg1SWZxHtRPOS5G4Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=dZ3wtJi6XO/fhWm38om37eJPH2PqZpdJ4xrVOUhjESo=; b=Ya/N1p35Tqx8LJXq/yl0jzA4pDyAMt/zSak4ViD/h72MwQwootMLfLiAWeq7hNz891j1ZX5BuZLqQlIEMzC9WEeYTPxOwwxnOtBjAPksT04kp0OzCFYnyIJCMQ9zyP8j13I9MJPmlGT69WVO7QwLKLrwWZdEpPE0l9I8WIOa71zsEp+g7k3jOXtiO6Hb3kHhJPkT4tIlkn2aHlN0g9wfEqFRNAUJB5Rb2ZFaoN3OiCbjNS036aRBtGfeFCx68KtfYunAy5thM3qB3IKczVnuO7WrvIAd6HXKY/TucYpt8v1mny1tVYiMnzcGUqsinlfW6ervi/rEHjvh690OFNz5zg== 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=dZ3wtJi6XO/fhWm38om37eJPH2PqZpdJ4xrVOUhjESo=; b=YzQ3CiO200if56IkRcjDHQXEMTiEgRQzgOZEMJ9F1ZsbWTzqI9syniSvgaLlzMNtOon9ok1nFJ2wCEWt94Jp8wwPp5129b6mYTetfLkKxY6LCUg2Jbd1d2GQOgAw1jq/X8cfLNzZ6JtVvmJAkz0h95yaztvJuCCrlpyZ8Ds3+5o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB9821.jpnprd01.prod.outlook.com (2603:1096:400:233::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:01:45 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:01:45 +0000 Message-ID: <877cxhlmef.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 02/25] ASoC: soc-dai.h: add snd_soc_dai_dma_data_set/get() for low level User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:01:45 +0000 X-ClientProxiedBy: TYCP286CA0156.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB9821:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b3b42ed-8759-4287-604a-08dafab43151 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PoxLcJBN+ody+NPoAtnt9egzy6IE9WVdvu2p3/yirSwNsCRPzg9ZiNVxfP+p4vK/uU+RcefXRI2GRVMU8VtCNB2fh+l1UyybUMt8Hevi62FlTgSktC22NkrO7jYEl5hWVMuqJTplJjjo94Ld/0cA77M1SRoQI76whvxsA5rZ6semFhJ5g3A56F/n/TcBOGIcYoWXu7aGQ4/2ZqBUrjG7xWfrtVm8DkskP4L1C3VeAyCkzdUpnTkU2h4J82eKdKTP3jJBPEwiNFKf+t/WpVmcVoXFArqPu4SRwPkg3vkHc2C59AO7so0+VjZF+HhUAmGpX9MdOj0MVdB0ncGDayUO7tr7EJs4TfZcsfxcHIUvJllK7MPkxEpenpaAm+QmBD83uEviCB/IhmhaJWg9d5TFXGf1OjJ5oYRNOFJT8ftadWtfrlk/K/CfxuNlX16PidMBsauODTSBVUDH6rEuSz4WG/SNxkkYFZBvkEzhJwMoGaPNas5pT0TromY1maaxbiZ2fHiRHjmvgFccd0HcJFSw6L7xUZYYuxMxR4Pncj5w+L1ddCVrha11H4l487hZaC7V+ABQV3XWVcbeHA5t6JcC7Ocvstxt5mgUIvLdKqg34k29cf5trEQy4KU70Sd6BMTeIAojDphact0TC0rIv9IJ3jF9g2OXrl3m24NvDiwidF0OBQtQ5xv9Bwx5PmYJsiLzzd8RfvKI8T7cVj0vF+8fQQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(346002)(396003)(376002)(136003)(366004)(451199015)(6486002)(478600001)(41300700001)(6506007)(6512007)(26005)(186003)(52116002)(7416002)(2616005)(66556008)(66946007)(4326008)(83380400001)(6916009)(36756003)(8676002)(66476007)(8936002)(2906002)(38100700002)(5660300002)(38350700002)(54906003)(86362001)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FbubtogC8DLv2wQi72IQSMbIKoPzLwIfRNqbJOBDemBH72OHAzW7gHUsKBK3RZmz1AGt8DyvnwwZj92GNut6S5G/nSQIBB95mkksYO0cvK0aKAEdIWhThhsWWte2V8mdyymbV770hwTpmDkSJnwRj8ynmhuTK1InRuLPZkw5J3q3QKiPYeMa5epddg29q3bnyzLBT/0ndRpj+dHQoLd6wkxY4XWQBlU2+hdXQ4vtfPYHtERL9Z6NyFwiAOHuVxFF1uI9SW0Pm7+ziQ9zfALo2qpBux6iV8TDqsvUTxXoM574oWnmKgWLVmcBXaiGFySqq/jVorFFkdhUBoRGmFFWLYb1kWJtpOskZgXKppn6KDRnTVt4v2bak8AmTcL2W5Q9AqjQd+5yO7YdbsmGP4cpJehfNHQY1DrP3lKoY4nh9OU9LrUB0182UAv6GQ3zoCWCOGf7LJKY9RaqTmU9a7PEQ7PpjiX/4QT4BDORVj/w0rWLM9KiJL/4Vx7fw+3S2A3fKxGsp5J4UYie2QaLp5SC0ZZoaMqQcxMg3tR5kZ5tBtrFjLN2FD77pBDmAznY59uaenxe9OtiNrYwGy3+ZSDMdYEapxB1JggZteuc1+/qhRyhNb2IpEmT11OMc9SIo+fMbqgdZcnccwlVS5rax5ivvYOZkq97xAFcJHQ0KjuQvTinSh8sQ0whcBda/hpqnCew8oKc8OSgTk/vhKtylsDfJ0v11oh0hyEVcnxlsLomotCH3udfkpbQW3z5RPjoIR2w8bUba++wQJutDC77ntAxS4NQhG1lJn4deBDkdfU2dcQ40Wees8zuCzdlUHwv/Y2mohzCJxBEH1LZDeqQj5Og+ClMHPkk9Et1zqf3+0DO8hoBfMYaqHnv+4/0lxvojq9FrQDjRWUDeE7IVc1Yb6OkMtX8Nb1QxuJHKPusolXSRSwhqSQ7ZCnA5skSFD9IQtCV7tA9YY0aH/WFXtlQNXfr/pa1JxJ5gnYFZ9OTwjUQOuWKmEgTR2eYXcnva/FqKjxqQjCJYK91xqZRRvVPPTVUH+WRwihjr+LleCkYonfY2gnFyB+zHsuDobo8MeAUHLgPlOdnZNdkGyGmFTsSLQzTUJFg8QOlucV86bGKl7cQHMu/LQEetIHuJBm6Na95+hn5qWuFclizBpujPxx6duhcT4ZRsofrwx06jIIoZjg8ku3FeatCSkaIOvNJvo2vIppS8hbvSP83Qv/6Ws/ecM+QyfivLp7sJr1TJNZ0ju/RPD56XxBK7jgC4xFAAqpXrr6+PHkHdtRCWYX7LC3RoiskdSlRkSAIGTvAcUyIHSwi734wxxbMANxKj34GfwJ64rkjZsQVPvsuizRn0KjA8Hfb0P+3/fzGVcmXGjbTf7b3cmziq52u3mQFSAHKXHH5l/vrtPfM9oQKk9g8aBUCKi1etnJED/zFzXtAzxxGXQyN9XqbuaYgF9xo4KozBiaxtYhbsSdZo2wRA9yoj7x83yy4Kzjuypr9egyeyI6YQ49NbdsZQ7xo64uThRbjRJ2nHpkYJlGGK0EN623jw7P4l9snINGdAXJ/1ssSBzHxkoCKqC1RucI+wHsaBB68BpGnlU9aZRNlxXdU4fQOHRxCoIttPHNSP3Bc1PnIHv55MeI3JOM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b3b42ed-8759-4287-604a-08dafab43151 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:01:45.5913 (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: aPoXKDK3EC/r7MhjcuZBHpo67SDC+nVzu9hY+RFnxs3WhyTG30t+4SiTGV7um8mz9Xn1vBYXZJzAVpnO+/987XJKtlJ6C5rWkRMdn7ruG/oAh5mnFWESdYfpu1YV7ulP X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9821 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has snd_soc_dai_set/get_dma_data() which is assuming struct snd_pcm_substream to get Playback/Capture direction. But, many drivers want to use it not through snd_pcm_substream. This patch adds more low level snd_soc_dai_dma_data_set/get() for it, and previous functions will be macro for it. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- include/sound/soc-dai.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index ea704d92deaa..f27b33dd97bd 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -493,18 +493,21 @@ void snd_soc_dai_set_widget(struct snd_soc_dai *dai, int stream, struct snd_soc_ dai->capture_widget = widget; } -static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai, - const struct snd_pcm_substream *ss) +#define snd_soc_dai_dma_data_get_playback(dai) snd_soc_dai_dma_data_get(dai, SNDRV_PCM_STREAM_PLAYBACK) +#define snd_soc_dai_dma_data_get_capture(dai) snd_soc_dai_dma_data_get(dai, SNDRV_PCM_STREAM_CAPTURE) +#define snd_soc_dai_get_dma_data(dai, ss) snd_soc_dai_dma_data_get(dai, ss->stream) +static inline void *snd_soc_dai_dma_data_get(const struct snd_soc_dai *dai, int stream) { - return (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) ? + return (stream == SNDRV_PCM_STREAM_PLAYBACK) ? dai->playback_dma_data : dai->capture_dma_data; } -static inline void snd_soc_dai_set_dma_data(struct snd_soc_dai *dai, - const struct snd_pcm_substream *ss, - void *data) +#define snd_soc_dai_dma_data_set_playback(dai, data) snd_soc_dai_dma_data_set(dai, SNDRV_PCM_STREAM_PLAYBACK, data) +#define snd_soc_dai_dma_data_set_capture(dai, data) snd_soc_dai_dma_data_set(dai, SNDRV_PCM_STREAM_CAPTURE, data) +#define snd_soc_dai_set_dma_data(dai, ss, data) snd_soc_dai_dma_data_set(dai, ss->stream, data) +static inline void snd_soc_dai_dma_data_set(struct snd_soc_dai *dai, int stream, void *data) { - if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (stream == SNDRV_PCM_STREAM_PLAYBACK) dai->playback_dma_data = data; else dai->capture_dma_data = data; From patchwork Fri Jan 20 07:01:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109265 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 376A3C25B50 for ; Fri, 20 Jan 2023 07:03:19 +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 BC7782DE3; Fri, 20 Jan 2023 08:02:26 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BC7782DE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198196; bh=b2JQ/knpf7CkyEBrdoDWy3/6Rbbb4V3sfJB+YFPnkdI=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=rSzRKgmkr7wnMu3khhnOj7TY+oU8mchSyX+P6YsHehu2uOeEJPWSGS71j/aJtPGHE X0o4dqTmntIBqfxu4sBVej7/SoRF+VNvdshSjeyS7eqqfE99sbYxGOre+876PLtw48 h5lJpp0WtZUuu5riM+gkRfcJL5oDEQK587VIc7ns= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A2679F804A9; Fri, 20 Jan 2023 08:02:01 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B9094F804FE; Fri, 20 Jan 2023 08:02:00 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2091.outbound.protection.outlook.com [40.107.113.91]) (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 CD1B5F8024C for ; Fri, 20 Jan 2023 08:01:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CD1B5F8024C 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=d0eUaFM3 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N8qXj3eRosWx48muQDI8ii78spA+Q6t52U62TwlvnpuUBQVv/G+CJiz9gmh5Sb0cdIoi42BSHk25/5BUpMLfZkITXsP0sgHnqy5AdAgR9tycHM0QOTz4VclZ5lGN36tuK8jiaDEyXUyCcOye8QBneanxcxQMZ8HvKUiRrocIPVb4Zm6p+iu+z+j4jSpY2U64Wl3ZwfzZgr82ziR4GU08iET1Fv/BSyD4nVNj1OU5UK0O8crYZtLKyqfw31B+PTR1ugKO2hQAb/blHxZhpHudlWGQ27k2wy0k/N9Rc1lNHKUAx66rQagAmlnWIqwnhXWbHFMqI5oD+vRq0M9jTr8/NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=2Ok0rbOYBcQHGBDYHoohiqhhhPdvkD3njh6QlAmIPQM=; b=ao/wH/ncC0BGOac84zcW68aSykYSAowvBQzvS8JpnJUNH2RtVf3s0ihUjl3pBATOilQ5bfHan/Kpij8sdP0xfTrP6CuueTIEL2IivYko4SDL8b+MR0ohcP2VWVJL2xcRMlK0F9t88iZyw9nLsjJYIETM83H6/eHFhqmUfSIuR5KMqhuQ1nW3shwJw5rW5SQAYN7er4FPkGet6zYI9rKGucIBMhliKh2uFzThBx/hKRQU8hEFztAQvU0CricWzwBGa2x4Dcg7z028gJhvYk6hNBce4WQ13M7BcAaKLPMRghkner7/NxVHBzjCMsIQTPW9uSc1+U2iV/HtMyMeegPY5A== 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=2Ok0rbOYBcQHGBDYHoohiqhhhPdvkD3njh6QlAmIPQM=; b=d0eUaFM3rhQFL9DKJQLJSh0ztz+x/3X/hUB/xLWopMKe9sPL1NkQWAOmYrVXocDd8NofJRgdcw04gFrzNjdacsMb2KD8UJJJBTeBSbZgTgeD/jw8rYtPC9URL8HJzyQ+V6wMwLZf3ZEM8ynqGwhDdApL8aCr7MJTWx235Z6wb8Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB9821.jpnprd01.prod.outlook.com (2603:1096:400:233::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:01:53 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:01:53 +0000 Message-ID: <875yd1lme7.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 03/25] ASoC: soc-dai.h: add snd_soc_dai_tdm_mask_set/get() helper User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:01:52 +0000 X-ClientProxiedBy: TYWP286CA0021.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB9821:EE_ X-MS-Office365-Filtering-Correlation-Id: 92af1702-37ae-4661-6c9b-08dafab435cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NoZdGjfCt0wTSamNM/yVEF1yXrKQPwQujhva3agSm06L6+7YdsgB+k2uUoaF8vmndqqxt0cxda3C2kZdvn6BX5AfcIynTRb37xtYRV8tzBrBu1j9LcyjGIoR6xsygm4nfEs69UG9E22hppMlD1DyCFbilzjik7i4UUfw1EF3HWyQD1E2V74i4Cbra33ALOvd9/hBFcTrLvO0kLb6shWbtYUDuGEyESkC9pXNMwjPPa4u6iHaRYECKhBTTOoSbVtIZrnTV1MjN0XZyTuqs8GG1nwjMYT48TyJcD27X3Oy254vFlrXr0HAP/gbAh3dzp93LUd2BlCMhk95/zLJ+u5VSUenQJAlywOPjMLLO97fPkvnUBSQbpsRMpFlBnRPw65I9/BM5meJiNyMHDSVCmNCWu2CBNyeJNVy6vJY0quWS0BGjl7WQMnCTdmZWkFCdIZF+GbBFEUqMgnO058EcOCSjtGQE0kNkvlPXscjI5xgp63E1dR69leIXz22FQH/qgDeumxQ2f0o3Ra8QXK9nIIumqgS4f7LL7/9hlzRD1UwStoxyX2EkB5GXesnebuz8X+OD0lLiTTSmqaXyNne7z0svNpnGPpwFbL/STvg8PB8CKvO23n805sheUx72FmehxOOKOnnORj+Z1yOwAS1Bz72DFTaRkBlviZ89AHGEO74Cw58rtDmFuz/61gBHy3ZUBMQaT0uy8vCsmF14NGG3+ee8Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(346002)(396003)(376002)(136003)(366004)(451199015)(6486002)(478600001)(41300700001)(6506007)(6512007)(26005)(186003)(52116002)(7416002)(2616005)(66556008)(66946007)(4326008)(83380400001)(6916009)(36756003)(8676002)(66476007)(8936002)(2906002)(38100700002)(5660300002)(38350700002)(54906003)(86362001)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XlK/3rrITvvy9mTVOrPqWntcZkx/Ag/iwX32QKSDsQqAduA9FhfnCk2X4ceMCRvHE3RU0X4aB3O0VcfFa9+Jp9ZNoHJ35qjUFQlI8KNHAUSpWwkkIbCGfwYU87z3fRds0kScFgazLvFz3DINK1sYVGL7N4aUrjlVDRFJ4ybaEJwVhXBZINstL4Nj4lGMnRKhQVPY3NQT3atd7azwcALfYrr74HzxV2xeAFlHIJJCqDMQUiQ5sYFnRArLqFPiKV7fcAWW6g6SGVBqBnntVu/dnjVS0Fg88EgClUBlk22V+o4Kttufcmb2vv9WMhalQ3bY8Qnl6GbowT7izkQd2Jxyo1ODckKTZf9X7/bt7Li3mrRNQoBtPreKsycgufWXcvtT+fk0rNidXsSD0HQLfdH/smA8kBDMT5J6Mfmi/BEUflvcMdKWCfbOfwmIVF3uX2prm+IIQ4s7AGbQCUZwX17d/hLGUifx9vhWrXKCLOAOCF+htgWuoXuCvkdtn4npyqgcgFSX/BKsrNlzvOZrsusr4CC2WfxJXtDBSSxr2tNvNSB2/XH1yPte+YgHKGciYevlVw1Ij09cj8LthnMM+slcl+33nQyAItFPGskPKILVeHVvMO1/Nip60vtQlo/vTMLx/xNSpYKy1oqmnD9FkGMqaaXTBH0lK064SgH4meoYjVFy4O/M6uGwk0EWO/Juni3YuCNXdu1aUPc90o7vN/RyGg/Fs0vTpSEqgmh2tEOUcR4N5+mn6ccEcTS+J09OkAMHg49j58mfOW1YWQ9jdzHQ4cOS3NWa5pEuFp4dqGcE1v6YoJYu1CQXHBRipQNK1wSoH0z0Pba8baseT2bul/sNot/prEHa63iEzK/he2vIep5ZTbBVn71HEOfBh0APLTR7UgEvIzCCZKjJ+/ZUkIcYwGwfZ+LsXmBalkWFUs2ex7HcHs2QF2Y28Bu3lqPMNBLGdqOGAgEaIbkX0rOBHWopvbPYYgyUUFxopNNoM7fpuiDVTSeMPpIjYHRwLspRBMl6M5W88/6lU8BuO48bgHPQI/rPvnTeTPIDDWFw7JevTmUcHOsJWjX1FNE9EG/KORJ7RhUb1xj0Nifbur4Vnuuku24ooB39TpsldFma4TmJENW4FY+Fn4FD40L/e+HWYJfnrflwqIJA608ZKIk8CQg7iALLLKoZTyCQZATba826j08VJIDacNWIXv+Yl9TfNjUPvgdxz5QgCgtRLokubWbIrlLa8vYX2G1Uz92KvlP2ccYjTPRnqC2N97crAqarcsaBJx4aEWLHmmngBgqxMGiiHzuW0VfsDcH3zCZI/Dfhe7Ld9GrBUS6n7izgx18wMiqEJmjKWDh+l0t74q3oOcG+5zXtw5H6CN+eVZsE9fZIuUgweUxgTgNwfKLrYhaOyXy4it7pJZx5TvCSO7t59vB3BvTJ+xWRSohUppcvpj0I1CmA5F4b+aFNgt1nTwt8Y72KBB92IYjRlgHmcmR1c8PmiOdv2W8qXb+gXVtr7qOPLM5F5S9Ve5yeqDTboXJGspg241HD4+F/hxw+v8pOcZwt4A/yT0Cfcm7jgp2hbfDwirjmBTv4wWspjlgf4GxkZDwpqCtEdZBkcysymn0YaqxF2tI8AAVSskb02AI6EzJm2LI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92af1702-37ae-4661-6c9b-08dafab435cc X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:01:53.1868 (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: fUaxsYIatl1sCK1PgvxFSazvhSS++VfF8jRJGxv8Os/7rp2CvQd5CprvP+uB58H2dFKAwnAWoe5VqLOpyHcdq07SLBE4qSMm3x5R+cNr663VG5YbY2of80i7s+uuyeEP X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9821 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has tx/rx_mask, and is directly accessing to them, but accessing to it via function is nice idea. This patch adds snd_soc_dai_tdm_mask_set/get() for it. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- include/sound/soc-dai.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index f27b33dd97bd..9b18e230e5b3 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -520,6 +520,23 @@ static inline void snd_soc_dai_init_dma_data(struct snd_soc_dai *dai, dai->capture_dma_data = capture; } +static inline unsigned int snd_soc_dai_tdm_mask_get(struct snd_soc_dai *dai, int stream) +{ + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + return dai->tx_mask; + else + return dai->rx_mask; +} + +static inline void snd_soc_dai_tdm_mask_set(struct snd_soc_dai *dai, int stream, + unsigned int tdm_mask) +{ + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + dai->tx_mask = tdm_mask; + else + dai->rx_mask = tdm_mask; +} + static inline void snd_soc_dai_set_drvdata(struct snd_soc_dai *dai, void *data) { From patchwork Fri Jan 20 07:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109266 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 57007C05027 for ; Fri, 20 Jan 2023 07:03:43 +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 0D11A2DD8; Fri, 20 Jan 2023 08:02:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0D11A2DD8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198221; bh=V47DMhzujlD8lkKMRQFgJDAX8SedZE0oNyS/uYLwwl4=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=LodPFRH4vb6AsguJ9bRrL5X/qzKxk2aDbPdQKVsZCxHHAIDaXCl1tzpYLHI5AB0iq UGfwy7cprkmb9jOn3fxJJOq8u8WYJtz3W5Leih07pLF6Jy7lQeDYG7T0C4S7LBS1Gx tnLI7va+WLESu8tPt7QWfeUWR8FWyowFsiTtJMNY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 4BF44F8053C; Fri, 20 Jan 2023 08:02:16 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 29380F8053D; Fri, 20 Jan 2023 08:02:15 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2121.outbound.protection.outlook.com [40.107.114.121]) (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 9B0DFF800F0 for ; Fri, 20 Jan 2023 08:02:10 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9B0DFF800F0 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=iiKTBXrh ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ig5J0g16Q+hFhSzYJyBw7gTFMkI6umm2pLxJEHe7Oq4W2srCXwTb5xvlQZZf2tqFH7rsogxJLRH3QX19MA5VyWo/x5QRjrylMgyS/N3WiAXA9xEtJnq0lLO2GlvtuXU3D6LEu++seVu6X5zQAe/Bso3aMMfHui/IKlc8wk3YMTHzIbEtuTbYJeQb0w6ycyABZ2j4I4BqaIn9TCcTkx9UtR5aQrPtMYkwh4SMgq3wqeF/YuSJxMy9s3UqHGI5YqJiRlZ745y+1FgxxkiO3Yrk6qptowK/w/NP8nKaoKRnWV8qsLD/NZKG5zo/k8diSKBcz3xKUgu+QT5LqXXafU1D9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=kbUf7FIXhuxp5YkwEzio47MaaB++EAepzwExKVfidvM=; b=lj6eWweBB9T0smVhqZlY9+/lKnAukRDCRXssFTHOaLEfhZ8eDVJ7wxikWJTRhdtn5yXsl34mkfGiCYL5I7OK5ZUcXSMLOr5GuEkc1dXVDmd3XAtYnepOY9xV2Abf78GFdtm8VWroJb/gLs9p1gQtSVgFsxFPlPxS1PsNrWUeXQ/h18AwUPWXv0o8BCTBIsGWm68sRI+l54/JOVdu/hX/9bsOBoRyyCaUkB0QFV0g3fjjIgrIwH3kUSk0BKAfDCLEJyT3eVWkCG9P9K76WhSyclqnUL3WL6tQwum5HGsGFBL8BPEAhI6M6q48h5g3X6nCO0BaI8cJB2oswKs35tLbpQ== 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=kbUf7FIXhuxp5YkwEzio47MaaB++EAepzwExKVfidvM=; b=iiKTBXrh0cd6ZrRz0w+2zs5VdAafKXl+MXuNDMbV5LV//cmBcpoS+5WARSvemhznBzeDnPkuVtqx2azszGFhJmwcqsiYYMgC8fQzZWQ5z6iwUoMqI4vvXkrImYsiuQwmqyfrj5Ar8ddDalVNjSgJJlw3+XOXx7ra6H2c/tPLIEQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:06 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:06 +0000 Message-ID: <874jsllmdu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 04/25] ASoC: soc-dai.h: add snd_soc_dai_get/set_widget_playback/capture() helper User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:06 +0000 X-ClientProxiedBy: TYAPR03CA0016.apcprd03.prod.outlook.com (2603:1096:404:14::28) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e63fa0b-d5c5-4166-64c4-08dafab43dee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0GEdHIGTqJ35XFpDNCiOVMR4yUB0C+yYnkyV9UdYcSKdHW9Dby6xaE7KM6LG7b5++gzsFzYLnRQAOJeflAGynS7eaOSUNcgZOD10sCsXaZQmaImceTGXgNWy9/4/EWoA0haDMWcgD6jKhnrux95fS+VneeZuAtGhPJVj5QryxactoFwqMOk9miyzDLpockMpelliNh5JQXh8YW9l5JnrQtedG//q7N6g/OQ2MNWQZjaFOHZoG2R+dLvGSeckzwTt+pha+d9hTlQdNoSGY9MTerQ18FTIUENzKWi3WTE6o5SluoY1DENeKwXvt9IDlADEJdOBHYkmW0D3F3y1xT5AiEfUYSTU4uUuXq/CAGOlTJ7Pq3t1R8R1KcfM610KN/n2XDABnLIWhcqyLCLzrn8RPvvDn/ARhFle5KjoCjFnptEBG9QGqR6hKroSq+8MIrLaLJtLflXrIoDmh8OgDIH+Uk3OugJhkiV8bjlh2thOpdzaB+jdbXT4obk4sOyceFpouqzDFoM6YXk9EQAkirqIir3Nmdw8EJ5squ9jR5pr4DeOoF3CuTvN2bWsPGTnjKKB1JsXhRQBVRJinclcVxOdJcJHtz755lu14chx1bGkcGjHZuC2ek3bz/73ssiFWu1NVZemW8mRTLt1Kyr7H50ARrqhTbq0UdFXMvp+moUlaXCoq9JByxJMhT/IvMkbThqaGC3ZudMv1ZrsVMZfeBFlzQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: no5v69BvGF4ahcPE/Di/R3kbptP/B1rQSQanMUYMcCn3ADUDfkltMYOhdtlZnKKD7TBiZ2bBtQdTUYHGTZE8aog4arY3/7WKxWhmtTyHovYiqSq+TkgBs12tgI88cZWR+EJc/Tg7QK/1jn/5buJtSweYxv9AmFusFQzqgysRMChGo6IARWliWE4X+A6vj+Um0WzzQOgWyVjQmoQK6kA77AmupU9KXox1nIgHVy7HmDLZWgV375aDaCNpCmlhkaYPiLZgFvIeK/VQf6ab6m4Zr3Tgkkja78SIRjGwsyc1/mUmBIZdx2Exzv5qb9h3XU6k4JqM5Q4r155IW8WKdiUKPmw75tqbqurI15byJutwb3VQFiG9PCbg4aHKCf2xBhQjlcrNpDF1FsQqVvvi7eVX7QqXoQQq7pjB0Hn6StgkilSX3c2fbwo9Ppv5pkaIJ39Woh6pM1Naaoacp9VpfiJVjo+NCOBzwrn7nLIb4hS4viKCsSjH5XaUxfLhO4GxidBVRtQAc2LGr193NQvdPTMqqKuFl22Q+1RKSxYQP6KjNzquu+0eHeeFIKxke9sGUNZQJP1YF1UaAexrZCXkB7GtlzbPfavnSNCVGE5U9heSJy8PNCD2Bv/YTp8BNZf6RITZTCK5lbaUMDCfFxNIqVUes9RSK+GRRSFXSX7bDx3WLbx2S3XNqRopFBlFG6dgv1yJXPgqwp+Vu2xkJWG7InyP6WIpGCe/XxpheDCYnCJ32WHxf/JtP1B7D231wxZWAPLlogFANThAH/3uGWXUbKBa8bYnPpi/RBSK2I9ApW0Brpg/zOJYHUbkrNN3ZzbOROetgqERZB7GFIG9ITnqbWmnhAvMA4YTvpJxBJXbwWNt1sYyDzqHDqhsg1qjnfdoDGbXNI39zjOOkajD/vOOY6qHe5R4m7L/W1dX7U+VHJUHSHWZfvQLOGWdkHtForyCR5aOf8KY9739uBHDzOOH5nmwH+KhldEBYzOWYCMrwqXp2VoV/V9UvmiX26sNlRpb4draWQ7Q8ToJo1FuAcjto9VZ9clN9gwUw7WacaRCRa3a5GASReKeUiSTfQvNHh23V38MfuotZytSqsWa/8KwpjBx++cKekrrzRwtSl98SoR0aLfXtQgqeGrvxYbi1eWcZJd2Tly61RDJ1eHLKJcQ5f2bY3QT++LjBMFT4jAcrxCLPLK2oZgwJPYs9WSidiTyNBg97F9L6bEndlma2aaWk4ZNKTGPY/4dbBQxpMFIo+lZCFhc35vghnD12X7nWqRA8JqrysdbiRpKuqHzjyBjQOdW6I8WUhkIwAEnk2Vp4mDSsI0MJb6XM6UrOgyHKGcsqK/wHGG5RW9ZhnQ6qHOYoAk6yo0WadYwNIsQJQiQbolDl7uCPx/uQQQsf5rJpnpBweE2haXYwvMogh29PKy/EflDsDg230sEcsvdMkCEy8a6Hummgyz8mOgV0j8CZw61vIHX2ZU8UXR9yEe7KSPkVwJO59vPR+83IbdAiTY+7VsjICUymVmARJ96umLY6R2cspnMuK5n0+mDvW1XwFqE2kOPOb1y4mQlMON5BcILhzfuO+2DEcwGOLPE9FIRUlcaOvn9XfhrLfFdO7Z0NfHzR1r5WaiYcJDmhKQmwTUbolF6Uh0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e63fa0b-d5c5-4166-64c4-08dafab43dee X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:06.7374 (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: msqLA6Rp0IpvBslckZUW2lF8oKZNyMdVlzi9wpJl3tZDCa/iX0fNKAMgghXphJEoAXSLg2zu7gNcTqJw60qSYkV8uo5o8kaixGOYsRVJp7QovnZJihgvsTTqnyLaDQ2A X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto snd_soc_dai_get_widget() requests SNDRV_PCM_STREAM_PLAYBACK/CAPTURE. This patch adds helper for it. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- include/sound/soc-dai.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 9b18e230e5b3..197dc1629708 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -477,6 +477,8 @@ snd_soc_dai_get_pcm_stream(const struct snd_soc_dai *dai, int stream) &dai->driver->playback : &dai->driver->capture; } +#define snd_soc_dai_get_widget_playback(dai) snd_soc_dai_get_widget(dai, SNDRV_PCM_STREAM_PLAYBACK) +#define snd_soc_dai_get_widget_capture(dai) snd_soc_dai_get_widget(dai, SNDRV_PCM_STREAM_CAPTURE) static inline struct snd_soc_dapm_widget *snd_soc_dai_get_widget(struct snd_soc_dai *dai, int stream) { @@ -484,6 +486,8 @@ struct snd_soc_dapm_widget *snd_soc_dai_get_widget(struct snd_soc_dai *dai, int dai->playback_widget : dai->capture_widget; } +#define snd_soc_dai_set_widget_playback(dai, widget) snd_soc_dai_set_widget(dai, SNDRV_PCM_STREAM_PLAYBACK, widget) +#define snd_soc_dai_set_widget_capture(dai, widget) snd_soc_dai_set_widget(dai, SNDRV_PCM_STREAM_CAPTURE, widget) static inline void snd_soc_dai_set_widget(struct snd_soc_dai *dai, int stream, struct snd_soc_dapm_widget *widget) { From patchwork Fri Jan 20 07:02:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109284 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 ED50EC25B4E for ; Fri, 20 Jan 2023 07:03:54 +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 AF9462DFA; Fri, 20 Jan 2023 08:03:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AF9462DFA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198232; bh=lY7OR7DJBGzDONMkdNws7Xk9TOi4klEDI2g3EZSdRTw=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=R8VJaNVJbe26fY0qF4kUWgJwL/hmwLCvZzdG0dKotOf8PUZ0EOjNsyK2vErgVZ0Og vjMqUFuEsYFQOvAF/OlewpjJ5F7uB7skHU2RxBSuE8l7NIsyRPeHPVCE2S379lNNXG lfG1wt6b6C7o7DNBv3zPWikZQZwWn7hWfTKbJ0us= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9BEC1F8055A; Fri, 20 Jan 2023 08:02:24 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6EA7CF8055B; Fri, 20 Jan 2023 08:02:22 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2128.outbound.protection.outlook.com [40.107.114.128]) (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 38F50F80553 for ; Fri, 20 Jan 2023 08:02:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 38F50F80553 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=i01d/IsE ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=an8prkqKl7SxjwVvZAwMabH20nha2JeSFB7IwSpxg29rksr11d+AcafpJza+t/32X1Ya4PeHSgDw8q8cPAptEelhliwBENLlLMkB92hSVSWBJNMAejz5Z1tJjPD5BsXDgFRX1d/jH+U5fNeO3UQe3u9FQux+QGM/DfoBpHB1DR5nur7Ovylrd6+3pweEk7G4TWymBbpu7FX+iRiBkY3Dgn1NZfXi0aLPDr/wqxd6zjlIsFL6n2PSRXT+g/sbP0FDGb1FFMh2BRa3y0p2B4HRIoHOpjc57CQx3loRnuNVVQuyPeHYGFf938pInoTxZvkcWxAv15hXZDzpcNcX0EyeAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=GwiGLzErNGWV9kNkc61bpspsalB+HdjkqiP50uTnDWA=; b=cO1aSwB2qdjNqV3wv/lJRCdG6+9+2ksEtwBkJO7Yo4EwGdIzBjk3CtbAQaCr62qwJN9YTgLfCWMs+xHT7FV2/hjtTIUjqHm+8DiDFTNY697G3nhp+NJrSIjxsooIoYO6BA31LlD09OonkxQIgtuk3y1OSboxFhRbbtLn1rkxa0BM9L6d0v40WaOFH3Pd74RxSCRp/4wrykvZbbQ1UbpypGkato6nkWjuHCtOEYjK672pB8UtvIoZypqfhAxAepwS3xL/7JIzmWAaARI6I151R1bHi/wh/WAyzoNklqJO8BT6guMk4y0d0r5KV5gg8W+azgUhno1iPZktlcTollxzAQ== 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=GwiGLzErNGWV9kNkc61bpspsalB+HdjkqiP50uTnDWA=; b=i01d/IsEOesTlDT5tXh/r10JayE6KiK0KfUGp4+bLPJVX41l+quuI7ipDAN/HLnbrHw6BuCcjTH7X5Bt4lNNWiLl3Rzgv5em6ZaQrS5uRLVdZNjBi4gLz/7lSejYHi6nA0LhppwR0mzv9JQvd4GmAnhzkQRcRvtkGNhpFo7uAX4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:13 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:13 +0000 Message-ID: <873585lmdn.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 05/25] ASoC: soc.h: add snd_soc_card_is_instantiated() helper User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:13 +0000 X-ClientProxiedBy: TYAPR01CA0086.jpnprd01.prod.outlook.com (2603:1096:404:2c::26) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: a4d05a20-091d-40cd-999e-08dafab4420a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nfKe+LaDCRp5cs0L//DsiI3IHrNp6SJeNli5G0d9ytOfoAI5f0ULvwx6pKz419KT7tcDIk0/xPAncMtVqdlLMI4GO+6LfTKZzP/Iw+fNC+DsLOqRsgSwBLPYwTtzxXjbRhMUeZYkT4Ny1+1of0kRTlwHxXtKmBsVCofM1OyMznqVOSyg65iLccjQByYX5SmlpWETbsKpNrbP372001WJLgb6WYqxI6mNmNjss319lDu2IjNRiTHaaM1JgsbrdAfpZB9pGGH3r4ToQ3ZPNHJbRWcw+o+yCF+GKltdXPFczwjGJAiYx1y3HtDlWD5bi+eYWhxjw6y7nTArEMw5M1wWcF3DzqMkv1aqbtNIaLCizZeVqmj1/5r9kQR7eNvwstUDoj9t0KIpd3/neu6zewdk+wtufJoQyJA0/KEfncp/Tn4X7CRKE99SY7CoxPZczjXMSLNxx+EfPUPP7bxyvqYLGwxpz69j68BnicBkTOeNUl1iB7LPXAhqR6S5WSIPeaklGKcmACU6Gy/3aJb7H6yphHJ69PVDW9FrkXz6meEaFXXdge3HGCU7qXu0y4E781KAP9n+iZe0+hYZVjRU6kT9DR+4a0hf3Em+yuA+4bhbpQ8zptDys6WpMKzza9TVBiND8w1ANBkB7bLM/MDrRHxh9fYxEGVdbZZT0YUxavnwagyBJbbL211cO3MtlrSr3Th66P6jyaeS0EEYoNMCeDuVXg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(4744005)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EBGZsDDFuk4jgLh3jOqeP75pBTiamSZi0TNpcc/o6Hjn5YswXQyPwb3mb3IMVGvAk4cianVHFqbOXaYxww0otks//Ja5QHI12lMpxAy+bGSNXG1IjfVTgGGPoTfLJIh7xbhs3BY2akiy4zsiUZ8gMtm3TnLmdCMelNdQ1f2V6wOe+96EWJbZp2tjcFF1FG1quiyhEopnsLbxH/6uf40M99wDbtSx4+MhNCSE0zwttP6Pq0yPB7dB3f4kfnYHgiCO6Jn8VEaCAyzayC3Md0wwuEv6ZfPxRlNXSu5W63uuOttTIvrZULcmzH9ocg23rCOxzTWSgSfh5gbSb2nm60YnvsQZ06cmi8Bu8m1t2ZdCnndvHnNDCx1Gp8w3modGg9v+gLYzK9uh7E6Voch4OfYICLo2mMgOFi6LhSa6azuVBvXZLaLfXcrbeCHKAnf+P9ZEfUoialzrOU7An/SGSpk3ONnB2WHN7j7g73uihCc4nb7a1iQjefhAY6NKjjsa4QYBBb1XzRJY1KqLXb0YQ6vGnfmO51x9VPuCcQYMHCVPs/9tEgFnsIzUin1i25q38U0G0iQ6P7lAw4X5stIVOwjcuX+y43k6sl8Y5Uq7mOor8t2+mJwF9hjrekJKDCxOUTk8nss7K9wLSDHVvsSZDsYBDaW6pCOTCppOnDdkFfw/+KW4meAWVqkh9T60HZ/mzeA5UHSGdFeCpuo5ZM7VHOAgPI+3S3ZdyrBKsBO64BGprY7E2R2TPaCKwpx7+DLBkplTz+TOgLZ39SxTWSb+u5ELyGpY9tfrNQpcR+8NPWgLON7arFuclr6y4YcmMFrs9Hp/ZZ7OpHGY1rVZQ8Z3Xn0iqJg3ROYL/rGZkoJWadCJAIQMesynoLgBcbjgpvJhjXoWZsUVFXxJ2R6TSiecwGiJzxSXEFVsMFO5NLKnpSyRtp5skB6QWnqnmfHtjEZ/S1G54EfwFY3bOlVjtmKbGV5cN6E67oCx2m6svoqCxqvh1tlX1GbodZ1ZcraEye+AqEolZnI4/Z96o8/bxxujx6ry4OX7yR0bvbfijRt82t8jq5I0Ljeu0l+MOjHnGPDONMniMF+VhU300dUcwdlNloZgXZ4F46t40IPs4e78B3Y9AIXyMstr04YgGadGUlL1uuuqBidan+eYR0Ii7TJ4zBoOk3UN4hJYePSRrDZ6HUaPglRCu24Sx7JjOkRD1xq9dSpRYQX5Rt+m7snohpgARpGPg87f3I9YP8JZCJgbGnVHycnirQKIxc8E0JZKaixVx3z1q80uB6phew8w9v9VJytyCdAwrBqXd4v2VYg+8AkIKRc3QsGAByHGow3AyFJyA+SjXsXioaubFkcysDfsTiZDoi4JX3ddhgwuFiY0fOz6CSLe5c17rxYInGzB0fXqKfPMZpckTA3SSqV5yBfx/IY+ZhcPmz/PPEn1BTLN53iRaRPkrWtYMsrnkC99HhYwV+Li204wYAko7go9v6CHOIM+xIxEaf0ozw1nLFLLKDqFgx7rD1gXtdOajmXnmjUjdVRcFNDCUuNLXQzSWKl7ml5m3QhoLW5wMEso5vlyBblsJBDmFe5VIO5S5Z5P1MrBEDoA6kQn0jFq/z6M4uSnQHcfoOBauhXq7NlFMU/Wa2Zx+oY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4d05a20-091d-40cd-999e-08dafab4420a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:13.8519 (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: Se9TsXbHQ/0mX4qRHWvmS6T6wYYqft8Lpf1gQIcPWk4UhQ7PMxkK9Lg2THca9u7gATsGmZ30qruIdn1dQ8MWHAccfsZOS4+bwaukfxfq4C++NPdB6nYQ8VzTMgLkFsJF X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto ASoC framework/driver checks whether card was instantiated every where. Then, it should check card pointer too in such case. This patch adds snd_soc_card_is_instantiated() for it. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- include/sound/soc.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/sound/soc.h b/include/sound/soc.h index 37bbfc8b45cb..e58b43b5da7c 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1052,6 +1052,12 @@ struct snd_soc_card { #define for_each_card_widgets_safe(card, w, _w) \ list_for_each_entry_safe(w, _w, &card->widgets, list) + +static inline int snd_soc_card_is_instantiated(struct snd_soc_card *card) +{ + return card && card->instantiated; +} + /* SoC machine DAI configuration, glues a codec and cpu DAI together */ struct snd_soc_pcm_runtime { struct device *dev; From patchwork Fri Jan 20 07:02:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109285 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 04285C25B4E for ; Fri, 20 Jan 2023 07:04:05 +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 B0FA62DE9; Fri, 20 Jan 2023 08:03:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B0FA62DE9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198243; bh=2fNNpSfO24r+GmKD76Pbiz/ETMMgq6wF0jWrKVIUeL4=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=NJWihtbl+JoZLjHY5daj9ontcC792kZbijmmQMy1NCaYDDiQgfWs7+GH3haG5f4ow NMAzBS04DOkFfnzZd11PbDWWmIIs0lz+IUpOTPD+2bY0MiTxuncVHzY6zESntGv7xI 1tF0rat0d5b1WSlSqGXvwEos4YTjnwA8+GOJDw4I= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3406AF80563; Fri, 20 Jan 2023 08:02:30 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 29BCEF80563; Fri, 20 Jan 2023 08:02:29 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2100.outbound.protection.outlook.com [40.107.114.100]) (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 1F771F8055C for ; Fri, 20 Jan 2023 08:02:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1F771F8055C 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=EEDQzeBP ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kd3YsZGNYrf505NIPn6GhSMNdOSzrbTZK3Yk3Bw2yGC/TFIyD1Zud0JiD6I92EitVTVm1wwrm0D3iTi5aDyCjTrYMxL3QjgnjAB8sJKDOpJe9xYqDW5Hx9UHGLLybPGSnFkPBUzpe3kHvmudBUFMAQlhTJ4EYNkcVByMU9VrFZmGrENfw5zgVnkoyLILp6K0Lfr0tznTiYcnW+UO2WGxrKwKK4sSDGwn/RUfymFAf4+FVKcUms60CKHyw80YQyQexfxIeFeM6zpV8hIjUQl74W+N/SbHkSqH43zbfPVBdfP9dczeDw4/iBMr8ihOYYjR5PD0+y+OQnkggwJ7CGnLJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=o+DHAC/qAHFuTBfjBrmASsqdMC94lXiyUM2PUGJLHhM=; b=k0SZgd4w1nel0gCndsSCkqokxuy6Lqy42IlsYPespLPXegXahRALcrB1HbEJaGDhvvlFF34QBwtonzFZ0VLLfOlpYu/vjByPCIgygxBvcIAb8S16DtYhwZ9zHJxOcf/KdnUZNZpN8yWhMR16htH1RFbRArx9BVB6k0oDklv+7VP89P3EIv0U4ZYTMjtqZu/zcx7NCrXfX7D7uJsQ0wwsN0cz0ypOg4gbZPs5WWUM6gW5z8F5NBI8yNb816yemBtK9gajFZc/grTtfUwVUju6B7PEBAjC0oU0hF3ATnHVaAZeOfYq+0k/p9dFtgnXRFUY7igPybnf8m2g2HknFZVpTw== 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=o+DHAC/qAHFuTBfjBrmASsqdMC94lXiyUM2PUGJLHhM=; b=EEDQzeBPFPWPmnNzWdLsaGWWJjvOJEJPpbbfDX0iN95Fpdb3guQjvhonSzdWA7SUUPTNTdj+Q5gyWmDAYL8paYZfZbqvOCAwKLICiqRdtuUo+gy4dMySqGq00XcYi2A37Mhz27SjpqTBjB/Ml38GnzL+kQ6X1RWgWjaWmj634j4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:21 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:21 +0000 Message-ID: <871qnplmdf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 06/25] ASoC: hdmi-codec: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:20 +0000 X-ClientProxiedBy: TYAPR04CA0001.apcprd04.prod.outlook.com (2603:1096:404:15::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d4bb7c6-225a-47af-e14a-08dafab4466d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BDzHbEPuZXNe6BQFJdiH9Ez3gf1IoidldTLhFXvfgEYoFDOvRI3G15XaYIUnTqn/58y/7JT/kE+QN6oBJdVIxUJOEzLTVyA8XKmiQ1uqGnhZ/izKrybBjdUFcYoy7sxo/tpQmo6BjbceF1nQGD7iFm/vBccaeBRvDEUrxqLC+3JoYGTKUjsn0XnKjj4PZtTVcudZkZXJ/zBeQv4R/fT3tEH/+Gm26ooFc4R1KRLnMJ1g7HXg7AIIwWTPhgsi3yzkqDDSL2VFNg5WTb1DRMVJAjDeNwBoRXSt/ulxzncUPPncxVSDnsli6G+VKAIM/4lp837aLd/wG7Fb24hIjmn+fGKkahDlt0BInjko1nRDZESQz4Vd8EGRL6doxm7W1Lmq3drYwssns5cnum63nv1hrnH3ntfuNTbYSVxDFUiyG6tNXPqODwkV2HIq4/JY02gupvY93ELa/SDgbfE1I010efSNSEnAHlOEZNOMx1tTI1FOHcK/xTNTB0JDfzsmCr7/3DB+WblJahfp7pT1qdNDWkoS5IrKIOkmzAzhfLiiY3136TrGCMAZr4bWHvKBPL6vcX29YgAyiHSJDLwe12YJXvtlYmSyC4gLwN55e+2Dne+sGfhxDfpmadfBPv9k8hSollEOwOvozZ3BUcN7P3p6T7v+B2/k0aAwOGvH89N51SxrQQKlG5Ipa02ur/yB1sAkvMA11TPMWzOgblJOCEGeBg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XMJYG+4iSw3aHBvTi8ILAelJHtg4n8Yu09cK/3VoKIa4W7gsJBIQ0hswFCKphECz/nGnPmr3bhvfQ4r8JZiJSd3h3llC0qWt/6c/y6HhtFb7C3igdtFxJwyF/Cj8enj5A68hrwgHEbMMq6IfFGDf79O357x+8ddAyTxGaS6iT7kDo7K0jCZNnqoLXaRllBt+rx+cu7Y2m+DetyjjAtNlQUM1kLVRtd90S5OmvWtJ1A2UyTEGyjyqgko21SHmy8Mr7G5g+dES/RFlDNz0S7YNFG0lq0h7phoTSIPGx5TyawjuMB15qTjOPq16DcZHL2Yw2JhtSaQ7cEd3rkr63D99YgM3nEEWrpm2uu81HOgxJ4Yxe/QASw/MYEHJAaLGVL2cujX5PbgR0jPAgtZGFg30tLQuGE52dMfWbcHT5gFCPb+WqI9ibcTx9LDT6sakeiOqW7kr+UQDAtpdGah1WnJCLtoe5o+ov30f+DPQYhnQ544iPXaKAGlFe5nhWwiVEaNAAI+zp5HgbyBuDg5gT3RlqLx/sL69WtDxX+xCsTyYUKgvvUQITLSxs0dyKBJMPf1tsyUr5IMB//m+gP5fsj0KYe6sa8dNGKEYGbn1kfubdpMFKwGlz/ZcUVZBd5lrzHjYOBRj2aFbSHNsqI6WxWXVVywlZkuMhEb7ArD4oPfcPA2oYbUT5jhEg4uKH9n03888w2EQbH84dw0E91T7o7fUzLgQRyPkJDynUzr+gKcQBUl8caDe9FPlqwSLveNc3tmf2Qfijh59cmr/Z/+0KTJGCUWtJHI3XgQHamCB0SpUHj6HTP47WpQrNUKQ+SONKXksv/yjtA7xbzEz24ZHSLwUiIB8wuHIsWiUu3t9W3bhvkEPLoCbB9sFVut6+B6WyhWJeV/yZnhvUS8QqTVdhPXPNUSm99nNVR5n7LdWfpQehbnlNrWLKuqDLwgW88WqIDPQy3/sZusQ3ZOzUmG9ppFiPh5sYlczxrjfbPlW87MKT+5CsGunR5wO1sD7tW2KMPG5E66ziQO7hCYUuUoDte7xt86O96Nu8a+0oyDJle1oRd1+GMAx6nfKu8Jpamlab2YZu1WmNICmYVNm6ybjEJdycXGpLrrZ1B0bZiDBSHU0nrwK0QgyFkRu5wyA2unpQo3DLtfGhyVTWjn+b5IB1zlVeMKvKZRiRYULDSUhUL2EGNPwIM/QstpenVVz+PjIMp7BxZZT3Yex1ffx4AEdYWsuYvkQyd61yfOsglMvHYrvbLucBtZccXurT/8gHW17dHicTfSIFBTxpQkMj3xnWvdr7vWD0qiZcQFL58SJaHe3ZSrVN2c7Fqrd7LuCfkwz7amfyz132hNXGYfJt/dSez37T595Yz1282Qcx4kMxtdPuuHZdaR2xRzDTbH5ONYU3aIIu2CYklKBK3reR+GykRJJaq3nAB+fbETMbByzaOET99HJj7AyTHuNlx1NnO5/+k/uGDN5SoHIN7BqemJgKAMnBf0Ht52N39MXw6C3uun1baRoUp4BFO/8OVQlJtOpmljx7rlTqZdjGLvhJE5TQCUHJP28rYatRgAOaqnKURVRiri8MVhNzHVlm5db/FCmykviezbL8Q9iE5T0FDKW1AlNVcPnNEU4eBw2F66RLpDlhQ4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d4bb7c6-225a-47af-e14a-08dafab4466d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:21.0259 (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: ewxxvDuR5LJQytIeqzC8OAdv7mfBwrZCMb+nLsKBJty/LsKooh79uXGy+QZCGdHFXS3sE+o+eLhjZmVoxMpwVu5c5WAxSyptW1Lix47IidwqZmRq7rm1Nww6Qn03pgJD X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/hdmi-codec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 74cbbe16f9ae..01e8ffda2a4b 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -518,7 +518,7 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - struct hdmi_codec_daifmt *cf = dai->playback_dma_data; + struct hdmi_codec_daifmt *cf = snd_soc_dai_dma_data_get_playback(dai); struct hdmi_codec_params hp = { .iec = { .status = { 0 }, @@ -562,7 +562,7 @@ static int hdmi_codec_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - struct hdmi_codec_daifmt *cf = dai->playback_dma_data; + struct hdmi_codec_daifmt *cf = snd_soc_dai_dma_data_get_playback(dai); struct snd_pcm_runtime *runtime = substream->runtime; unsigned int channels = runtime->channels; unsigned int width = snd_pcm_format_width(runtime->format); @@ -597,7 +597,7 @@ static int hdmi_codec_prepare(struct snd_pcm_substream *substream, static int hdmi_codec_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct hdmi_codec_daifmt *cf = dai->playback_dma_data; + struct hdmi_codec_daifmt *cf = snd_soc_dai_dma_data_get_playback(dai); /* Reset daifmt */ memset(cf, 0, sizeof(*cf)); @@ -834,7 +834,8 @@ static int hdmi_dai_probe(struct snd_soc_dai *dai) if (!daifmt) return -ENOMEM; - dai->playback_dma_data = daifmt; + snd_soc_dai_dma_data_set_playback(dai, daifmt); + return 0; } @@ -891,7 +892,7 @@ static int hdmi_dai_spdif_probe(struct snd_soc_dai *dai) if (ret) return ret; - cf = dai->playback_dma_data; + cf = snd_soc_dai_dma_data_get_playback(dai); cf->fmt = HDMI_SPDIF; return 0; From patchwork Fri Jan 20 07:02:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109286 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 99F3AC05027 for ; Fri, 20 Jan 2023 07:04:31 +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 50BA316A0; Fri, 20 Jan 2023 08:03:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 50BA316A0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198269; bh=CTcchOkvpob68bMHwkywSzJcRpjmweYX7cPtxyy04Ak=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=ssLMAGJSPsawm/2WPOCOnBWaOsIM9q5qQ5O72HDxLeSUACS6QfFvm931Gjzl/XpJ3 fS1yZC1h31w87Cb1z1IC4kugJjuP4pgATopyO4uZmvcgixmMAb86g3gRNwM+4kfKIc NhstGYqPR7bYaa+OQkPYrynknQWlE8XNVDpFKQwg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id CD01FF8056F; Fri, 20 Jan 2023 08:02:36 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D1E9FF80570; Fri, 20 Jan 2023 08:02:35 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2105.outbound.protection.outlook.com [40.107.114.105]) (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 B03EEF80567 for ; Fri, 20 Jan 2023 08:02:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B03EEF80567 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=ceMM6S16 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cfVwf7HOWCZVA43qnOY9i8yKHB57xX+gc5ZgE2iQnbssvD7AM0RIHccmmniFY0YaLB5r79ifYXVkhJFvyN9UQ2h0+pXRl/XQF2oDAfip+VTD19BemWpiApZiu4kKdnlbAa7cukTdsnni1dBzLFtqvWToLl9zCoyd4z8wnCY45ptSyg8uBtG3KdhSbuh9v94LAJh8xvwdd47/tsvCUb9orD9JlELW1+5m5c0mSFBIdG0VGYa7qblOMDFiLS88myCYki2JmJ/Y/cn98dxTEM5Ah3aGoJ0XXymU9kjYI/cmS87YRE+iMgQo13ZJa7+Ndeno1Qb4tsx78aMQuyiCGe+hjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=+u9hi1nudyRG7wjvm7iVKYDkzLz1mf/5KMJrRb66Lyw=; b=EARiOsLNCejR5G2OMPu0qO3HjpaQCeq9paWWT6WLl2Ei6gklql7uUNLVn0MTg4t8hml50S7avP2h06bmOqxITdWYW0ZlogX3Ssgkq7bNB+WKmKuFdoDDV2ZniLN/ogt3QVX2XU6zgEyrBkZbEZWYHRIbTIXMwF09xKvnt5RqhmxAfHxAEAf4BDqJNeH4CWMlLWE30+nCx/d1Sh41M9MrWdFW2YZXb7AQZi9jllr3xm6NL2YGYZRTndgjShMhwTiJ7Nc4fUXmHbxmMPUL9BTwlGptqPl0NBATKwJMjoaRfV6OY5WUcN9NrDSnd+Iuzr6TjWn6hepL1RyEDCcDB1VIWg== 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=+u9hi1nudyRG7wjvm7iVKYDkzLz1mf/5KMJrRb66Lyw=; b=ceMM6S16DnZ35+eMoyctJ9xhkhbfSafsk8sqGlGesVQcVAwfrK2nWmlTyoTYTGUDHy5PHfNXyCFmcyqSaH9IAXPFqTl/pPOjUm7ECzoP0vCpxM25lejuBx7KVZnySbWGoaARSIKSjfYN8QbjhCJpuuym7ile3JjwTn2uMT8GeDI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:27 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:27 +0000 Message-ID: <87zgadk7st.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 07/25] ASoC: hda: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:26 +0000 X-ClientProxiedBy: TYAPR04CA0022.apcprd04.prod.outlook.com (2603:1096:404:15::34) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: 9772adbf-095f-487c-2d98-08dafab44a12 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1AVzOJtubJ7ggKyNehssntz4TfA0JYRCX1lKc20nq95Eu62tUIrRwWstkCOGRyjR8S9YYUVWxFSPZ65QIu3Gl6wlMB7DYvLvC2Gpl7kvseXfXAjE5f+c/XJ3+9NYRWR3MRQE3LduoAIv6Jwn9KxvFOV1X5rHZ0UwydYyMAkN+WHM/YpnkBVCwJZ8Ou02Pv9SI3NeOTOhHwNFlmO/7WDT+oEYI9pEGgew0l6eXCFirb/L96ivB7LAakNfs4GpxJD9kYBjVFM45Paod8bbXj+iVoprKR5o8f43lsVtwsvOB5IJHxrchorLY9ZW4ZyMm8n1YBihcF7YuA2pJ1g5PMA9eQMys7CCuLSSIF2jqGAvLdgNMl1E2TK06s/7WDCEbG0Swp18PRoQT3fVwOWJcBJxIBjf4A3ZyeCombJTqPl2DaTl/72/qDdgx9CUHEFCim8RvppIBjiGTh1iWj+IhYgkw7cskljzadOA9lKYrNzNcBj6HLfq7RFBjTDo8TNzx27U8NOe7Sgmqk/IX5PICEbCKPIxlO+xDKlShrcT/Nc6bYgzL1U5Eq6iyYZJonEcsgBm7hsBBwSX+33HBklLn7/9Y2Am34GHhCF9pA+7f6OEOXZQOlrkgFUEwiowYsnGZ6qiFNMkmYQS/9yjtl6+oIWVKO3WVxO30c2P0Bzt+fK/Y4/bqz4Oxfr5L29Ejpj7dA9SPBNqZ4ewcHh2NiSJIIosBg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(4744005)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K/qYKA7PJOr+BsG9eCUNB79mikXXAxhVW9j5iVwphhGmhrzTe+1Dm9RESnhS4dLqiKTGprZgsHsi5FzxXuBmS3ArlgTVpsSZADVmfyUMXoANp7cCSi/6pB55btIxBspMibmS8RhP4JU/v2UxlwjTrVd1HZbCx8eY2257Jx6YrnJvjFlmxHaekmMqfGmUNPFoggCRVsJIGbVgcwMdMEE+TDDpQdPm14T3XQ0KdFbTtkcbvxkxHYiDGPJkjYrkZRUDY6Y3z7iuSA17vj+k6zx+9mvfCdAKvJqOq8PHZgRkhkCUxu1EvPzavP9bzjxukNkMBv0XGRAa2dcRl9cPg0fS0B4UovXjD6LvVkETBZICNxau/NIKZzHmcjETvZnMv9P0N/ZLzPRlSDFF5rFBhm+3MqUzxFSGO4zi4N5V0S6H05xWlHnpJMvpFar7NxdxB2U3eYoHTRRy/80UMo8vCc3Kt8lDuh7s3d6MVJGOnf3x70M9EXfkhJQMPMoXWLbT0/qItFO25yUZvEbWFlpk3qzLTlGq+OoYQWRXyQdQt2b/GvwriNSptakrpYKVr/vuw97gBSPrALqG9rikFSVWZBcdXd8sUzxgpTASVDIn8/afwQmthM92E/7YgEbQpXEOCKqXq0Iuq+nHf4D33xUyXuUB73JPbfSN2ZBNJ89vHfTfo/fgtgekInECrIy0Jakq25sgND1/CGrLs6LKi9a8TXVqMxwnXFLUf/hWmRyraESQGwcUNc1dYODQvcjOxI05awUJLTiNdyymcboG/cskoIMEHz1397mfmk1A0oR9/bjJ+fRaCTVtv0SSiuXUNFy+31LM/4YGbfiliA+B3hxtr3Ji0celtURLT0503j3MKIoSu5xHQxGu6kX3J0naLz9tc5u/uF9+x+y4Qb5UsWv9q3zM5Q4Ff43pbNOBdtXJQL/8iiQe/iB9HgFD/k4aPWeA2VzMduX5ctLS1SjevkSVintLW4MGDn5rD9vkwMFQvLpACu/Qs3uSN9qPwebFnMjLoRkNn6T0R+LCmbCW4KtUyTTYB0poKoKiaMOiCskt0CKJLJqUTYrTkQNydm50R8Yv8WG3sWzpPZ17BBGyGCsRQuLN3gmdwhjnJ3iHsAnrIV5Y4I+v4yt1GX/jlsj8zy/c3+MflCAyB4GjQvPlWn9a6GHRavYDFS8lFW8EQjkjDSu2voGQ52nLJpYbOiCHTF7ZA4RRQ1hkRCSNcJ4rW1+LfU930L8rq0RHD6JkarSYvMnBps7i00a42yojwRXqlIDRd313ua3/ypWG9cHwR99chkCxA4ePb6v3PfWPEyW8wI8ibgcbwfwJ2yJ8l3/a2z840qI+7uFcMLPZSo+QYvChX0xgsPaLy9vmReVSmXZflc2obzgPg3HU3mo8dxyT+X4jwnYytkudGgrf4oN7fVX7WYGQ8YogpAC2XHcBcXXV3pF715YGS5YsiZ1+ltJXoG78eigRN2CfSf/EzH5HozYgN8zRrvHczQseiHeIW21hjDxjvFa3YpOHB8rDee5Qv3vRsWZmPPf+OCB1kZH+2Zvo3eSUQxm6TEjzhJKhTFobNCK+x5OjzlNw4vOejFf0h2ausKzv/0rUxcb0DWSHqTyVmE7Ge5wQE2H+JL1b7LEbik982GA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9772adbf-095f-487c-2d98-08dafab44a12 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:27.2452 (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: v1s9pr8ptlcmsDzbXP2MG30qJwLcQ+q6EET1vpA64vaeol7RI8Z7kxGA2Q8InnA0IPzedVr0RbxhL9SRmW4jULJLE/LYRzP3MvlR8i0sEzCjNiTkV6pwqJVhUwZh6KTk X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/hda.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index 4b8ec6f77337..d57b043d6bfe 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -126,12 +126,15 @@ static void hda_codec_unregister_dais(struct hda_codec *codec, struct hda_pcm *pcm; for_each_component_dais_safe(component, dai, save) { + int stream; + list_for_each_entry(pcm, &codec->pcm_list_head, list) { if (strcmp(dai->driver->name, pcm->name)) continue; - snd_soc_dapm_free_widget(dai->playback_widget); - snd_soc_dapm_free_widget(dai->capture_widget); + for_each_pcm_streams(stream) + snd_soc_dapm_free_widget(snd_soc_dai_get_widget(dai, stream)); + snd_soc_unregister_dai(dai); break; } From patchwork Fri Jan 20 07:02:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109287 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 BD3AAC05027 for ; Fri, 20 Jan 2023 07:04:49 +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 6D2DA2DED; Fri, 20 Jan 2023 08:03:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6D2DA2DED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198287; bh=9l34JNrCKH/X4nvx21PI1aNB3NuvcrDUD35HM5FU7ts=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=FwVp0WJXMUwvdLfbhwG/W8dhlk+Rosp7ppqC5WItZbN5BTdTjyhbLHQIjUQall2h6 IH3EltBHj5TtnpY0tUM05eE6eZAEEAzvHsvedP7mFYp0t+2FwPn6u63znr2uQdwk+p YSBrE96sGFzObSCcRn0YQc9OV5p90KtlOQHGKQWs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B851EF8057D; Fri, 20 Jan 2023 08:02:40 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BE3F5F8057D; Fri, 20 Jan 2023 08:02:39 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2096.outbound.protection.outlook.com [40.107.114.96]) (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 082D3F8057D for ; Fri, 20 Jan 2023 08:02:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 082D3F8057D 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=OztOX3Ds ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QWPVi5fP8EpDyzzjUY4qwLz/mcGVsbpUayB2yjPvflENv6FDhPK5H5mYsYfAwlJCTIwWK6Asn8WKtzxJwpKBVa/XEU9tukkBlEpjo01cnDbmEAnGdvz1tQu7rx6Q9kK3TC0L9Wz2uN5ykRMQJnAqDRGqiqkxSAz/ohO6tnjus8O+gJSK/nsnXcIxbVI5dgkotE38hUk+VaPU9mJHX8mf6vxwnHcam7ukRrRHeobQt+k27O1Rrr4yph0khOLte5o63/+seHg5JNjLYF9buLZLDIq6bLlnZcCJQsnFQLhnQZFNm/FTZ0r7zlT3YvI/la+mzfPKENTfykpDdjdyQw1c0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=B8Vh7pPnO+anfYS1SQvMlS48/4F1mNT8fZccdrleJoo=; b=dd88b8QzJXmnV+rHMxJYLZUiLdfEaJO1V3IyGGEqOrHiEXhszWkBlJKmwrpXkHvBLl3lHxv1xEtdJWulKXXSAenkLK3bTXGi1SJ06cLPLQ5K9YeWqvEclpIDPITh4/P2J3ofdnWfMxmJhDIEQjsyEYgqxmniaLxFIxQbxfOsSqY63BRIHr4YpIshqmbnZtvKCihNDunId+KfoBJhcvXFU1J9ORRo5PwyikSg4AsGw3fwgzAu5qL6U8VwlxT3Lj6qLFwSAv7XRV1YcPeGfN0h+RK8VmNHuCMC3x3HV80z6UXR6yW8sCyJjUOa6+d0RhDjtRb5cleSCFmFuNX8C/26aA== 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=B8Vh7pPnO+anfYS1SQvMlS48/4F1mNT8fZccdrleJoo=; b=OztOX3DsbDwU7MTw2dzdCqGlsRWOrhkym6xrQ2edTaA2oPecRQx9wu+UG3pjpVlDMF4JPY+/2/stz1BuaP21E5ddfXDVPAwLyMLFmPhUJYjWzKpwOO4wg25BiubnK91ANTrZ9Zk+O72pYATEezB0Ux5ZfodszTIjsOEM590th6k= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:34 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:33 +0000 Message-ID: <87y1pxk7sm.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 08/25] ASoC: max: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:33 +0000 X-ClientProxiedBy: TYAPR04CA0020.apcprd04.prod.outlook.com (2603:1096:404:15::32) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: 909644e9-7066-4b1f-95fd-08dafab44e18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gFfUN/A+FfnDEOJEPY5ES+ThkRQlkCjkmFozMCXuAkyO0viR5oSyhscr3OwzdhWAIgDI1lLUyYwANVUU4dc9dMuvpzENivN9jd0Xs5PNKRcghGQyLRSLXTu4bNvKEOV0o/uR0/hGEn1bimXhratbGpCh8i0/V97BqtmNR3tJjKcWvBwl/nrH2viaWU+IY2i1vmfPzhPGm1uTylN2Ztlu+s9IdsrKWQOJxs1UpSOcedj9Lywb+SkfsvvKXA1l9Vv44qeU9IMKatL+ucRVRthePNdiKuUcyQbKjdNi1maVjCStuWDlZiwGQSQJUporEGP7FeIesD+yZFM8LOjVvduSx6FPm8D4Oi2tjJ1asUDM4U5ebi6+mh+MXPrenkPi1VTjJPxrKRc00MNXEWMPavKR9HOAw4l7FAWxNLbkr11YsrUfkENcfa+ygrMFkMEr+oBjIU7mgn1G00bJ/ZuY1gLsxbSxsw6B7w9/UfvJMOUPaciuFU6Dt1h2p7LDyO1IsV8g9b7dfdGO1eaYW+dejn0sZRE2CA7cMeXmjseTeyvdp6heP3blJxnm5uplgS14ctZ7EgL8mf9b2JmAIZaNuII9Gl5A41dIL43vbu25ekIzUL383IViTBCZytvjCfPz6rFXRqU7gMozvcPO8B/o+nLgH4y2HurMnPyfzZbPWYwRo23QnsVvpdehZ0PdtBOX4sPx9hEeMmdNkTlpHjrioL+Ksw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(4744005)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WM1t/s92wQ1HCQ8L4asj+VvwuIL4foMS/+RtAtGPAhjRsg4JD4KAyg/s2iWy8xz/kxykHZQm2f0O64zsNFpaM8+SYvD0vv8ESsJkc6zN18vPLFZhYiFO8o2NitGpPT/w/ob5QQjM5HmROcJ+YJu3Cds89CeSTb9W/CovQ+AyC+O29gepYpvOyS22YSnYUFF/FvQSE9wzPhIO31Jao7WqbOAjp/ILPe7w7m1RS5nFenS6c1Z5UYwv0hxfrCiXOZEWKMEG4jgRbYGkWv2H0ZhO6GJv8NHMhUvuhUIVfMFF6xGUC61Lwu+uu0P2SvdPSlmyDymJijXRUELNAHAIjRyP7hDB0Z8w+3TEtCY1d0FcNM0grIboHW6eDb8vu3fY51/pniaC0rcpBMdecj+Ddi0n8GmDWqDgIZskdGnmwAB8VhrqOyCX4JTNXaWdPihBJFDJIiUQvjG5CWRnozsr2IKol1iKng4eB1G9wAkAdAaxgwBsNXiHVMrBBGRk6a7TMlLXAfoUFWC3+6o16ZB02PBg1Zq2nL0MXYjYDXcFfdf1Vm4zVu1ksTbMa4FZTe2NBaagY9KBq5oX9W2BVigdQhY5H9L8XC3rb3eJtOzmRA6J++oF4rOLj3k9IdiQsrH2/oxQDwQweWVj62TfseaALOgQJk9fHNy5oJUWfzI7T3wb0aFMgw7IdPn6p1V9OD5+a1lc6BjzHzMnnl6nz0FT+QiPtyg6lZlTPriufwIWONwZ24fuq1n2v8mw+h5hmSnv2qu3rdAGxUlnmW13lb9WwzmBQGQvdTL9GQTgtcerJotbAY2rTjidAhXEb2zzLwWp7KOG4SJ+zobZZmqTLfOZRZBiX0piVPOTYRDbwuQJNf5gn8/Ljf0FS3zZnL3Grb5kCB2f2cX4PSIWbv32DvRDKLTqiuhO+p/EN1JKUjfxASeKh5ry+zSWU8mqV1gogg3L0X+alRrPvYX++w8em/dgxikuZrbhV6rH8A1c+nJrQCbrZCOGfJrNT78lil+y5Ils6lL6RFyA9aJ5ZgB8j+0A7JKMzPGwOZaDLh8XYFNE0caEOGbFUzsp5sr6yoDtm7sqeX12eQuMoTwqD41wJ4l9NUD+iR+/bGX+UXRU8P40lTKt5p95IRKd3m+VeYSssFwO2ePbcoYQepxKLZJA8t9cEFRx9ZNHV9MBzX4CWxGzqoTRmPkG8wkBTQBZLSRI9gs+8JCUtbLGto7xH9oeDCNKRyFyhg8r9ETtFwgzA4VwSPIfAqgCTsWVPCZ0HNn8yeXkt7DcNU3w/iJoAMgJjDdu8tYjiAVI5GNtw2FSJseJaouEnY2vEhDAPBc5t7vINdw4TgyaTAKtYbDRe4E5aH60Xbs9vf3IHd8fHmfNUrjYT2gX7sBeEPbDpcZ+staqMXrCYFxz3ltRH95LypRb4+3AFjVQrR6ydWTO1P1aevbIr/7d22FTp4Sl+Pas3xyiwGC7BS8UD4SY2zxgniWitMvKEiVbWmIKuf5G8kWSGIJf7kYOWArLCkycj8aAoKNK0KNrF1wxyLEQVj17MApA+CED0jazqIWKQ4a/3uGG36UbGmhRFwmCYT8EAfFlKf4ytE9g8FEGbgM0CfxQWTgxbC9uwCY6aTEAqCU8V8zJ8qHFbCXvRgo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 909644e9-7066-4b1f-95fd-08dafab44e18 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:33.8887 (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: 70IUdrEeOzqWOu3MnwKDcipTCBGL2Yw92hpqyEuvoNYPueNPWYRThVyofstC+ssD/rZIcHVWkyteREPYxYQRCCEw0w9zwY9ttZW8C4maAATCona2y0sg5kjrUob1d8co X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/max98373-sdw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c index 3cd1be743d9e..c9a2d4dabd3c 100644 --- a/sound/soc/codecs/max98373-sdw.c +++ b/sound/soc/codecs/max98373-sdw.c @@ -689,10 +689,7 @@ static int max98373_set_sdw_stream(struct snd_soc_dai *dai, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } From patchwork Fri Jan 20 07:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109288 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 4FD4BC05027 for ; Fri, 20 Jan 2023 07:05:02 +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 D48BD1690; Fri, 20 Jan 2023 08:04:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D48BD1690 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198299; bh=FYEMEZverDpT/l8VPzz1dryizpJ20nREbYHc+hLbIgs=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=cqxEH/uAgoyJzI6NOk2ze4Guuf/Tf8hY/Pek4ZiKQbBYbZMAmP+f+hxfY/juhenK2 EiE0TRlMuKoMcwWHJIe8ZPb7H3VmvPXfBWJeYHk1qlgcn7kGn4FA7SOQYEEfZsNz4q PVu+D7+cxBIRvGOoYyk3r+v0IjkZZtERduukK/JI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 47A1BF80588; Fri, 20 Jan 2023 08:02:46 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 548E5F80589; Fri, 20 Jan 2023 08:02:45 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2131.outbound.protection.outlook.com [40.107.114.131]) (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 561FAF80580 for ; Fri, 20 Jan 2023 08:02:41 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 561FAF80580 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=cLvP25SN ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LWrZDMgxAHIcY3W/CGO3qTGUvkRMQkBWc7XDBaKXhh88u9I81P/cQhi7ncF9aYrCCKeqnuJ71L7CSFYOpdeUwX9EtULFVQIwhYDN3O1EXsFJRNGIG2o67hCNEfqfymdvqvsiAZs1lIzwqsYogSEOrad2xlE76Tc33PW8OGZYNAKaK0BTQYYnvamF31svIlvVV2MXnzwTOynz/Fgv6oLSK1SFdkxrUPEEyJXDwLkpIgkL3EkXnFstWXfnc4erLxjrMPxb5aTo1nPCcKlD2RLPNDyVVZXz/J5/wUQwcq8VGis0iLjrkHT01LrtG/ZCXfnoHTHBKFA1Y1YvSD8cwF4vjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=TQDboAe4Y6sGeKLK8cEpp0tfsDmJhZlmOfIo9hM1LEw=; b=h/E+qe5elgzp3jShIw3zmi5N8dmFkQ30IgEmX96NGjU2hpIVZdS2Kfo/VQrcBobFJkCKvp6W5VthWFdYD/Jk6JFbsgmSBaEeSKn8g0CE38Im5RGukOVSRJsG3T8fP1nDKr8U+LGBUPdlH9bvF9rTIUrTXeSNlHQZFl2QMBGfAWTpHYsD76h6LZCunQfg/DbiDkd9rLw+QFPhDi4y2TzZL8xtWGdjtNDnZ1/8Q66b/8gsAoWNI2Hs6KSt+HPy7QF5vpmbAZc18mR4pNqu7c/8NDeGkO7sSXEPuv5moSX3VCILcAMMiLF7R8xGQnaDDdaIHit4Kme8SUMV4y8Vs5IvGQ== 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=TQDboAe4Y6sGeKLK8cEpp0tfsDmJhZlmOfIo9hM1LEw=; b=cLvP25SNMSVyevLa6xIH0wz0c9L250KS/d5IdtzpZ1JtYwPI/6be7geihXg7qq0kQsJydrXheQ2kqANtpoqwRRzgsguMXs+1VTe0tMZny0GOzI6GHi3RttNhxjperU546+oFKg6gZBcUhbRxkqer5gTx9VDWr/lCfEAwzvK7P04= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:38 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:38 +0000 Message-ID: <87wn5hk7si.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 09/25] ASoC: rt: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:37 +0000 X-ClientProxiedBy: TYCP286CA0041.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::16) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: c81f18d7-d70a-4601-03ad-08dafab450be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I8s8XX0kjfHNGRN9izM7EODJMBqTE9wB5K0QPeMRKwQtfpwvlIWh3qRHQcFL5q46l0E4toqcuWvYsBUtGPr6k5JRw9KaqOTzvVe6bK4y4uNLPkpeVwukKiumaEaryWiZ6OjwMrRwFr/GD37V1ciNU08qZLzErRfsh4qr2JlqNa2T2wcb3hbdysBG9OXiVFYjfixx1TdUe3VV2Iieoyz+XF8Sns3YKIUmP4oTQXpGzGlASaQn5auaixLLPYcq/V/OzkX3VKTLJCOoSJ7SlrCwzrhS+9vPXTX5D4vMC3165ca4eFz9GuCY21cXtjpo7LeMNpyMpPd5DiRU/wS1fCe24apdijF0k9sIXiHRzvqBhExeSQzyYciMLD5Uo9ja8SFyN+GyErs3qkVZ1Xjz58U4s5LSyWIrvK4pHgi96rWzRltKz7oyWgj00gAVQUb6bJ5En3ccO9T7NxfvsK3WPmiiPt/WtB+JXG09UgUx1gu/8vOKX4NCsDTZlnNF3yjhHYTSXR4jccl0D7NWGxPygraiiChrvm3dcI66cqa3hgHhfc4UPpWAtqT6Ksz7jkOa/ERRImtZD7WWn1XB4iA1TvCRcGNiwEYrUUjl42dFwp2iaDY7HZXX5+hoevFF6y4dnVFtMcToTmra63mQH6uYnCCc9QZf2fgVXJjAZIh8BLmGFc5orwXFMAqm7o77HiVVY6eKv7H3jdJOA1/rSJoM5529fw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(30864003)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BYD7iY5ipWa0qGd3jaWWxTUUa4sPW56lluPJ0z5QnR8dKf4QEwUk1vwM5whkBbuc/07OhL1xot6xwvKEG9NYqOI5KQsM8zgb5ro1Lh5cJ9Mo8YwPbslYZytzKyNnlpvHi0Dwr+AtIoJAiBSyTnk6lN/6iYCAsTlT0nx0ttha9S7hNrCiCkUxaZDarSoEw4xoWo74Lrfnycrvh2OYnI0U3DhzR9Q3hUGyXb4/THgjdb+PQ41VjK3jLPzO+Db27TxfRtffiS6j8rhsXKfVZnjAhyx48Il9MMVxhFBfJ6k3t3u0HCJHUrgm2gzCydmo2lWsp84OUzNJg9vBZzNdRQ/YaER2VdWie81cxzAkzvTVy+zwj4NGnIvAbPM4KteB2MbDkq/IAyzh1+QNqqrYk4gMwc/JOaQZROwgsjA23T3jtUb9f9odw3JCM53RaYWqpaixPLK8F7NYOuOWQRY3VhA7cqQpOz0+FlmiNNot1QUTO7+W8VNhy91t/sdnVJuk9cRF94kWjXJxhwVT34CB75iDOQqDGNELh39IIwRWHsC9YA8yNog/dkydabOPUAfMaBXO7XQzhRsMd5aaliuhf6STAw0taYK+vzFaLjaC5lzdPUhwX8dzV7rr9lipRUV1GeafTcE+XVKXmWZfBcCtGPIRmW085xjFkVC3olj/tJR+RQsIwZs/cRyIuos9Mq0VHt3yZp7PDJ+QgXD9AT3S9EzKfNP2dL/6yal+xit8jKJ0xTVjvBQcV4wt5MEpZieexNYe3AVROdwBQjj7no2vdHFtnm+9+EPDyJv+Vcj1EBV+MYV+v8J47p6MxxuWXaR8FYzf3bDZQDxnZZDCwCk7XoFoJHkbtQ7Ult8XQziFGOEMib18x54U4KnjfJbYnT+Xv7C/0kePCFeBH/pOZKjoCEYyRY0zOsw7xTSmK/vV3DJRFUWdlwJavqhkKA0vGSv6IckFh/PHbLktz2HHq+LIgrpZLgo9VlLkJy8gJqgUrplGs2Ja5BGsHzQ1AQQHzhAh9xretD0+Q2OsF8UsPpzQcM04S4GBMwA+a1ITzIlfvRC8O6Q49GxAw13PtCnPYtVkdgJXfYHRRkg8YrRY4pCVPI5cjnooOk8rsL3X2bzTE9PNv2qzUlLDq3TVGUEIDSX0vdjldvQq4LVJPZr5fKM4to+QulTMd//G6jHNDuWjN/w+FW+nYvNDTJZD9rlGw8MaiyKBaBed+yxeAmp0p8jrT1OiS7b0YmGGb7PFmr2rVwtmUKsfZLiyMbguUkprNM+f1I6Uc1AYvlgIiDeyLK4rpFzNUQ411a/HlRPr8UsURae/MS90eejWfe0IZRJcAXOF14hn/3ojID1m7vaACKr1S/orXAQO/ca58Y1meVfBciFLHNjhZIK152PrDhXAD4xLIaAkXhoQSenbM5JZlwGWw1BtfjwYIwTSLnfT3Ch954X4WMGi7lsF6tWB+qAqLhRl3altdpj/nL3mBZiK8fbKwVQ6UJFMcl56pzTjI/5D88zD+pN3UqGgyRc3jAb/xVQ3SyMjSARBfCtlVi1EEr7RIGMOtwuUtEWpRxf3rkiYaz66q7ISpNAv8avVOjIxH5jZcIlC3L+H5Z6dQbWPKC3RRzSAKd+V4VnrYpL/2nQnAqVac4E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c81f18d7-d70a-4601-03ad-08dafab450be X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:38.3439 (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: kYOQmpYg6fhfhmEZbcsEUazZVLUlRmvFQrHvHU6M9eS8icStbM+3RbDkE4oH2e8FOkY3nT+N2uOz22eoykVSTqt5VmUBcbhKF5pkkWFsWdWdX3b43rt2hBBny3qDTQDJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/rt1308-sdw.c | 5 +---- sound/soc/codecs/rt1316-sdw.c | 5 +---- sound/soc/codecs/rt1318-sdw.c | 5 +---- sound/soc/codecs/rt5645.c | 2 +- sound/soc/codecs/rt5665.c | 4 ++-- sound/soc/codecs/rt5668.c | 4 ++-- sound/soc/codecs/rt5682-sdw.c | 5 +---- sound/soc/codecs/rt5682.c | 4 ++-- sound/soc/codecs/rt5682s.c | 4 ++-- sound/soc/codecs/rt700.c | 7 ++----- sound/soc/codecs/rt711-sdca.c | 7 ++----- sound/soc/codecs/rt711.c | 7 ++----- sound/soc/codecs/rt715-sdca.c | 5 +---- sound/soc/codecs/rt715.c | 5 +---- 14 files changed, 21 insertions(+), 48 deletions(-) diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c index ca2790d63b71..45544b530d3d 100644 --- a/sound/soc/codecs/rt1308-sdw.c +++ b/sound/soc/codecs/rt1308-sdw.c @@ -508,10 +508,7 @@ static int rt1308_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } diff --git a/sound/soc/codecs/rt1316-sdw.c b/sound/soc/codecs/rt1316-sdw.c index e6294cc7a995..6dbb59f51426 100644 --- a/sound/soc/codecs/rt1316-sdw.c +++ b/sound/soc/codecs/rt1316-sdw.c @@ -507,10 +507,7 @@ static int rt1316_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } diff --git a/sound/soc/codecs/rt1318-sdw.c b/sound/soc/codecs/rt1318-sdw.c index f85f5ab2c6d0..784147a1004d 100644 --- a/sound/soc/codecs/rt1318-sdw.c +++ b/sound/soc/codecs/rt1318-sdw.c @@ -575,10 +575,7 @@ static int rt1318_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + dai->stream[direction].dma_data = stream; return 0; } diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 620ecbfa4a7a..7c7cbb6362ea 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3157,7 +3157,7 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_inse snd_soc_dapm_force_enable_pin(dapm, "LDO2"); snd_soc_dapm_force_enable_pin(dapm, "Mic Det Power"); snd_soc_dapm_sync(dapm); - if (!dapm->card->instantiated) { + if (!snd_soc_card_is_instantiated(dapm->card)) { /* Power up necessary bits for JD if dapm is not ready yet */ regmap_update_bits(rt5645->regmap, RT5645_PWR_ANLG1, diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 6e66cc218fa8..17afaef85c77 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -1298,7 +1298,7 @@ static void rt5665_jack_detect_handler(struct work_struct *work) usleep_range(10000, 15000); } - while (!rt5665->component->card->instantiated) { + while (!snd_soc_card_is_instantiated(rt5665->component->card)) { pr_debug("%s\n", __func__); usleep_range(10000, 15000); } @@ -4748,7 +4748,7 @@ static void rt5665_calibrate_handler(struct work_struct *work) struct rt5665_priv *rt5665 = container_of(work, struct rt5665_priv, calibrate_work.work); - while (!rt5665->component->card->instantiated) { + while (!snd_soc_card_is_instantiated(rt5665->component->card)) { pr_debug("%s\n", __func__); usleep_range(10000, 15000); } diff --git a/sound/soc/codecs/rt5668.c b/sound/soc/codecs/rt5668.c index beb0951ff680..ecf3b0527dbe 100644 --- a/sound/soc/codecs/rt5668.c +++ b/sound/soc/codecs/rt5668.c @@ -1022,8 +1022,8 @@ static void rt5668_jack_detect_handler(struct work_struct *work) container_of(work, struct rt5668_priv, jack_detect_work.work); int val, btn_type; - if (!rt5668->component || !rt5668->component->card || - !rt5668->component->card->instantiated) { + if (!rt5668->component || + !snd_soc_card_is_instantiated(rt5668->component->card)) { /* card not yet ready, try later */ mod_delayed_work(system_power_efficient_wq, &rt5668->jack_detect_work, msecs_to_jiffies(15)); diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index d8a573dcb771..5f80a5d59b65 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -107,10 +107,7 @@ static int rt5682_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 7e3eb65afe16..f6c798b65c08 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -1094,8 +1094,8 @@ void rt5682_jack_detect_handler(struct work_struct *work) struct snd_soc_dapm_context *dapm; int val, btn_type; - if (!rt5682->component || !rt5682->component->card || - !rt5682->component->card->instantiated) { + if (!rt5682->component || + !snd_soc_card_is_instantiated(rt5682->component->card)) { /* card not yet ready, try later */ mod_delayed_work(system_power_efficient_wq, &rt5682->jack_detect_work, msecs_to_jiffies(15)); diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index f5e5dbc3b0f0..77dc62219bb8 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -834,8 +834,8 @@ static void rt5682s_jack_detect_handler(struct work_struct *work) struct snd_soc_dapm_context *dapm; int val, btn_type; - if (!rt5682s->component || !rt5682s->component->card || - !rt5682s->component->card->instantiated) { + if (!rt5682s->component || + !snd_soc_card_is_instantiated(rt5682s->component->card)) { /* card not yet ready, try later */ mod_delayed_work(system_power_efficient_wq, &rt5682s->jack_detect_work, msecs_to_jiffies(15)); diff --git a/sound/soc/codecs/rt700.c b/sound/soc/codecs/rt700.c index 6534c9b51442..659ce26e9f3b 100644 --- a/sound/soc/codecs/rt700.c +++ b/sound/soc/codecs/rt700.c @@ -163,7 +163,7 @@ static void rt700_jack_detect_handler(struct work_struct *work) if (!rt700->hs_jack) return; - if (!rt700->component->card || !rt700->component->card->instantiated) + if (!snd_soc_card_is_instantiated(rt700->component->card)) return; reg = RT700_VERB_GET_PIN_SENSE | RT700_HP_OUT; @@ -887,10 +887,7 @@ static int rt700_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } diff --git a/sound/soc/codecs/rt711-sdca.c b/sound/soc/codecs/rt711-sdca.c index 7cdf184d380b..c65abe812a4c 100644 --- a/sound/soc/codecs/rt711-sdca.c +++ b/sound/soc/codecs/rt711-sdca.c @@ -295,7 +295,7 @@ static void rt711_sdca_jack_detect_handler(struct work_struct *work) if (!rt711->hs_jack) return; - if (!rt711->component->card || !rt711->component->card->instantiated) + if (!snd_soc_card_is_instantiated(rt711->component->card)) return; /* SDW_SCP_SDCA_INT_SDCA_0 is used for jack detection */ @@ -1249,10 +1249,7 @@ static int rt711_sdca_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } diff --git a/sound/soc/codecs/rt711.c b/sound/soc/codecs/rt711.c index 78e1da9b0738..862f50950565 100644 --- a/sound/soc/codecs/rt711.c +++ b/sound/soc/codecs/rt711.c @@ -243,7 +243,7 @@ static void rt711_jack_detect_handler(struct work_struct *work) if (!rt711->hs_jack) return; - if (!rt711->component->card || !rt711->component->card->instantiated) + if (!snd_soc_card_is_instantiated(rt711->component->card)) return; if (pm_runtime_status_suspended(rt711->slave->dev.parent)) { @@ -976,10 +976,7 @@ static int rt711_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c index 1fca7a3f46ea..920510365fd7 100644 --- a/sound/soc/codecs/rt715-sdca.c +++ b/sound/soc/codecs/rt715-sdca.c @@ -793,10 +793,7 @@ static int rt715_sdca_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index 1a2036ccfbac..c6dd9df7be45 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -777,10 +777,7 @@ static int rt715_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } From patchwork Fri Jan 20 07:02:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109289 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 E61A3C05027 for ; Fri, 20 Jan 2023 07:05:26 +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 EC2D72DCA; Fri, 20 Jan 2023 08:04:34 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EC2D72DCA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198325; bh=vsculmxc1hx+N+BUkp7cdH3YTKpGnSwK8BQpqfswg1I=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=MCrDqoW+bS16REqR/CFJ4sVbBqeGT/yfM5/s6GduXm1+MPv/1mWGyrgyW8cGGntoh M+TcAD6Q+jzJWj8E9R13o2I/8kLk5zXo0fUStwc11vxciLsN793fX7HwyIDidCRrpN eNayTkwKYLzGWR9AXoraT+Q8q7teCfcrD4QDbJSI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5CD7FF8059F; Fri, 20 Jan 2023 08:02:53 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E3B39F805AC; Fri, 20 Jan 2023 08:02:51 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2114.outbound.protection.outlook.com [40.107.114.114]) (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 0CC1EF805AA for ; Fri, 20 Jan 2023 08:02:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0CC1EF805AA 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=OZa/pZ0L ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rz4a/iF1qsqgiTjfNtXLlKksMrlWqK5hlECqDpdmpMUr18GPANn6imt9PzOKG57tgd5rTVs/A4evOva1tTxnfF1O/Q0t+MOnLc0s3X2by/HL/ouwyfBR+QAi6Ki2h+Rb4TLw8U/OJW8ZjSjc5by3T+yqWMCRV9XlvfrkXP0JIy3KYYp/vnqmhPdcdoWt0kKYRg8QrJ5DaZJleF/j9EsYFFJrIkioqBEolgYyG9bZWgyc4dqmN8E0B+QjT2bee+/daMgotCVG65aYURVjG7Or8DDnIWQT8an4j/Gfwi3sbkTf7oKjidBCJcHwvtCusyC5CvNiTnkNWsEO19HPma83TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=KOk8g/8a41/vqaOtTcIV6Zv9DYWHXY+9CUH4m49GtDs=; b=Sf4+stKZq3zSHF9SCyGlfeJ2eksCeW3CGCcqMxSEymvxBPHy8duQd5IWov4CfpHn3kCfH1pVJMgYz0slpFmSZFn/4cfilwbDcg0/4OBhNih0mlKi8NUdxc5+oHsxtkWP19cdUiX0ooY4aURiB7Jcm3Y100dU3s7RGMUr0+lY9RScnIP6sr4s+Xie3zc6fCGdT/5fcllHY6zVzP+51mHHthevQuzPb5gcXn1rZAGnAoEftZkM/t+ixCcvOPIvz6I9QG89YTxHs/0h2n0j5SDxhQxYaK7+N6UfMZKjhKSrZI0aocmmbqkCH4ODRaKUIJ4J+4p+Ir3LtpZoC6VrVF0ELw== 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=KOk8g/8a41/vqaOtTcIV6Zv9DYWHXY+9CUH4m49GtDs=; b=OZa/pZ0LbjjO5H4n6PKEdJh01uBhJKiD0hVw5F4Y9IPMa4qq5kk4ZJQOsjSgXDRuXIoIZvXAV5HTZodiZMh9MWMb9wC8agIM6wTufWkMVmynn8zd/PR8daSpHRs714u5ktJ/GE1/nmZCS1BtcEh3GlLY5xam2b5hmiO2dsusghM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:43 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:43 +0000 Message-ID: <87v8l1k7sd.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 10/25] ASoC: cirrus: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:43 +0000 X-ClientProxiedBy: TYCPR01CA0048.jpnprd01.prod.outlook.com (2603:1096:405:1::36) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: ed91e701-bfde-4945-54a2-08dafab453be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SsfpfBsJOHGKSvZ5HQmDzQ+WdxEtl5WSFdaTjp1aB2qp9+p1TRPYGdhmGwBZH/dKttPb70g2bSVv77TsyGPmj9qL5iU7kYycfgwkXnrS9mcLj2z/+dfJStlJaUIW5gmJ5ocbtA7lll/nBNtUxnXUz4IMpWr3XmAQj5VzMLZc0tQp9p1jliUebgCjnzOvBUzTF7X4XlNEaBdal1/dVwY7YyH166PsQiOaucCXqFH2yh60Gwgb6DCU/dyyM4v6+f/UledtUJz47yqzqmhcZNmJzWSScUk0LFudxLnL4DiiqPFcTlYTFfGiVrSVsUxqlvPt9k5yAxF7ZeHQkmFkkY578RtlJH7mMzk9KUbr9Mu49dBv3qnRxWyHeOCQ8gkLilqSfNt4MhZcfiepr2VT9ZJ7bQLVozv6l/fj12YJ8QJdgmVURJXn/RnoEle6l3yuT/Omn6hVTW+O8bR6v+F7lERJJp3c+DKKT65ZJJeh0cNeUZtdpvNOxd0UifEIDmKEeu/7ldZuQSCtvaMLHf3JVU8xdTUNcL3EphAZSG5L9T7Pw8Wzcjn/+m6foVRQvFofmGSlklrJy2F13bgZloVItXrG0ZiM1vQNAxGkR1Wfy468s7kTJ2WeuPy0D9MC3ffPRBWmtKhT0sv0b5n1KysgtzxiYhV78Oxt5bfklpEBm+7d+U6d5mvA2qI2d/NcR3wC/AHbhO/TbKNmTkv47AfPWLGgyw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0prfa0x8W4X0WcaISmJgQszWcZwbm5rbq53FAOel/1AHy5YENPoYBXRd7FQCg/X4csMVi3LLccDM8LrM/hzvPUnrteAwQpIpiWiahMd4DR5otYzxXcb97CscAs/1A22H2CvhwZi5By+m7z21wtaCo1iahm7I7CA877AyZnsyVgwdEEgI1lg0Hts5I8ueQKMbxOZbt+QuCXvYIhSkMBKy536n3OBoyhUQ55FE0y1VgFdv1Axer7XTy8Ja4QWO6OdmJzIzCBK7z6wVG5m+ylygBE4UkGL78XZU6JvMQpidCPJUv9fn/UfgRl7wb8fOESJPivosqHOZcr0awEFOKbN3YJGor2BRp8xvA+eRkwiAsmC7n3euShP9+I1JZj7y3L6n4K7T4G9NvfJsga7bYnjf5tVRwCpkJ625fBtfOZ8D9rjuBk8XsOJV/nGdtc21LoV9fkIlyiCZ/kQjiQHMY++6wmv8qufVPOGYWFuuFe5aoYYN5UNSjZnANP/rsZVgOd3cnwA/Ds+u16liPO/zJ0Twpynx7ZBGjYjKefuxihUE24J+B1kb59Z/QfrzGqm/NWaa1PLylfnd23EckKEL5UbkIPArRG4jUS6af3VhiNHZAWKBMhzpmi6SOYxZqthuzO89eZ0V0jqzW7eIIR4jthGkNNjE9X0uS1FTXLZ1d1f1NW3/Ezlm2dkmE032ru5gWTRuxDTwu1ggEFjEUIrGZxi4eNdWomaUh0pFRI7MWjDZKd4gbvb/P+FehRZ4U6Pl3sX0a7jxjPXVfGhsFfiGi1aFLuaMavlsvhkZ7pcNw4dD9qTnS81iq7YgJlONMZrQp7KL4OecBPt4ZL1mXzdAu//lYEc/vxzbmgOX5aWNRHr5KctI2yXXgZieWxaFULHcCgSepbnRBELq9GQWCCA6Gymi/nJDlX8jEFN7ixHqaPyqhdGRe3SCoKBdx3AAoyRAi11TAuIHHeObsKE+Zo5BFhfpuMIQeBcNdR3NvEXNcFAOEeS7oaqsq0ECsqJBrZGlFmGg8sb8Vlg7+uaIoB+pZrBh05DQcqHyF2FreFiYRzKMipPhy/8AA8Af60xT3DX6QMFKjbVKlZYgdLO6b8JEk3wNG0QamPLnmsJhQfpNyQ4DtNRN1R+2GCXQLg3ImUvASwxTDlLb3UclrITLB7HrSMtdNaiLgcWx5xu3YlKb2cDa/En231MfX7+MRWFMKtgEJFG9af5rk9gMGePLJNduS7L9zOw753YvJYtb3FlBigQzkkmJlXMOoYGpNxWw17NYllmtpkJtVQLXsUYeDgyYYQUDRJlQbh2juudwI8hcPkrE1Df6AtXMJ5jz++4s7Qbv3H1n+nANbnVhWvJZDWJ5SZnnFsQobhid4AOqwvM8y5NaSLF0Qr9Gwfo1EbRO66TeLZZS6QfN4aemU9P2gJctJEYPmw9BRoiDJQ8RIbtrkKRZNVanslYQMwQo6Edo7x2LJT/oZelPd/ApSMh9wTJVlMYbukqcUzjZWaU4+sjOLpMfkVq3NMvoPYNHztCrn/2J+9jo0i8a2SnfgK+oMM1yGSAC6Lz0RM085tTPkuyAni88grEg6AzpKyWBGhQKE6HdV4LWs1rgVNp67sl1RmzuI71OAzue1SMgUkgzXPET+3f4fOs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed91e701-bfde-4945-54a2-08dafab453be X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:43.4260 (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: kjACvbuOBEq9Z2ZiAofAdSVfCBE15ueGrE4FMNM0X0xbqyj3oel+2VPRINylVPy4SFINhzqrF/j7v0PFjHsJBpR4bjiXwnC29BeWXvQevbk4pFfA0Nz23gx9CgmSAm6r X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/cirrus/ep93xx-ac97.c | 4 ++-- sound/soc/cirrus/ep93xx-i2s.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index 37593abe6053..cec067c91a0f 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -323,8 +323,8 @@ static int ep93xx_ac97_dai_probe(struct snd_soc_dai *dai) info->dma_params_tx.filter_data = &ep93xx_ac97_pcm_out; info->dma_params_rx.filter_data = &ep93xx_ac97_pcm_in; - dai->playback_dma_data = &info->dma_params_tx; - dai->capture_dma_data = &info->dma_params_rx; + snd_soc_dai_init_dma_data(dai, &info->dma_params_tx, + &info->dma_params_rx); return 0; } diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 982151330c89..8265173a7932 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -202,8 +202,8 @@ static int ep93xx_i2s_dai_probe(struct snd_soc_dai *dai) info->dma_params_rx.filter_data = &ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_CAPTURE]; - dai->playback_dma_data = &info->dma_params_tx; - dai->capture_dma_data = &info->dma_params_rx; + snd_soc_dai_init_dma_data(dai, &info->dma_params_tx, + &info->dma_params_rx); return 0; } From patchwork Fri Jan 20 07:02:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109290 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 BC5F9C25B4E for ; Fri, 20 Jan 2023 07:05:39 +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 680232DE5; Fri, 20 Jan 2023 08:04:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 680232DE5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198337; bh=uLwrBroZGudU/DKs+m6vh/yUYrxbeEoAeBSkDh039lA=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=cG9MK33aMmtMkZUJimK6/tqJ8mFB4vtb0VKiVRNByC2/YdJqhJ+JCjDmhQDwF3XqW zlxgq75SB/DubTGD9Cu0ks+SLza+9a9H2lsSh5RkJ0ZbfwObjxP+TlyC53UHXS5K+S WqrAyCOKVh+0X51c6+28wBtph4yY4SLFm+7XpHNI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2F1F9F805AB; Fri, 20 Jan 2023 08:02:55 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C232CF80524; Fri, 20 Jan 2023 08:02:53 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2114.outbound.protection.outlook.com [40.107.114.114]) (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 6E43DF80524 for ; Fri, 20 Jan 2023 08:02:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6E43DF80524 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=nkkerXk6 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M3TAx0eGoTOTGDhu8q8iMP0KaSpg+wA1lQIZ33b1hIxvUvCrgR58azh+qEcw3j7uncAu9HqIY9MEdgpsiqo27z2Adg3kFp+kD5nqVX77XuUj/NCXzQlsjzvxw3Q/uF0U4iCGuLYQ2okN0mLNG/JLREC+gWvaLl5cDLcmntIBnOjv9itAtHQeXiSx3epYL4PdSgynbSUx1IlcsPO+TNhhN6n+HzM6JPWBMG7w8JuHCRWxK7yNxGspfkZeSxX+G/rjLrQfgDZ7A/gHCq4/QxEqWzSBehtpUyp5paC85m9I6DAe2a23P6qVzxhQce69BM7LB8n/rqY7IGl9lFs+sbgXMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Y02LuwpzK+tWz3XOhLsWzhp30164SfSO7lnXaEf0RWE=; b=dsERBl4DGrPvARus9I/go9z9FlWQWtaZ5uAnSNVNoZvZFt/FRktdGI7vpbpyh9qe8oy1OMN8MGiC+1pdzmdNl0T6uQq94q5GhmnfV9HFfl9aSfRXEZ+ezSLWYrAL6IJYNhOvBx40QHz2q9O0qRO5BSZ8vEjWMZEDHLAqrK/l+CQc1AS3strfwS7VdWWYIjGLABXwyYnaAF+OryegNIbndo7+joElRmL2euhnDLLoWp78krJhojqpH4gEX2meK1gk2b2UoWiUJhR0j8EE3FTvXJqERoAh7+TQi+5uoKsO8ZBTT41rzqNaQoG5RCXEobcthYeiSbvMiVXtZD5m2y7Kyg== 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=Y02LuwpzK+tWz3XOhLsWzhp30164SfSO7lnXaEf0RWE=; b=nkkerXk64lPpBlQ5hfyoQ2/DojGi/kc97R2azt8ndEzgibmThgYJSvmbVEl4ljeLaI0ljQD6KMrGrdhRvvNsP7PRkA2AMkHsBThXPSlQh0FQytB5TiMYrwOXvKZN2aV8pbDX5fuk4Z/zVzg2Gm6X8fWRGW9Cq9vdwSL/yaaZEY4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:49 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:48 +0000 Message-ID: <87tu0lk7s7.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 11/25] ASoC: spear: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:48 +0000 X-ClientProxiedBy: TYCPR01CA0092.jpnprd01.prod.outlook.com (2603:1096:405:3::32) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: 891176b5-4de0-4dc0-2c02-08dafab45703 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 89Goi2067C6p7NS/uY6UcV4tzT7ulZNDexpaYEI4UK28XHFUmapXuSecpbdrk+4+PHOKlS8vYPxqukA6BbkUT4VdX15oAKY+9+ZTPj93isF0azfiG36C/27WZZM4ivsU90Erd4hQRhN4gMkz88XTW6LhX7kIeoe4rl3qZnB8YROpFgTcQV2vZaTOIZ+ToCn43qQmzaW4iLzo0XUPBahOhdXCT8n3xH7mczlSdeAIUal/z3AETzLtYbeqqGCH2z57hmAD50bBNJoRrc8QhWZycetXP7WHEG6BgyGkh6B312c1oyiLUxvjPHruhF4oBQMmR7pilXSm/6O1SXfeZm/+SAdCbTRtnhDbieBG51ldLSEthnLq2eBrmwTT3CfRpb2oJKFlr+OlRVyxiPMtqZ5wUmm0Obw9/Wg+CqMTQopIXAfazb/R72m91bOf+hKCyxpxAw3BLWf1ZkGZhbcGOPwmkCCjc1oOTvPX/mVIYQZeGw6VfvyzCs4jXGybcs3X293epXcNdEX4OqqcSAmJKaMTvbZS3XlXks5IBRonIvMnxpM189iym++691sBjJLPUHKlcapp3liFWdF7D2LLVcZa6hE+wTd10iroGj4VVQetxYlDK35DOvrUGatcVq+m/PpvpFwc+5mhXcpMIgAnvN8HAGR8wURW9zZhgeR8B41A5yR5kv7nKOKQM6Y4vfZVJ87rVXlwXymXHJpOlyg0PpR/ew== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(4744005)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4GAnWaNy5Ybh2j6q0rtmNLM9gbhU0FOSbfQb61XeoNXpy93ekbQCKEL6MBYGT0yx5GyV1NLodrIZVho9VBWkOpW4CTc3pCPz4dDRS1yVVGUGcZa0OD9odgJnd1SVKrLIYqptWicZX+a1Wvreb4JRdfL1wX/B3GYmybBFZ2irzcF0wZR9An4pMXpfP7vvLheoLWAx3VNjuCKw89R1TMfsnBetbdgnqZZ43jy4kKNMnnVzMNysQyDOj9hlXj6gsYgUBWvW+1ihpmW0p38O6ZYORa6Asariu1M0yn8w5CeKhFp0L5Nf2hb/JmzCWQscdu6eKPTcto3jtlclvmrSn7M221tLLx/IA7YXZ38eGFf+AckRVg+P9F60NKFogAsszyID26A6ptNeEd1DVIcIvbdSN1lTvpkQWP6YWoS1GmlAYgKhH6RwuNi3iiLhjt3dOvdlTzomYOADNPk6KKDcQ1ltEq89wCkBqyVuCi9YWDMsdMFTVYkEKFs97y9pOdqBka0UNvXiI/Ny+2IPfk4Nk3BcfjsFKe+eqKruRYBPU2QiZ2ujh9na7GtE59JBfl54vnE+5LKhe+FWDCQd7kF/xpiuD44AgCqS4nZO50D3/OtC6ah5lN+GwOy/saIl+vQMFU8WsoiFI5QNOtLhH5fh4lEDc0PSk5536KQVS9sS+xbuNf6hjxOmVmH1IYf0k6nQLY2C8eCWnJyLdJojIGJEbKAAd26zBb3FyF3aZz8nnO9uI0MC7NiRDnbvYw1zmSUhtmYN5gP326hJ0cnlT859kDLPmjvdUz1bsth5nP0/0xkLrbyYYYcQ8E79xU6WAx43ekA4x4Fsk5vaZMnqGZuQRSljnEzNQuetdjgyFvSuCNoKFaul1D/GMIPG7a+KkOQVPuZ3ms6ZCP2blnYngLxf4MzZudKFDGMB8DL5I9jbABTdSKLyp5Vszgtq/AKJSHGkSOnuUJyedYUZd+fm6tQVdcSKyvPxFV2mFYLugf32iBIgbaSFVq3RxqjuZASC0LoHO001xusf6EZnocrWEab7yKCu9ezTzGMzn9wkFHAZTZVOSI5rmN97DTjYFpO6RtsXjD772Xc7XoFstsaz7vP77ZQvUr6ekjR8whZU+N1LW2iHsuzgsC1o94nAjRA7GlCFMyck35o+UvEmn0pR8QBiu+u/2906z9iI09PIxDZu6lQMleGCqDefaKborfT8luXOD+o/nY4AA/hKKRASC+APoFwEV1OHzubKhwjI450ozpDxrYWqjlEHJ1RjwHB3sqFye0OgA3zX5tEZu3b5EJPQcFOK+qRt4FT4eNnel0mAHxEEfivpShq/yHn81Nu44up14sl43kPRgpMvbv69We96b9rKe+B3jJDCGqIJyYgGtHwQSbv1TQUL7bJIW8R73VtwOc7qMWYKlcshz+DXHPAEEFhocPWGluI8JAmoSifvec8fHbwP7i/ra+EXJYAqqufWb8sASzLEhbCmGGFAcn5TWV6xV1UhBmi1I4bWeWOqWrD8shqd6hloyGSNe5+jeEK9ZVOTRrGOKen+ddxImaNwOTDWZVvKqjIpzEfyHrR275LtQJie3EwT1z0uG1KRYyz4RTONFuCSaNxHo70aNhiKbhRhezkyqRZi423sElVwb1LUwio= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 891176b5-4de0-4dc0-2c02-08dafab45703 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:48.9106 (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: yS8zf6NrZ7hefm3Uzvbc9PVcurMMrppoEbOtR27LYtkq4oXpdllWdRxPr1ut4mxGCK6anpfQU//+91uq4l/o4l1Atmp5vn0zbKjsuNhvUb9HMN5MGjGGrUVwvGfjMW2g X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/spear/spdif_out.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index fb107c5790ad..469373d1bb41 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -244,7 +244,8 @@ static int spdif_soc_dai_probe(struct snd_soc_dai *dai) struct spdif_out_dev *host = snd_soc_dai_get_drvdata(dai); host->dma_params_tx.filter_data = &host->dma_params; - dai->playback_dma_data = &host->dma_params_tx; + + snd_soc_dai_dma_data_set_playback(dai, &host->dma_params_tx); return snd_soc_add_dai_controls(dai, spdif_out_controls, ARRAY_SIZE(spdif_out_controls)); From patchwork Fri Jan 20 07:02:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109291 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 95248C25B4E for ; Fri, 20 Jan 2023 07:05:53 +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 B6BE52DE4; Fri, 20 Jan 2023 08:05:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B6BE52DE4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198351; bh=rC6vpG1Ta9mnRrdRF74hBeGJBtsTTlZH2sKayhKRNb0=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=rBlMJx4vycZHnZxPWAiaCQ347NwNoEOmbMeAv8ZIWf03N0LGz/H8X2BMAPej2LS/S DAHxzSy0P3QU7n96HWxspfwq76NRiEqnOI79fNKScXDm2NS/NM1lxOsGCZ+wis26N8 qZQDWoAjxnAGt9xdhxyVWOChL0SxjXQSate2BV2I= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D187CF80551; Fri, 20 Jan 2023 08:03:03 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 049B2F805AD; Fri, 20 Jan 2023 08:03:01 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2112.outbound.protection.outlook.com [40.107.114.112]) (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 7CB3BF8024D for ; Fri, 20 Jan 2023 08:02:59 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7CB3BF8024D 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=oAfYVp+n ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=grGFqtqx/AqzULCUapLH4BgCJ7++TODvER74GDuAntxRuVGt6FyvoSQhGqu9tFCpBOossgb2aFe63GjxRo7eWa/03sgN5+/JwMtFNOMubPB/r0qSc9oX/4rl8K0nXtqsbzvJeGHWp0SHq6/L2Vjny5PcpnKdp/NdqYQOX8h6Kq+KfMkWhyiUuIinWoxloTAxittsmTA6a0srLLsOfARFkRPC6nsi0C1kgJ3lf5cEvjnWLAVrXP+VoixWKn7gSh9NxYeyasDtV7I2BMYPkuoBpwF/xypqC6XVLguMra9XV7LIrnOsM9aQ1ogZNq6qkx1GvnDIi4FYSLkdmgYJiJJkbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=M2CsvswnVRA/ZNYiMOCeNyvKVtXWrxiY4lp1NA2px+0=; b=RKt8p+5G78Y4OuL64PSHwNYhR5CXn8/w2HNqM0D+tLAg2oXIHL0rzrcRwHFbyYgHRGaiOPCULticueOxuIfppuzufWIrLo8GbjCb7rD6VCMSZyRHP6hPZMtZl8GnEOJ40huBFqncXjJZVaKSQwH21jJEfUMiI6dr2PHgNlZ+H2AZPb3Eu01uWDXnc24rJ9UzYBV4qXo4pktDiStal0H9u/v/vMClrJpWjoxsQ6Lq1ZHsPcInp0Fg3A0jJYaQ6odWU8o89S3jCPCYaSBkGiT3m3/LVY4vsokbDZ8NqTr9CDCjq3SXcRNNK5yz/T3rpE+9zKg0tbRm8lFqKL4RFyaSPQ== 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=M2CsvswnVRA/ZNYiMOCeNyvKVtXWrxiY4lp1NA2px+0=; b=oAfYVp+nAl1gAWzPpH8xVdBLDtuetVK2tHGjm2Wva72MWQ67COfoKQEiAv18FAQEV5o2rMRtz5eURg0x4i2Z3SiEMSm6rDON/D4SB6Q3vqPJqgZYIPpID9Cv/jsjUjyCg8ltQjdJ2R9fNINzXIo2YTKhyZhul3BzXEjYKX9jFww= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:54 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:54 +0000 Message-ID: <87sfg5k7s2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 12/25] ASoC: sdw-mockup: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:53 +0000 X-ClientProxiedBy: TY2PR02CA0034.apcprd02.prod.outlook.com (2603:1096:404:a6::22) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: 86ae66ad-e5a4-4fd5-c92d-08dafab45a37 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MBQGEK84jWsQJIfhn1TNXLpj7spe1vTli1h/9HTD6BLUlbHstD16wF+PGlZJ3xwR+25Te8iz3jyqD2MuK48q25yghHMLS2kun/ckZwH23KZlAVuW9jkrfGmz9g9IePudEkbOj7PmKvV5ONmGbHjbz1lAhSmDNEliko5xsMzamM50iFInVuPXGXJ1XTf7zdBrgRtT3as69Oc734+RA0v0JDvk1xyqwdK0HnNDTZ8PJKBUVeNv21vjU8iJSX+UASI2I+gEUscLawr8nSaWIcVATwMU2KKwGRdiLlF8XIyRl7uCKESuj2P+pBBbcbRDYA5UmXbps6BMg/4ViuAQxhw5ySpkjxLV7o/zXtS27YMtrGBTf+12TxP+h4JzmJ1Su3fDPCAHjfqTG9TQw/Gi+S9wHm10PrusF++DHHRCYksIAyXgoVpf+3zGlpxOnGZMcSDAw8s9GwB9LX4RXnfC1H3DNeq7CVYhAeQHyF/UO56+uFnM92LVWVEboPN7UnOn8nFIgF6Gf0QWRzB+Zl2FOxLufgjXFeknRIBBzC5bmUwIdFevlO61RTbCRAArG6Ccnln1QhDm3TR0ok6xtaDhu3e4t8GV5ClDfdcI4lobfFIsiNlnufLdn6TZ2ST8hR+SJTc5NDS5toUxNo94snccMnvGiDIuqF5NnCfs3QyIzda4vrl7IGMPudeaQcQ/gYA4ozsZTkcKKIX1V33S9lfPXuAa+A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(4744005)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n3PFDsoBuqDmSaXvNRSgXf68c/2/FZUvdqNiEwAGUGWuP4r7664F/iWyfz6YmK+0BNWVATgGTV++lu/fRLjQZhctJUsdZT3lTMUdfybt4UUWcRz0qfmMbq2SFIX/BC7G4WUiXk15f4kzEQdEHw30e/xnGY9glWOM4N+Dd1HpXWJtxh5T1C2hNLlkpZR1irSxpnnc3CQHbFSsY/sRW6dje55m9IJ0uuSOdTWDA2oDMgwKuPEJ7fb0JF9w7dQIu7QEOU3SS52As6vLLikBQxHA+CV5CH0DqonwfNDD+eflOS3RgKpKsqoYg+CIkzegxT7dKnlUat0HmTDmkNY79ahN633UKBGewFTA8yyn9YEw/e5G0B1qNIkaOlVBLPMxOmq6NqZHkk/inEAToTfU+c0i4RWPd1sCIOsrx+xvVh7gMv7dNrVl5L8Fyw/5KkO1QOOXNE3xHmKpvMyKr2Q57NNmtDWZvKneAnEnhRZjiY0D4eRwc1Ma0cEV45wdzTgmFa6EXFRa36Wnrsn4TUmRrftwSErklxjwQVwTi38Cy/WHjBK/DQXEwLxL+fkeok5lYAo/o7owLq80IXszJPIMkoI+PhNX81Y1fom+iTjMYbuAZD2JOFcbQII0mgfbXoDvgMGUVR0s9tnJoHcWk95RMl05Sa/Y6rkLTWsEmRlMQtXiA5QEQHtFIkvDrDnePk+loXaPONUI7Zy6jGwz010DjSmfw1k0oV80Kyr5Ek7CtCcBiURzZCecF0vorah04ZfugKfHrqf/6BV+5Wr6PLTjdsYisPFPpriBnblIsAm1/E1bouKWaiXBsaceSJsbgTa3xVDu2qNXSdB6sbi44+jKdSiSrWWQj0k3yPsHsd4xr+OTx1hZmnMRc3m02vY7C7jTuR4OA5JH1JRPPnbAsXCguC7ZCvFtJs4fwrt0jvMqGjc9kj5S9NWzvgYUXv+21BhKRpZfo0O8YPInYmTNMuKRDXypp1yZCXyCMd1C6aIw2tvMfB0Qvu3aYEbDEgVLs7y0M0IZo2Vc0DRxYUbW+Dwua4GOikTjHP8caDfZEs1V2PWkSXdAsaJGYy4WsL09IeeQs0zuUtN+Zar5f6n0vs94FDVuFJrzBmWhszH9lGQPkY84DLtWvh9eoCj9f7DlY1rx+mryHGCL7hU6MyV44AQTex6zi/hcxCxE5hduBNLJ7F1Y9D/XIw5oVSnCs7RQYpAjxZhK5c9S2PUYI20KhwA6ZV+3Z/kOrw3tqOg3VjOTPyybVBeNB17Qq9Kpn4Wc1AnQLE/H/rHjDdSrDTan+mabWdY48u/ULquxHjMRMLChSeDiugE0NMc29ZOSS8Po6n4bsKB2kX4KXK4B5om5Ayv0G4g0tc7pLf2wVQwHJjkpvE0SUSks46UY5CMZA1LqOrx9rYDoaAq7kAyAEN7S4xTtdJoOUDMY5DrHneKtIYwo6yMVgVwKVDoxgMaCaf15Mvuxdbb8ohpuNY+8IwYv4dBdxE6LHnYj+8ZJaP4qhEyNlM7agY6u4nlxej7Trewd7rigozGBuZo7NqehvPRJSKvgs7ZVEwmWUOysIb67Im0+uXDfRTHgf0Z2jc1WGk/LVfFDC/tGmuXLbtZlOH9/dc+hWYhjaiBUDdvEdLA7o/Sodg959rk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86ae66ad-e5a4-4fd5-c92d-08dafab45a37 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:54.6008 (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: 3TQuxIyHt6azwcVaiHuAcQyIVjRXups76HLFl4uFVXcotaQ+p8WmyNLXK4sQGX3GfmLWpiHDlgScMiAfzqTnRX1ymLF+2WMCvuRkLYTS3BGEqze1+M52x2LFZS6eszEw X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/sdw-mockup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/codecs/sdw-mockup.c b/sound/soc/codecs/sdw-mockup.c index af52f2728854..62b02d764f09 100644 --- a/sound/soc/codecs/sdw-mockup.c +++ b/sound/soc/codecs/sdw-mockup.c @@ -57,10 +57,7 @@ static int sdw_mockup_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } From patchwork Fri Jan 20 07:02:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109292 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 D1173C05027 for ; Fri, 20 Jan 2023 07:06:18 +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 75CFA2E02; Fri, 20 Jan 2023 08:05:26 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 75CFA2E02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198376; bh=Bg2LPm52+XPGpxmgJh3ByPosVHOefwffyTmRc6M6ISw=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=nfuSL3Hrl5Ijj5jpKHCQM3wufzstpPbf59lXbZ9qxglAlh1Pc91BGV0ThG8i/bilu deIHVdl08cEMzQQQUfZjXDAnlGs6JEO55deeVMYcU6pqH9T6YuArzNQ7k3T0qvuRP6 Jb7QNXUj025/dqs827ZKJvTutSuEJl/xAwVSczjQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 22292F805B3; Fri, 20 Jan 2023 08:03:06 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4765AF805B4; Fri, 20 Jan 2023 08:03:05 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2112.outbound.protection.outlook.com [40.107.114.112]) (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 923DDF8053D for ; Fri, 20 Jan 2023 08:03:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 923DDF8053D 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=G0PPIsnf ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ePq6VlqzfwmyfMrAtYo8rPpk0BhGb6IpD+OBDRF2c6y8tYBnSQASprszzVHKkT8zQ7fHk/H2BIzNX8JMR49Vz6kffX6WlSO7o0r27d8YtDA4rwcHtUJhiishdXHsrd5qt/73JU9Q+LNrkVTYLclhow/eQsThR34UZ2rafLRi22xYnJm5K+3UdrMwSUd+TN/REp84kEXlKRoWZr82BjEMssicynfmT+VM2lMRBR8IuvVkU6qThR+lHZOp91NvVZxil6PxaugRkFKl7VPoGLpZYAAlSXF8zWzIFx9uXj+Ej3DZXgrrKYqfSo2TB6wsoxdcq5jCt9EQK9YRjPlQzBEZsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=MQx4HoPoGL52/Kny/7aFTOIX0PAowcD2ccoCXKWB1IQ=; b=W/2bu5n8VqKlB7oIo8IqU0eUlokGJu7w170t4jLv80bIp2GxKa5BOrSUU0noHuvgLVqEy3laEzaw4F78yP+LuWyDMclYpt+vovf5SYGaERp4YTUREAHifDsWlJRTXiva8DDoAyBd2oysDrrEAIXz16gf0BKKFDQRrbblWSBgRujgRU3GnJMYd8qLgjfQa5uSWCrJpvMEfqtsPNEnW1S4IZVmE+fzUpIPZzDDINVW2lD2fn21cAmibG48871xQetOcQuPSrD/Xmnepe9HYZ9PEXmFDL+Ij/3uOJ8HZ/3NijKFlbttIqXswLFP30YVFzuO5vi/UiQpZB1RVH8nz4hgIw== 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=MQx4HoPoGL52/Kny/7aFTOIX0PAowcD2ccoCXKWB1IQ=; b=G0PPIsnfh0vUKrvalWx7zrl7Z4V0d+EbR1hD6kElVBS1NqJ29SM3Z95AYCDyUsOE2MibQxUBgykm+QUc2BUmfuFEFxjHKrfMLuoDUjapsITY0KLOWqYUTCx3+/rX4fntDPhScbugGXJUzOHV0hmtSvlBOypgxqT3RRsTSjBTYTY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:02:59 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:02:59 +0000 Message-ID: <87r0vpk7rx.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 13/25] ASoC: intel: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:02:59 +0000 X-ClientProxiedBy: TYCP286CA0134.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::16) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: af971900-8447-4450-e52c-08dafab45d51 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dliPZlnsvpBqWvyTguPpI2Bi+Aw/hHX+3yg0ys1yGjwv+gC1mTDgcurM1yKyTqNurA/sg74uXtAxmLwAH/xh6VmdeHVxZ33LaQAvHJD5VHLJucUAX+EJv38YHeciTVEaDLddi8aNI6QvmMvWDg93uPXg4870Xx/DHFCkqozAO6kiFnO2ZErgrj8uLJj9qC0vZ1T/ewj3SpCb71dojRt5VbfXvp9ybEYDq8zUe1vZikPnISLy1cNBWtJ8OFhhDbPk8/YjSTxA3M4NMnHYn14AtG/wndxmINYpm/iSGcY8oNo2PXRVZTIvxdnLLK0AUfaVWZ6vN/a4dAD9xT1lmTJD6P26RmDi/EA3dTKT8ZB1X0BlEXBjHEUukt9T+71E0ExWA0mcR/B8KYW4UrZsu9RfBnzkr0sBC4F7zPDxmXbtd1K+3j3xX9bwS815sxAGwEtqLJuzVgWvu/HdKv6TWaCpP1+CHJYmIBNAgOzHyFMVDlcaGZw1zcLJmmwxX7HGWh4ZCy6lzvu/yqC/39mQPwB+7iPwToGqf1k9buq+vJcGDzRchKmo6tLYonX9LrAkaWXTsPbqgT0ahEMjPtsxLoK/xJyhXbg3tzW9IOQ4Z/0YQfPYvW+oEcGE+eQMVs9GfDakQE4CKnelO6qMlk3H95zveTpqYd1BgfVxcUB0LV5v4uUtYd4cPkWZ07CzYxxCImi3HD1YgtSOFJKs3eLU1kjE3Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 99nktBZ0RyTbk9JdMdzXAjCrAOjCwBeupKCGDYcPsJqpJwZEFui6TaGz5F7IOw2IjBRGhT7CUIQpfOU6kbqTZ1WldkFciHA3NFVJ8J86HYgvxLutL/TJKnaGfy/JT4VGuQPz+08/V6FI+FnxO10+Qd6c0Fsjz0SsDw+Qud28TO/LCyFfLKl7G7NpJe+9S6RQ5qXeUSBE6yNafVkK/DHe0Eifrxx2mvvYD+V7Yuzd51wpSJsd9xuPvgcQZ5g/JwrciOdMv9PsWQzLFWebJTcM4jl16EyqhlL0NJXQgovfGVIPTNsjocSpIwiTve2OBq6/fpcUywgltOIVL760Tvgls45ACXsMxhvVX3jk69dbP7zvDNBqK4kivgzxFagmlBW0Sz+3LQQEUk9KqqcbR+CJE/v9DYvV1qYKN/C7aOPAajlJtegXdXb/icNJA73wuTSXVxqbYKnaMplvWRnn5jNB0IyIc7JEvclBynl0t0ka725ew60IJ6/x7Pxb2tBRQXZYwXPU4MiY6cDwL8iX9tqoEHDsJQYrLlac6+AFCDRJEvQ17418GDwjZ1tw37yF99z4a8jcxlWur09GPyAk7TmCjWMxVYbPAi78QtnxMTYkGK/5MtPT2qJmidNnN4/s9A/Ws2BuMByRFTb72/c/+CUIBeH/vP9i7yLbKDBHOlEwbL5CtGeeHNdTk2oFXJIfcFlFr0H2KKWrF9+YYJ/mZ5uhLsmqUhWX/zT0l2qLB2d/AP4WopC5fAa2Ho+DPNFVymAmwBpYr+oUPXb2Dse4xwHvaFQnYL6HSVbRNzAHNEXJnlir4QHOM5Mp3REcCCpvEKHHA4/ztyrtWUSXpnksoWbSuy+0PhfGKWMUEQclC5advNsR6vI7VDz44TMJVtXV1ZeZzroQbwywEh2aVdZmFDaKkmt8VSvugiyYJhRRQynRrXQq5CFv/VY/VWAtc7v59BrkEazZ6tqbwxEZpa5GcBS/5tDAP/2lcfyXnV6t8Mo/sb9l5W63v6xelbDw8BFy58MHKaMtH2pKWHZS6TdCN7AVytJogV/waJMOX3PPujRpu1mCeW7eihs7f8I7oeruQv17ovpKDTvgcLxjEeqnTvHQoWU1tzqZUrzhpphLHckRk/vkUEJBZOr30qPdEngFB0qXph/xkPwlV7kQr5RRsjzwv/DuW96hWVmdzxzK5ui+bu6kBAP/B5hn+FWHRe5gigNyrkUayach4HDLdpYADYOueRdwGcR99xXEchmOY225xqNMfluCKTK6/7GrRftSpn6o8t6wt0+qXKViBDWZqsAtcDC4pwTN5EVxmZVFxbnqIIk3p8WFuapPOOi+fh4YMRnr/ioWCV1xDqOjApIix5b8hXSHP1IvoQZ0kYOPeGgfL0lgt1kingZdcuXFZDGQOTG3weutyZGCZh04AvlIA+At6IIixBfxGagEH605ZKmguwtMdt1d9OSWU1ymeswxrQ+hoTnnVTLZCvCt8Csj0BYiRRjFyT4A36+nBQO4d+YGqmvQNlhjNPkavwwHljGtYmg//gm9INh92Ty+18yumJcn+lXona3ZzvYaWQHtmp2y1Lu4EK9h2dSRq60XxJO9y8SccXZ0mYua/+FxaL2Dx1YVE+XXciFqBcrTcimZmuN2F5c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: af971900-8447-4450-e52c-08dafab45d51 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:02:59.7738 (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: 8P9hGoQHtmWBN9BBjhh0dwrcvp1nmFqaFT6mTk0TVa8VNj4A4TbFTFbcLjPY+jPrTWm7pTskYWBDWqN9yywCJSPuGUCi15AcEhqdAkz3zrMTkAkBwWQMuSz2VTWuBc5g X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/intel/atom/sst-atom-controls.c | 9 ++------- sound/soc/intel/avs/boards/nau8825.c | 5 +++-- sound/soc/intel/avs/pcm.c | 15 ++++++++------- sound/soc/intel/skylake/skl-topology.c | 19 ++++--------------- 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index fd59b35a62ba..38116c758717 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -1327,15 +1327,13 @@ static bool is_sst_dapm_widget(struct snd_soc_dapm_widget *w) int sst_send_pipe_gains(struct snd_soc_dai *dai, int stream, int mute) { struct sst_data *drv = snd_soc_dai_get_drvdata(dai); - struct snd_soc_dapm_widget *w; + struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(dai, stream); struct snd_soc_dapm_path *p; dev_dbg(dai->dev, "enter, dai-name=%s dir=%d\n", dai->name, stream); + dev_dbg(dai->dev, "Stream name=%s\n", w->name); if (stream == SNDRV_PCM_STREAM_PLAYBACK) { - dev_dbg(dai->dev, "Stream name=%s\n", - dai->playback_widget->name); - w = dai->playback_widget; snd_soc_dapm_widget_for_each_sink_path(w, p) { if (p->connected && !p->connected(w, p->sink)) continue; @@ -1352,9 +1350,6 @@ int sst_send_pipe_gains(struct snd_soc_dai *dai, int stream, int mute) } } } else { - dev_dbg(dai->dev, "Stream name=%s\n", - dai->capture_widget->name); - w = dai->capture_widget; snd_soc_dapm_widget_for_each_source_path(w, p) { if (p->connected && !p->connected(w, p->source)) continue; diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c index 6731d8a49076..b31fa931ba8b 100644 --- a/sound/soc/intel/avs/boards/nau8825.c +++ b/sound/soc/intel/avs/boards/nau8825.c @@ -258,14 +258,15 @@ static int avs_card_resume_post(struct snd_soc_card *card) { struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, SKL_NUVOTON_CODEC_DAI); struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card); + int stream = SNDRV_PCM_STREAM_PLAYBACK; if (!codec_dai) { dev_err(card->dev, "Codec dai not found\n"); return -EINVAL; } - if (codec_dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK] && - codec_dai->playback_widget->active) + if (snd_soc_dai_stream_active(codec_dai, stream) && + snd_soc_dai_get_widget(codec_dai, stream)->active) snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_FLL_FS, 0, SND_SOC_CLOCK_IN); return snd_soc_component_set_jack(codec_dai->component, jack, NULL); diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index c4376c9c35ef..211edd51a896 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -35,15 +35,13 @@ struct avs_dma_data { static struct avs_tplg_path_template * avs_dai_find_path_template(struct snd_soc_dai *dai, bool is_fe, int direction) { - struct snd_soc_dapm_widget *dw; + struct snd_soc_dapm_widget *dw = snd_soc_dai_get_widget(dai, direction); struct snd_soc_dapm_path *dp; enum snd_soc_dapm_direction dir; if (direction == SNDRV_PCM_STREAM_CAPTURE) { - dw = dai->capture_widget; dir = is_fe ? SND_SOC_DAPM_DIR_OUT : SND_SOC_DAPM_DIR_IN; } else { - dw = dai->playback_widget; dir = is_fe ? SND_SOC_DAPM_DIR_IN : SND_SOC_DAPM_DIR_OUT; } @@ -929,7 +927,7 @@ static int avs_component_pm_op(struct snd_soc_component *component, bool be, int ret; for_each_component_dais(component, dai) { - data = dai->playback_dma_data; + data = snd_soc_dai_dma_data_get_playback(dai); if (data) { rtd = asoc_substream_to_rtd(data->substream); if (rtd->dai_link->no_pcm == be && !rtd->dai_link->ignore_suspend) { @@ -942,7 +940,7 @@ static int avs_component_pm_op(struct snd_soc_component *component, bool be, } } - data = dai->capture_dma_data; + data = snd_soc_dai_dma_data_get_capture(dai); if (data) { rtd = asoc_substream_to_rtd(data->substream); if (rtd->dai_link->no_pcm == be && !rtd->dai_link->ignore_suspend) { @@ -1291,11 +1289,14 @@ static void avs_component_hda_unregister_dais(struct snd_soc_component *componen sprintf(name, "%s-cpu", dev_name(&codec->core.dev)); for_each_component_dais_safe(component, dai, save) { + int stream; + if (!strstr(dai->driver->name, name)) continue; - snd_soc_dapm_free_widget(dai->playback_widget); - snd_soc_dapm_free_widget(dai->capture_widget); + for_each_pcm_streams(stream) + snd_soc_dapm_free_widget(snd_soc_dai_get_widget(dai, stream)); + snd_soc_unregister_dai(dai); } } diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index b20643b83401..96cfebded072 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1663,11 +1663,10 @@ int skl_tplg_update_pipe_params(struct device *dev, struct skl_module_cfg * skl_tplg_fe_get_cpr_module(struct snd_soc_dai *dai, int stream) { - struct snd_soc_dapm_widget *w; + struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(dai, stream); struct snd_soc_dapm_path *p = NULL; if (stream == SNDRV_PCM_STREAM_PLAYBACK) { - w = dai->playback_widget; snd_soc_dapm_widget_for_each_sink_path(w, p) { if (p->connect && p->sink->power && !is_skl_dsp_widget_type(p->sink, dai->dev)) @@ -1680,7 +1679,6 @@ skl_tplg_fe_get_cpr_module(struct snd_soc_dai *dai, int stream) } } } else { - w = dai->capture_widget; snd_soc_dapm_widget_for_each_source_path(w, p) { if (p->connect && p->source->power && !is_skl_dsp_widget_type(p->source, dai->dev)) @@ -1744,14 +1742,12 @@ static struct skl_module_cfg *skl_get_mconfig_cap_cpr( struct skl_module_cfg * skl_tplg_be_get_cpr_module(struct snd_soc_dai *dai, int stream) { - struct snd_soc_dapm_widget *w; + struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(dai, stream); struct skl_module_cfg *mconfig; if (stream == SNDRV_PCM_STREAM_PLAYBACK) { - w = dai->playback_widget; mconfig = skl_get_mconfig_pb_cpr(dai, w); } else { - w = dai->capture_widget; mconfig = skl_get_mconfig_cap_cpr(dai, w); } return mconfig; @@ -1905,20 +1901,13 @@ static int skl_tplg_be_set_sink_pipe_params(struct snd_soc_dai *dai, int skl_tplg_be_update_params(struct snd_soc_dai *dai, struct skl_pipe_params *params) { - struct snd_soc_dapm_widget *w; + struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(dai, params->stream); if (params->stream == SNDRV_PCM_STREAM_PLAYBACK) { - w = dai->playback_widget; - return skl_tplg_be_set_src_pipe_params(dai, w, params); - } else { - w = dai->capture_widget; - return skl_tplg_be_set_sink_pipe_params(dai, w, params); } - - return 0; } static const struct snd_soc_tplg_widget_events skl_tplg_widget_ops[] = { @@ -2978,7 +2967,7 @@ void skl_cleanup_resources(struct skl_dev *skl) return; card = soc_component->card; - if (!card || !card->instantiated) + if (!snd_soc_card_is_instantiated(card)) return; list_for_each_entry(w, &card->widgets, list) { From patchwork Fri Jan 20 07:03:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109293 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 194AFC25B4E for ; Fri, 20 Jan 2023 07:06:28 +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 F372A2DE2; Fri, 20 Jan 2023 08:05:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F372A2DE2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198386; bh=/hHPLJY8uaAcv7lb8pbWFo+3jbtzhB0GV+gBiTn0OiQ=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=lgQK0g1114ilEh6ivv+57dnzobekBNe/Emp6mhAe+ooIb/n5OUHN2S8Kag4INljdI LF7h076wm1xa98dQDe8xVC+n0ndGzU7gDfKXhZPb6JwK6HZ/Q3ltmZsfzkDS7hFpRY QvNLoDe9UKhpg9Cx+jI04EhN482WsVZLgDiN0WzM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id AF9B8F8055C; Fri, 20 Jan 2023 08:03:13 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E82EDF805BA; Fri, 20 Jan 2023 08:03:11 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2131.outbound.protection.outlook.com [40.107.114.131]) (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 3D610F80552 for ; Fri, 20 Jan 2023 08:03:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3D610F80552 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=dhSXFOYF ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qu4G6FrEKu6X5DnVcCE1aIPxaw35ZkDuc6d+9IQ6H9xvD6CJmYlR2SUc4RLlx2cRAXgQVzzdt9z8M78E3YLouv828lWzT9gAHGfZlCa3bu/UM9wAnK3+lN/R8ZvpymamjNf+TmLLMdAq9vnOKo3HdOqyg3DWNDI2lZ0Yfxbi0m7Hw1nhiloLyJSryXwdaHsyW5JAMMtDqspkXuEpgXOanMInyVcRmysR14hjpq87UpOi6+tqcu6CWW2Cn+XGUVPUXwrs7KpMbRgiXp5pBc9017a/JIe5Pe3bYmr8tAtRWexCbDYnvhfhk/DmjF0ZUp0tZPpGfGfTF1eTEc+EZkxX9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=EcHtF/n2MSlkWXR586MqlkB7DN4Aawdn+kM8+CENqbw=; b=YtQVjnoj6uk66CIZhpOEzZW/cNq6BfGpODp7wRLWYf6Ekfpm0ntSaKGYAblCqWQYsnQGINMFGgiYA0g9oEphUs99XQQu3xTFx4c2O7Bs3ZBmRqBiiHtMGHe6RPpI5FLlDdr+NTIHgWGtbGniW8Oebjt/yopqmnqhm9yk4MQnteqkBP04vHHO15erj0nDVWzTwktJhhfOE/W2CSLt8qT8kN/kfKY/B1AONhX41Csxnc0rlBJ6vyAH3HwF9dTN6VB8yeX4ZWCuAdVTxS3DGVPRDSUthU35Be4NmV06lyJdQ8eqQu3K1ix2yrExydgZH/ScOUco94k9CMcF5VN1pl2XEQ== 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=EcHtF/n2MSlkWXR586MqlkB7DN4Aawdn+kM8+CENqbw=; b=dhSXFOYFX3V6RHZKt6XMtnoJvdy6I7y/mN8CVTiX+Kem4WtE7Je/dTjBZaPtGAFSia0SJzkI3wLZO6fh3z4KuzCIg4+GdbjLsKsBB/8kjk5msxZU3TvEbDLQafdcG3IUCbyySONNoETw8heFNuHAqhehG+LmB2nmC7OgIkrE1J8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:03:04 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:04 +0000 Message-ID: <87pmb9k7rr.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 14/25] ASoC: mediatek: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:04 +0000 X-ClientProxiedBy: TYWP286CA0026.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::15) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: 03d5bbf7-5fe9-49bf-025f-08dafab4608b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HG3pgsj6x0hH2I04/AbVM6CPQnP0600/YK0Vsdfexv0RSTdk4HouQtqJKbOsvO2NsK+Kk+XClXOm+lqtDsuy5KySAE2zpdHurLkQbnvS0EHoTTeCsUUsDZ/TsMcmkDCMynTay3m/zzzz+bwvMFlYOeMcKxjOjA+IpmZlKFt7EFsr2KaIYfHbwbCO5cT/jGmwnltijLIK7mUZAnY1S/vr0QFwZLiSaHwdFaIgnXc/p/ZInw1v5PvJeS6nrrJnKvh5wSA4vGO1O4z9I1ES9v7fIHmJKgbjfsV7RbTg4E9T0yQ4nuyY6FYFKAwrN4j+Qsbo5PXlWMeYMGT6farSdqUXJK0g8/FNV/YB70Hk8RLQTqON2WQxhflA6F0LSPXankHTCBEt+EVoImjwbpPuFwjebDbnqWU9joMiJESGZPWYPiwKdrXago5fN5fD80bgePmQFvLBnArMeXBj9Zz2RT031jdNaKAmVqD9rpu3ntGFK5zzzT66BrGZhcI40ij1yogh39svCaYsaea0drN/lgovDTUMP0V/KeQNxtsh2/5RDmX5lUDbBYbPcpBp76DHRoNHdAtutljfg1zPNt+SOT2kKFoZqQqeumKZJFnfRTcE9s+QpoMWArDy30k5Ix1bC9WPZsasrGKKAidt+FGHMhi2cJa22vIavD8IvFbv3jRdLlDo0i4HF56RibHUo6a6mNnk04Q9O5JqB/JmEEvVymcMMw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cIBDkX1j0sirvHaVdfU01xk0cnyHG3LtpJLuD9UAyGXQvEUOM3ssbxy1QG+N54Ongwc9KJ5SshCfo2f+fl+1RikbAEDg81xXeBeLSJnjF8+7xizuExQVvknpsuouhduUD25fSKki0Hz9EuxpUGmBsNhzm47c1fww84PTFvAaE6sUjm6mKT6WfBL0LtcWTyrVL32nBtSVYROk/73YvajzYP/z+NDNmuNFEUIpm2eTtrRgE596XQsv0dGO/vsF1RQc6JVui9krRG0lCzLRjzdKRWG5rJo1hMHb24vumq707i5ErGoWH6QHGyZ8WRjnNt675lsOiWoBq0kU+DFSrLsTW0hnPXhsWo/KPKZBPwTCbCyD0vktcFVgbGt9CigN5MWmeD2ng5YXcIsOS8hMwjLYzcS4WR/YnFqqjp4ttlzlYivcBMRso5WSvIlRLvBJGAMk46UKP1oUxpPrguA1w95sscgx/pTxz2B3+7h8EUlZCunCOsP08vCxa/ML60rnirnKQsxPUPb7Q/RdkpLrJWmznr90JX4N/mNRcWZnLO+Nh6nNklGcfi1adcYa6xT3YdG6ifL2G5gyCxPSF0i3HeS6WKjKTLWaSMzxs5SHL4d876FdX1T4xz0rF6oCvMPpGQT5l7n6AsXJhZPKDDHs2mQatbgQX6x2uAqBBYGPrkUMtXlyNcf0KteC4lvLsEY3A93zPRoFmSVWsXCXV6K2y0YgEXwwKOhMrO6fAu8mYgCaMri69dobDDY5lOna0OWyq3d0IMom3yoNdm4e3RPAezNnKTGaMCCjOFgSOSdtySTbNgQQLK23GQ7OBMZujSXA6bFQ+ic2AbZyyT+gim0f4GW80zR10LnmDIusD3sbNjnAFE5ZN6LgovJP0SoYn+zs8MQVAxcutrxrjnfYnUWiZFp0wDhWpawOxS80jZGF1MxspJ+Rb4/98X5tBqEeWkQEsCBDHx8nwfOoSSmQuyFLO5b96nEDh08JNQ7Hp4+1nu68Sbr/wukDUMlyu5P8JCEQ0orn8jeSxSt4Pff16QoQmmvFLCCSoeRj7loE50X+3v6211LhYPxJaHt9OgvL/+V2cYZ8wdN0GO7APHjgdwhXfMc6E9woWdFQx6H0pmflqmIOVn+dhXfStHLHEdBryqfS9M+U654X75kDzXl/BaVxsl/9mfEXLFcmn7qVKCLm9gIDVUZCty6Z5wwdC910wQjsIg8KToFSCgWI1VffszbOopJtymekjEAs9na2MkzkPvW4QuDF4OxT+yC6mak1jIC7+hCk+0mcG5Fj7Yr/Yj0eFlJZUJtQxckw7dWDnonZXZNbkzzYq7sOvi8AF68sRpLUtdVslOHtizXspdW67bUIs2rO0YeTGDyZfmjvdYM4kOP0IvV+cqAgYNTsCgcHzj0yLQLZD7hY0/9ci25qWEoE57xj3KKsPjCVGxVyCKcjE2ePaUcbBvh36+AwrGGcx82UvMoaWyuZrHkbNMq5MJ6kbrPHwUfjPQvup8ezbY16zwC7hJIm7cpf+GofPnpwWIxUJAUyjqqVR5myuxjarI3tVdxO1/2a5mBv250xyluYXFhZAJKyMKm2L2fwCnyG1dQcWMSGoXLUQG8d1iW5ZTsPADG62QMNQ25OZjChVwudiSBR6yc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03d5bbf7-5fe9-49bf-025f-08dafab4608b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:04.9001 (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: wdStIPfAmYAFrlMmc0xyS04dkEN0HulHQYxtmHkVtyagew2n5OjfDRWVN+uOPcSCJSb3y3rfa5Lv5colbNKGI29WbOH7+acYfBCE47B7UjGCwQ4tOxBl+KwRiIkM+/UM X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/mediatek/common/mtk-dsp-sof-common.c | 18 +++++++----------- sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 8 +++++--- sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 7 ++++--- sound/soc/mediatek/mt8186/mt8186-dai-pcm.c | 7 ++++--- sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 8 +++++--- sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 7 +++++-- 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/sound/soc/mediatek/common/mtk-dsp-sof-common.c b/sound/soc/mediatek/common/mtk-dsp-sof-common.c index 8b1b623207be..6fef16306f74 100644 --- a/sound/soc/mediatek/common/mtk-dsp-sof-common.c +++ b/sound/soc/mediatek/common/mtk-dsp-sof-common.c @@ -32,7 +32,7 @@ int mtk_sof_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, continue; for_each_rtd_cpu_dais(runtime, j, cpu_dai) { - if (cpu_dai->stream_active[conn->stream_dir] > 0) { + if (snd_soc_dai_stream_active(cpu_dai, conn->stream_dir) > 0) { sof_dai_link = runtime->dai_link; break; } @@ -111,21 +111,17 @@ int mtk_sof_card_late_probe(struct snd_soc_card *card) for_each_rtd_cpu_dais(sof_rtd, j, cpu_dai) { struct snd_soc_dapm_route route; struct snd_soc_dapm_path *p = NULL; - struct snd_soc_dapm_widget *play_widget = - cpu_dai->playback_widget; - struct snd_soc_dapm_widget *cap_widget = - cpu_dai->capture_widget; + struct snd_soc_dapm_widget *widget = snd_soc_dai_get_widget(cpu_dai, conn->stream_dir); + memset(&route, 0, sizeof(route)); - if (conn->stream_dir == SNDRV_PCM_STREAM_CAPTURE && - cap_widget) { - snd_soc_dapm_widget_for_each_sink_path(cap_widget, p) { + if (conn->stream_dir == SNDRV_PCM_STREAM_CAPTURE && widget) { + snd_soc_dapm_widget_for_each_sink_path(widget, p) { route.source = conn->sof_dma; route.sink = p->sink->name; snd_soc_dapm_add_routes(&card->dapm, &route, 1); } - } else if (conn->stream_dir == SNDRV_PCM_STREAM_PLAYBACK && - play_widget) { - snd_soc_dapm_widget_for_each_source_path(play_widget, p) { + } else if (conn->stream_dir == SNDRV_PCM_STREAM_PLAYBACK && widget) { + snd_soc_dapm_widget_for_each_source_path(widget, p) { route.source = p->source->name; route.sink = conn->sof_dma; snd_soc_dapm_add_routes(&card->dapm, &route, 1); diff --git a/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c b/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c index 51f736f319e4..8a309b0734f7 100644 --- a/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c +++ b/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c @@ -183,6 +183,8 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); + struct snd_soc_dapm_widget *p = snd_soc_dai_get_widget_playback(dai); + struct snd_soc_dapm_widget *c = snd_soc_dai_get_widget_capture(dai); unsigned int rate = params_rate(params); unsigned int rate_reg = mt6797_rate_transform(afe->dev, rate, dai->id); unsigned int pcm_con = 0; @@ -193,10 +195,10 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, substream->stream, rate, rate_reg, - dai->playback_widget->active, - dai->capture_widget->active); + p->active, + c->active); - if (dai->playback_widget->active || dai->capture_widget->active) + if (p->active || c->active) return 0; switch (dai->id) { diff --git a/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c b/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c index 38ce0e36cdb4..4e25287fc0e4 100644 --- a/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c +++ b/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c @@ -183,6 +183,8 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); + struct snd_soc_dapm_widget *p = snd_soc_dai_get_widget_playback(dai); + struct snd_soc_dapm_widget *c = snd_soc_dai_get_widget_capture(dai); unsigned int rate = params_rate(params); unsigned int rate_reg = mt8183_rate_transform(afe->dev, rate, dai->id); unsigned int pcm_con = 0; @@ -193,10 +195,9 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, substream->stream, rate, rate_reg, - dai->playback_widget->active, - dai->capture_widget->active); + p->active, c->active); - if (dai->playback_widget->active || dai->capture_widget->active) + if (p->active || c->active) return 0; switch (dai->id) { diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-pcm.c b/sound/soc/mediatek/mt8186/mt8186-dai-pcm.c index 41221a66111c..a50aa294960b 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-pcm.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-pcm.c @@ -218,6 +218,8 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, { struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct mt8186_afe_private *afe_priv = afe->platform_priv; + struct snd_soc_dapm_widget *p = snd_soc_dai_get_widget_playback(dai); + struct snd_soc_dapm_widget *c = snd_soc_dai_get_widget_capture(dai); int pcm_id = dai->id; struct mtk_afe_pcm_priv *pcm_priv = afe_priv->dai_priv[pcm_id]; unsigned int rate = params_rate(params); @@ -230,12 +232,11 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, unsigned int pcm_con = 0; dev_dbg(afe->dev, "%s(), id %d, stream %d, widget active p %d, c %d\n", - __func__, dai->id, substream->stream, dai->playback_widget->active, - dai->capture_widget->active); + __func__, dai->id, substream->stream, p->active, c->active); dev_dbg(afe->dev, "%s(), rate %d, rate_reg %d, data_width %d, wlen_width %d\n", __func__, rate, rate_reg, data_width, wlen_width); - if (dai->playback_widget->active || dai->capture_widget->active) + if (p->active || c->active) return 0; switch (dai->id) { diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c b/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c index 239e3f5b53d3..2847a2e747be 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c @@ -273,6 +273,8 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); + struct snd_soc_dapm_widget *p = snd_soc_dai_get_widget_playback(dai); + struct snd_soc_dapm_widget *c = snd_soc_dai_get_widget_capture(dai); unsigned int rate = params_rate(params); unsigned int rate_reg = mt8192_rate_transform(afe->dev, rate, dai->id); unsigned int pcm_con = 0; @@ -283,10 +285,10 @@ static int mtk_dai_pcm_hw_params(struct snd_pcm_substream *substream, substream->stream, rate, rate_reg, - dai->playback_widget->active, - dai->capture_widget->active); + p->active, + c->active); - if (dai->playback_widget->active || dai->capture_widget->active) + if (p->active || c->active) return 0; switch (dai->id) { diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c index caceb0deb467..051433689ff5 100644 --- a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c @@ -213,11 +213,14 @@ static int mtk_dai_pcm_configure(struct snd_pcm_substream *substream, static int mtk_dai_pcm_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { + struct snd_soc_dapm_widget *p = snd_soc_dai_get_widget_playback(dai); + struct snd_soc_dapm_widget *c = snd_soc_dai_get_widget_capture(dai); + dev_dbg(dai->dev, "%s(), id %d, stream %d, widget active p %d, c %d\n", __func__, dai->id, substream->stream, - dai->playback_widget->active, dai->capture_widget->active); + p->active, c->active); - if (dai->playback_widget->active || dai->capture_widget->active) + if (p->active || c->active) return 0; return mtk_dai_pcm_configure(substream, dai); From patchwork Fri Jan 20 07:03:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109294 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 1BA8CC05027 for ; Fri, 20 Jan 2023 07:06:51 +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 F02422DE3; Fri, 20 Jan 2023 08:05:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F02422DE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198409; bh=Ei6/sxm2y7WzrDWSDRD/NVqrvqLpCMMsCv1YcDzL2Hs=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=ZK5QiCm5cGp4Tt2AR9w8vffia4JkWZBrdZ97PMfYdSb3TZR0zTMqXFX1zEdsKjYMt jO3gS/0sHr/2ukNOkDKiVIN42UgT1I0VJAxOQu8NMSZeMf16bMB+kqmCuEHAtnKI34 cCjWLfnvbZrkx84GABj679cR/NlswIuuTWT+1SQs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B6B3CF805C1; Fri, 20 Jan 2023 08:03:17 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CCA12F805C3; Fri, 20 Jan 2023 08:03:16 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2120.outbound.protection.outlook.com [40.107.114.120]) (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 B1ADDF805C1 for ; Fri, 20 Jan 2023 08:03:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B1ADDF805C1 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=Qs5blwFZ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/H2MZV3Q4G5logPAfaKO98VzC+/NyCJlK2tWxEPW7aiwMGH2IGBMmof/Wo6TOIMJOmhwsj5gZLad49VN2DvVY1wkGOgiYYWNKKsp4DYgJJ0tpM3mwUU8ME2m2IyTSKaN25M/qOOBf4lwz4uOZ7Ld1Z0carHcocssrYT0ia9jH41lQHOnMC6hFGKaXRj2a3AXmxRqnJbiamguM77M1+7kJ+C0wFfIG9oJIQWbbyKRT59/uaqGHj4FALLwHGvssIED/r0Jv8xquicATJjR4btkQWe4YqMZorbW1K2SWadmPs3p56F7X1hfMc/y/MHnDMX42qxgt7KgQX3gazLwBLXNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=abCmlxjTeJUpbD23/u/q8Igmh45AfePycqqbck2s2Hg=; b=GiB54lcoZ+/9071NfecM1bbL1tFVUS2MYv3p+1GpPHfSt2zko6NHZvNMNMXUmXmgxqJ0BC97wEifw+CwwiBh57ZbkZeo7jKUJzCjYEQVF3kupAdbslpnSUDTWKHa1E2PWLjXrJTEYULOh9Jvv9SZ9IEmM4t7L7dklnoQmp02aHfWRYZ/ixKXvfm/IoIjNVjbrvAHPf/oUkDa5tqk/EaDdaaVEFRdPIWqsTVqGAK5/khbPcu+isdD/JFOx4SoBlpUfJjh7UFR4NJIfRBq4YN7V9RMekNtr65fLO7fWLNj4c5eUeMFVPwLme0Myxr/JUke9msXOeNb5FBi4UFKiw/bCA== 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=abCmlxjTeJUpbD23/u/q8Igmh45AfePycqqbck2s2Hg=; b=Qs5blwFZ4aqV5qu79wuqXhpT4IJ8rTXT26e7nWn22/lRuU8B3MyR1QhuGGr70KBdxAKLO/FfDT5eN5UtmJerM+n4Vfhx9aFu+x7WBBr+QZkhLGtapbf6zeUyBsC5S6gnoJx36tbpeW0xZha35Qc0GJw33MJViDuhiftLcg61PLk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:03:10 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:10 +0000 Message-ID: <87o7qtk7rm.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 15/25] ASoC: meson: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:09 +0000 X-ClientProxiedBy: TYCP286CA0172.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::10) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: ec55c2e5-6043-45b2-4cc2-08dafab463cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xUxL6HXBTS5heo3zY8mWWcse7pmPKVDsLJ93UGNDOsvZYpfCutpy3BZEuPDQ+hElmFYyVdkNv8TNBXSW5UkLfMtjkVSZJgsw1/xU809OQx4kuYNJ/GjnhxXJ4Pb4EwbihhTX/kAkyWCO3m9HNacg4BU9XHcjLDAIZdoXCS5F+JXKcg2m7cftnGqWRlulRxhUoppwUk3e4IX2xljUCMOTssH4hjeFVmWr1wzDzUtFR/VNZ8cUViAoTR6rt+yfV8oV1x45XCzGcqAwtwaRZXVCJpbRxakY+169dzjyjJksUra89TxzoANAxhhgvXHZIqw7ZzovoKrwb325G2HewII+K59nWiO8Sc+sZmrp3oPtKvgmlEugOOGAf5gxhy292m1EI0fxLqX0Uk8JYxVFOYYtsI+yA/jNpnskCztT1J40JrYLfBINcRVr0vLHx901/IoMTt9KX5+nM0Kf7Mp/bP+0fYrIvutob+zst07SF7rm3LxJSwEshnnJaboIgCraQB3bZt6UzSS7EyBWeOrSCAJRpwp+pD5C6ct198QS3RcoqOSpcjbsprrNcsXSg6aZbgfAflwi6amc6jmwl0O2t4+LMtibzAoplE3SccFvMkONvLdchcycWdHLJGQjJ7g9S7+1YWHStiIRYOm5+GySfQCYuErPgSsx/xLBewIpTPEDO3j3XdzI4Ea3chMSTfuIH11R2xIxcZCKQ283oC5YKBeK7w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wrr/JzMar+ohZkUGy3G0HIeTT30UsIlARED2GR/hStVMZtSGd39SyFJIzt0S2Vv7QQWuDr7os/mpOEqCiZhJJcI9WRXHof9cqkZkXgQQ5lbarj9eej7mq6os6babmtzEwGTrzm9V9dzDbvNbcXWMNVhgPiLDOV/SAfVWSJ/h9uh3ATJ+nLYdTAUmZ/cfsTj+FpReoF3KEZgQKbu54RJ/hJILkQWJozcn3wTbRh7nabEdruEzdNFwTjnat+Uz93+5JJfBuWczWfE7PYIhU/kPriFcaJEjawXdg7MhO+aJT+CuFGHViYM1thGnpG/wZrde8pgQ6c96y/So2m2TSwpeKY54SSqsljRPwQSWDXpsaQTPOCyU6smdLjJKmasRdIpvAJeJGHT37MO7y4dhXaAj2hDlz4NxXlmDbqz2UAuwD00sr3QU2Z5LFfVPn+zqyAubE9NNRxtpbjkzJAw7IfR0vRcvBkUym823zpgQKSYhNOL+diaFtCgi86TsPPvBUq7xRQn7ILyser0LOgUxEK4ohnKgkdoQkZFvRJ/bVuFDXXcRgjgmiLt9UXjo5x6orilS2dy84ajBS4RPBvnHGe3kVABzcQrc4zNeQIn7kG1M1s5X2s6tDR5NNYLIGvhJeY46sCDOJBSo2GPwdIdWWy5d2gVkuIXq2SaraQtIT6yJrlRZQU07YrBO348XxiUjKPwofX/ZcRpmf+Fwr6kyg9R+gsXkCmyiaQzCvBtoJ8+xCVM0V7HWskA/EnptlDPyWqsdfIMKJXdtt+NVvfMpDVfYXgAeFgJAm+PJtD1A+zdiopfNXvZ7wfJKd104qLbh/l18lsQzuVDrjnodwyzgC1V/KmsUnfP5Ah0EGmpF8ei1oB3xVOLkhqvPAOmVYAa+SeXWbH6jAaHieEPMhQWMn0QZhyql3mOH+vFmVoyUqvVvmgVnF30uOZ9+cMTsq/PB2WMhjsKJ+D3IcBF0uQIhPY3kQMBXy1dG3eNYquvqXLuEFmPkmSlMk+6qiPI9Gj6s37W/F+p7TaKLfTSoZecYwPJxK6p3Hcl6fXGSJW9NY6Tutjl9HT6+32fb/W8YowIrfrZqHZEHTCwmKre50BTeUrNTzP8vgZvoGiqf1HTjK2ImQT/uDO+0rQ3A3aK3jYEsJS7XPaeVt+KPZkMUmaa+0lFNNkeKktV5PD4yowrE/qEEqvwLLTlZo7iCR50ioH9WIKJzyQ+MslvUt1dK+OG9ODmywJ+BtslIS+bulOVxvk86wlTkDxwk3Bs4X+Yeu9Mdr8cp22SbxSkhF2LM6KH+gliHqPa1F8G5bAchdcAyN8MIAXER/g+dSJGF3Snr02tlfi4Zl8lWLdSaFXUNFb/zZfWYL9WKtKhcRY4KtQLidpBb0iqluHzscWwpohyVpVGD0dBf4VnaAPWhizRqRPZo3LSNEKiLndzSa33l0sbgOYgKgVOVRUDt+HyIGc3KcChtpmuJP9iycmI4Ostr6L2AX5VWSnZ2ofVRGcp0qX/QEXOXOl7l4B7hegcTu5sI+oWgV0GstTXLPQ/bf0wItNeZYkoZ3PGs2DU+rANujjkqAgniT0yr+XvDQw5hh+kboyWgy2ksvLXqimnqaq7CQUtXYVZl3BNVlHHhCyNfl8VKm2YE0wE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec55c2e5-6043-45b2-4cc2-08dafab463cb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:10.2765 (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: Vg88/6MRROqth7kD+tCC1jpcHAVwC1s6dZhgf4Y2yzmS7G+gu3lOTytT6DBIcH6nomqXzRzkel3U628xXbP1ReiuZQ+PVogXdin+F0lB/GQ4vG8IJIGbGbrz2B/GsZyc X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/meson/aiu-fifo-i2s.c | 4 ++-- sound/soc/meson/aiu-fifo-spdif.c | 2 +- sound/soc/meson/aiu-fifo.c | 21 +++++++++--------- sound/soc/meson/axg-tdm-interface.c | 34 +++++++++++++++-------------- sound/soc/meson/axg-tdmin.c | 2 +- sound/soc/meson/axg-tdmout.c | 2 +- sound/soc/meson/meson-codec-glue.c | 8 +++---- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/sound/soc/meson/aiu-fifo-i2s.c b/sound/soc/meson/aiu-fifo-i2s.c index 57e6e7160d2f..59e00a74b5f8 100644 --- a/sound/soc/meson/aiu-fifo-i2s.c +++ b/sound/soc/meson/aiu-fifo-i2s.c @@ -88,7 +88,7 @@ static int aiu_fifo_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_soc_component *component = dai->component; - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); unsigned int val; int ret; @@ -158,7 +158,7 @@ int aiu_fifo_i2s_dai_probe(struct snd_soc_dai *dai) if (ret) return ret; - fifo = dai->playback_dma_data; + fifo = snd_soc_dai_dma_data_get_playback(dai); fifo->pcm = &fifo_i2s_pcm; fifo->mem_offset = AIU_MEM_I2S_START; diff --git a/sound/soc/meson/aiu-fifo-spdif.c b/sound/soc/meson/aiu-fifo-spdif.c index 2fb30f89bf7a..ddbd2fc40185 100644 --- a/sound/soc/meson/aiu-fifo-spdif.c +++ b/sound/soc/meson/aiu-fifo-spdif.c @@ -173,7 +173,7 @@ int aiu_fifo_spdif_dai_probe(struct snd_soc_dai *dai) if (ret) return ret; - fifo = dai->playback_dma_data; + fifo = snd_soc_dai_dma_data_get_playback(dai); fifo->pcm = &fifo_spdif_pcm; fifo->mem_offset = AIU_MEM_IEC958_START; diff --git a/sound/soc/meson/aiu-fifo.c b/sound/soc/meson/aiu-fifo.c index d67ff4cdabd5..543d41856c12 100644 --- a/sound/soc/meson/aiu-fifo.c +++ b/sound/soc/meson/aiu-fifo.c @@ -34,7 +34,7 @@ snd_pcm_uframes_t aiu_fifo_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_soc_dai *dai = aiu_fifo_dai(substream); - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); struct snd_pcm_runtime *runtime = substream->runtime; unsigned int addr; @@ -46,7 +46,7 @@ snd_pcm_uframes_t aiu_fifo_pointer(struct snd_soc_component *component, static void aiu_fifo_enable(struct snd_soc_dai *dai, bool enable) { struct snd_soc_component *component = dai->component; - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); unsigned int en_mask = (AIU_MEM_CONTROL_FILL_EN | AIU_MEM_CONTROL_EMPTY_EN); @@ -80,7 +80,7 @@ int aiu_fifo_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_soc_component *component = dai->component; - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); snd_soc_component_update_bits(component, fifo->mem_offset + AIU_MEM_CONTROL, @@ -98,7 +98,7 @@ int aiu_fifo_hw_params(struct snd_pcm_substream *substream, { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_component *component = dai->component; - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); dma_addr_t end; /* Setup the fifo boundaries */ @@ -132,7 +132,7 @@ static irqreturn_t aiu_fifo_isr(int irq, void *dev_id) int aiu_fifo_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); int ret; snd_soc_set_runtime_hwparams(substream, fifo->pcm); @@ -168,7 +168,7 @@ int aiu_fifo_startup(struct snd_pcm_substream *substream, void aiu_fifo_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); free_irq(fifo->irq, substream); clk_disable_unprepare(fifo->pclk); @@ -178,7 +178,7 @@ int aiu_fifo_pcm_new(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) { struct snd_card *card = rtd->card->snd_card; - struct aiu_fifo *fifo = dai->playback_dma_data; + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); size_t size = fifo->pcm->buffer_bytes_max; int ret; @@ -200,15 +200,16 @@ int aiu_fifo_dai_probe(struct snd_soc_dai *dai) if (!fifo) return -ENOMEM; - dai->playback_dma_data = fifo; + snd_soc_dai_dma_data_set_playback(dai, fifo); return 0; } int aiu_fifo_dai_remove(struct snd_soc_dai *dai) { - kfree(dai->playback_dma_data); + struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai); + + kfree(fifo); return 0; } - diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c index c040c83637e0..7624aafe9009 100644 --- a/sound/soc/meson/axg-tdm-interface.c +++ b/sound/soc/meson/axg-tdm-interface.c @@ -37,10 +37,8 @@ int axg_tdm_set_tdm_slots(struct snd_soc_dai *dai, u32 *tx_mask, unsigned int slot_width) { struct axg_tdm_iface *iface = snd_soc_dai_get_drvdata(dai); - struct axg_tdm_stream *tx = (struct axg_tdm_stream *) - dai->playback_dma_data; - struct axg_tdm_stream *rx = (struct axg_tdm_stream *) - dai->capture_dma_data; + struct axg_tdm_stream *tx = snd_soc_dai_dma_data_get_playback(dai); + struct axg_tdm_stream *rx = snd_soc_dai_dma_data_get_capture(dai); unsigned int tx_slots, rx_slots; unsigned int fmt = 0; @@ -362,11 +360,14 @@ static int axg_tdm_iface_prepare(struct snd_pcm_substream *substream, static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai) { - if (dai->capture_dma_data) - axg_tdm_stream_free(dai->capture_dma_data); + int stream; - if (dai->playback_dma_data) - axg_tdm_stream_free(dai->playback_dma_data); + for_each_pcm_streams(stream) { + struct axg_tdm_stream *ts = snd_soc_dai_dma_data_get(dai, stream); + + if (ts) + axg_tdm_stream_free(ts); + } return 0; } @@ -374,19 +375,20 @@ static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai) static int axg_tdm_iface_probe_dai(struct snd_soc_dai *dai) { struct axg_tdm_iface *iface = snd_soc_dai_get_drvdata(dai); + int stream; - if (dai->capture_widget) { - dai->capture_dma_data = axg_tdm_stream_alloc(iface); - if (!dai->capture_dma_data) - return -ENOMEM; - } + for_each_pcm_streams(stream) { + struct axg_tdm_stream *ts; + + if (!snd_soc_dai_get_widget(dai, stream)) + continue; - if (dai->playback_widget) { - dai->playback_dma_data = axg_tdm_stream_alloc(iface); - if (!dai->playback_dma_data) { + ts = axg_tdm_stream_alloc(iface); + if (!ts) { axg_tdm_iface_remove_dai(dai); return -ENOMEM; } + snd_soc_dai_dma_data_set(dai, stream, ts); } return 0; diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c index 49b613a1faf2..c8f6ea24ae78 100644 --- a/sound/soc/meson/axg-tdmin.c +++ b/sound/soc/meson/axg-tdmin.c @@ -83,7 +83,7 @@ axg_tdmin_get_tdm_stream(struct snd_soc_dapm_widget *w) if (!be) return NULL; - return be->capture_dma_data; + return snd_soc_dai_dma_data_get_capture(be); } static void axg_tdmin_enable(struct regmap *map) diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c index 22d519fc07b2..c4039e4f0847 100644 --- a/sound/soc/meson/axg-tdmout.c +++ b/sound/soc/meson/axg-tdmout.c @@ -81,7 +81,7 @@ axg_tdmout_get_tdm_stream(struct snd_soc_dapm_widget *w) if (!be) return NULL; - return be->playback_dma_data; + return snd_soc_dai_dma_data_get_playback(be); } static void axg_tdmout_enable(struct regmap *map) diff --git a/sound/soc/meson/meson-codec-glue.c b/sound/soc/meson/meson-codec-glue.c index 80c5ed196961..5913486c43ab 100644 --- a/sound/soc/meson/meson-codec-glue.c +++ b/sound/soc/meson/meson-codec-glue.c @@ -39,13 +39,13 @@ meson_codec_glue_get_input(struct snd_soc_dapm_widget *w) static void meson_codec_glue_input_set_data(struct snd_soc_dai *dai, struct meson_codec_glue_input *data) { - dai->playback_dma_data = data; + snd_soc_dai_dma_data_set_playback(dai, data); } struct meson_codec_glue_input * meson_codec_glue_input_get_data(struct snd_soc_dai *dai) { - return dai->playback_dma_data; + return snd_soc_dai_dma_data_get_playback(dai); } EXPORT_SYMBOL_GPL(meson_codec_glue_input_get_data); @@ -99,8 +99,8 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct meson_codec_glue_input *in_data = - meson_codec_glue_output_get_input_data(dai->capture_widget); + struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget_capture(dai); + struct meson_codec_glue_input *in_data = meson_codec_glue_output_get_input_data(w); if (!in_data) return -ENODEV; From patchwork Fri Jan 20 07:03:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109295 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 4E931C05027 for ; Fri, 20 Jan 2023 07:07:05 +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 3AD802DE9; Fri, 20 Jan 2023 08:06:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3AD802DE9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198423; bh=TQMlP2nPq/QDUPLRENOjCyTngOAgYkDlRcgvB7YXxlE=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=ts6078wM+QwiCpybCjd8dcVcZD4hRGsOOpxPxIoGKrZCWTaX7QqSoOoIwOiUIMqkw zlVP4iEh6OlKw4Zg/NX8Fq3fzxo2uU4485dbwqhOsq2PV1N8EaYQa91TsPf+vcbWg9 ca2HzT2r9xzVM4WeWqI7Tdwl6xAM41yUZPk2agcw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 66627F805C5; Fri, 20 Jan 2023 08:03:24 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 50FDDF805C6; Fri, 20 Jan 2023 08:03:23 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2134.outbound.protection.outlook.com [40.107.114.134]) (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 9B8B4F805BE for ; Fri, 20 Jan 2023 08:03:20 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9B8B4F805BE 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=YmsoQshn ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWhSTsy0rYFQv39UP5/i9EXlWyfrtGK+uJkyQOJpf9RoMewQpeW9nAOVp5SyFSC/j+KIWd6SJQ3FUqFcwEW3jSf6eaKWpkaFHEomAThVgKJxF2eG7l4fl2OQg2towLYZ4dWHT65kKok+pUzT13SAs77CxAi4R/xuU59dRWibKzJXgYXVhaIr8jb8tJB3U3b83NWtJb+20+jwSSJHdLTVQC/xCej6R7A+Vzl/etEITAz5ABdhkPDQnUibyU4JP3wyRfugdCYS3cxtSUoPJaJS9Ed4ZohgVTNmkCbc78DZjeAczzIpcK632VaHG6ubBv1c4heu9bTbAWSP4TZxWKW1hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=r1lwRWv+Ldc2M5zyJ6cUcgdNTcI7rj6Z3D3wQBfvenE=; b=mB+pg6DWLtwIhkt2/6EG6SQm1myOAevG8KfrlfQCRTX+sNNrQfRkmJB9qb4+xc8hZR4WmIUNMfuAB+MqZu8zcM34QpJiWcc2fvNO9KJqWLBnPD/D0br80gLvMJjjEsZnAFYeNyBrEC2yUph4J6GpLx1ZADxg5a2ZIB45c2jH7MBBDe5f2wSuxrsv9cz70O6hkP4iQWvvLfCTUXrfSK8zVr296ph6GQ3Dzudn87q9RywsT9IjKq0ga1geTr9QgnO/ozcoRHt6AEweQghy3nRZB4TUCe7rcQ7zVMtWt8aRVxMzpTNhVaVabJBCcSnciU47i7rd4e0XNDN8p79X2ID1rQ== 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=r1lwRWv+Ldc2M5zyJ6cUcgdNTcI7rj6Z3D3wQBfvenE=; b=YmsoQshnsQyMNJSLmOMtHAhvUCO/G6PEY1F+xxCQ7TfsRQPgX/Q56ZasldoBNM7/LaxEjVJUZWbesoXRxkSu5f6aBI30cRb7dDHdSbm36U1AAhBig24yytGq3qemaXnxppbW5fmTDIpKQd6Q2vxGUA2VKbW7Hmm23AmGgHFO5gU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB9337.jpnprd01.prod.outlook.com (2603:1096:400:195::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.26; Fri, 20 Jan 2023 07:03:16 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:16 +0000 Message-ID: <87mt6dk7rg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 16/25] ASoC: rockchip: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:15 +0000 X-ClientProxiedBy: TYCP286CA0013.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB9337:EE_ X-MS-Office365-Filtering-Correlation-Id: a32cdb9b-a85c-4368-6d29-08dafab4673b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4IkGeYVpIAdkzdKW4v3WTNEznn1DpiJWRlzmrxcGEDzymVIgKzJKInKCIC/ElU+33Cgo0LTA3Z1Vz9SIoPNBHZgB5UWd7VQPNokIIkkMcF7NxkxuAOsOsHvsOeHOeL9eA/4N5hjQScABf20QI7MSQokwkUjbJx8qt8AUtRzzkC/tXhf+i9RVW26u3l6jR9g8f7bNiH8fYz6i3s+qqDDg76fVuyvswyHsRgn17pQRAEUhbbJ6brJb8e+301FpKU0yFSKcAvwq8MB+ziob40GPGM/zroobeVWKdCLF0PiUv9oYP2bJgnQngNvi+6teWXNf1LlcbLynylm/8hdC2ft5h2M6AwszhFOtFRU8rnJDw7yfq5R35s/4gugiwVWKnUhpCrnbPjOsNgMVGNvpWi61PMZAO7820a7v/atmUoDSpR9K0MFUDtUZM3pz4AicTACIiAem/29nXpZGtxNEdSmMkpf8gWE8fqaH1jP8kGSRx1UFvR5+9kadvBPpWTtUVMx1pnS1u80xTr80n/EFwChlqRyPkygvYBgebWD4sXM62R3ZAQzvcvLITe/GDmlHU8RzKdzu53scZXf6Sfh9L/LZ//++04YjiQGHgVC2Wn9DFwgrygSoMR0lwS/70GUE6cSXn2LoCpKnP4sRMz54ekQCHuexqyfnLH9O4TeiRQh/K/V09USwlJzS6j7JkZjBMl7FIhRc6uWPKRupCsco0u2Uog== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(451199015)(2906002)(83380400001)(41300700001)(6916009)(66476007)(8676002)(66556008)(66946007)(36756003)(4326008)(7416002)(2616005)(8936002)(54906003)(5660300002)(316002)(6512007)(186003)(26005)(478600001)(38100700002)(38350700002)(52116002)(6506007)(6486002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 902mrMlh8GCdjBDIp0T8npcdCLyDgIrUD1aSHy5bgdglYxAsmL8Bd5Qul0oAoQnNK89nVD27e1XwSJhVjZU5SNLDsJmeDK60Q15Y9P/aHwOv6ahNSGKDjXk5h2lNa3ss3ZvvFdYCZtUah11P0pSiApHaPLg1AT/sioVlvQOwwsglFbLXP+QUoTaTEglyKN6Oiv92sQuCrHwPkQ5Ed4M+ZFsLTvIrbupkJUeP0sy5+x0rNedCvQzSfe2wa1KotTZZyiQ+thpL9VT2Kr7nF8pMKZcnmNGbRAxrtWXwFWqG+UYzuMrVvlOoLFU8fqyQ/LzdzXC2GelW7ag3rmfjkM7AW9R6yR+p5J2/Mbuvjorm3KOQ4jp4X2EPt+sXeiacySRSYU9fwkYYwtR1tH4tPlV7cWQzy04CwDlmUKSjcbHekPQCYJSyjUDORbfFARiaVCeg/yhtoSiQpR6EUc4FBYYYAMV//XmSla2jgFaOHHveWeuo6pR+rCoy2J7d2bzSXl31Z2midEaNDa37Au6hIeTXiQpoi4+GbvmwiU9S3sjWvU85a5lyxgdbi6JJDdzHuqz+5chI4grcoXBqsN5vAEWqawNbuRGeYS7v+aIUCZJBbVlzD3M16d6/jvM87pQ1aXii/zIkh3S8TxGNUByZrdr8p3Bet50QaJV9maDJJP0818AUmkWGY/HWbcVdfVa6IWVip/yj2L/+wxlNOgIeypuNLAqW6l8iv5VUBNrN1I50PHE77wZYnjff67aL88UEwLBuzUCVg2RYJYUxO9U0ATPwBw1emLAbK6moIRFiYCSsDmjJu+oLfd6VTtGgZj9+RRwjL/rq3WyI9Qo7+jyGdex9oiOt83s35hrQVm7my0IUZ4T/P3300DVZQRtDsb3TD/b8TO9PHwwL1WQfFiqywqTNbnuxUobAzeaySu6RvdLAlml5bnhdRsEeF0u1c5Zb3rSMSBK57WxfsNJdSTe03VGglSxxhgGp6/UyqvrizCQObbC6pkNooSO3zw3P+4Le2xec4ySP0ELHTHg7juGhdgpN0y2AeeyGF5iK482/V1a7EPlqwIDXVsh4n8qFmijnHbP1XdeelTBtuqoLKxzPqs0winvuka5ZIygD3sZyEdtjDPJwHW0l9H3WqQshjO304iA1biEJBvgtg86TvBCejKDq+HalhWPjAUURIZASclHwyFCrUEcbGQDtARKWGMT6hmxPY87e448hBc1Pqy9w7gVo6sMOsy8LTH4sNzWXwq649+nTBkuUmiJEkFqmnDMFTETAH+RmaanUU7Ow6FkKD2gxHnN+r9K3bFigoSZpX4paUDmXer7ejSxQOWukdutssDuSWG9fjS8kVBrr1Dw1zWiBzqErdSA5jsl2yS23CukWFT3Nrrt8aNBS71WAgZIqBdNFHHBwiTSyTdvfJ5M7fTOCpicFxdHU36ojWTAhifSOG41iWDhFj6T1R8mN8qDVkdRNAjh0x7BRCyDVg8IUx6A1oun86P7HfpGuLfoStlbp5ivPV6cX3zjUsVznhoJ7mrX7QZYeUTxhmEpCfeQSsul1pVDBJNWi5nfUVJKf5SJIuLIt1yv0XAnx8V0KlFd6M1Sy5RVbWORqWxGqvvZjEX/FhyrQqpDjPiorkUyeTlFyKSU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a32cdb9b-a85c-4368-6d29-08dafab4673b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:16.0601 (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: 1LKOnX5dq+dX/wZDOQu1RWxukh0TrBr6pE9bhIscOHZqjyZo7sQ5xdFW81iaSuaDyEcVDVz3V9sGx7MuF0XI4IQQECxh9zQu2JY8ZeCoJ/BebQzpWO2a/fgzHcrzlft8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9337 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/rockchip/rockchip_i2s_tdm.c | 4 ++-- sound/soc/rockchip/rockchip_pdm.c | 2 +- sound/soc/rockchip/rockchip_spdif.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 08b90ec5cc80..166257c6ae14 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -1070,9 +1070,9 @@ static int rockchip_i2s_tdm_dai_probe(struct snd_soc_dai *dai) struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai); if (i2s_tdm->has_capture) - dai->capture_dma_data = &i2s_tdm->capture_dma_data; + snd_soc_dai_dma_data_set_capture(dai, &i2s_tdm->capture_dma_data); if (i2s_tdm->has_playback) - dai->playback_dma_data = &i2s_tdm->playback_dma_data; + snd_soc_dai_dma_data_set_playback(dai, &i2s_tdm->playback_dma_data); if (i2s_tdm->mclk_calibrate) snd_soc_add_dai_controls(dai, &rockchip_i2s_tdm_compensation_control, 1); diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 5b1e47bdc376..6ce92b1db790 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -373,7 +373,7 @@ static int rockchip_pdm_dai_probe(struct snd_soc_dai *dai) { struct rk_pdm_dev *pdm = to_info(dai); - dai->capture_dma_data = &pdm->capture_dma_data; + snd_soc_dai_dma_data_set_capture(dai, &pdm->capture_dma_data); return 0; } diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 5b4f00457587..2d937fcf357d 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -196,7 +196,7 @@ static int rk_spdif_dai_probe(struct snd_soc_dai *dai) { struct rk_spdif_dev *spdif = snd_soc_dai_get_drvdata(dai); - dai->playback_dma_data = &spdif->playback_dma_data; + snd_soc_dai_dma_data_set_playback(dai, &spdif->playback_dma_data); return 0; } From patchwork Fri Jan 20 07:03:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109296 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 37997C05027 for ; Fri, 20 Jan 2023 07:07:25 +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 4FD1F2E17; Fri, 20 Jan 2023 08:06:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4FD1F2E17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198443; bh=T0z3Mce7vgQU4ka0NDRhRgidtcpoOLLnFlssbGJ0FOQ=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=d/nXMe/pz6wmYLKIjpVpxnMBNz9zNt6cNQqwN4XL8SaRLkCr6xyGYCS4NCmI/MJXl +k4UfaMNWjHBa40qdrScbSXHekHGZZu5m6YUhuruD1Lkoelf5JuiDG1Kco0JOeq5v9 6OIGvvhg7MOBN7tcnS5bJt4Imyivzw+xbbaRf+ME= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 820E3F805D7; Fri, 20 Jan 2023 08:03:31 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3E1A0F805D6; Fri, 20 Jan 2023 08:03:30 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2130.outbound.protection.outlook.com [40.107.113.130]) (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 066DEF805D4 for ; Fri, 20 Jan 2023 08:03:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 066DEF805D4 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=JV/QvxWZ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ebzr43iRp1AdVi//Qr9PQ3t/9U7uUidurdJkehisX6rFbYnO2MJZptK1TIHI045MjahfCbIKY5BJ1/gySJQXcAJ6YYhMpNaowomJlfBrsi2CVBSLRegA0f9VRWLsebljFO33+yotnZ5XVioPPETowVHBNOxV5Jzhc35SPQ+h4sqH8VJSCwXAz3pd9+7Mvk8oxx2P+bXz/c54F2ZUke8cFcbaBcXaSDflQJ0XPw+v3UQI2cAY/GZJBWokVXTyccqfv7CjmjQQDl0mBlCigjv8HwzzFCZ+CxmGPMX2zs5hthBHxlcnUVKHvBSFQ7lEiapeOCrhQA26cJ+ZaKwb9uT4hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=OQyYNmm2Pimn1dvbZEDcRO+KSwa6SXtya5LlOzGqfxY=; b=bMte1i8omY9aQR106ZWoP4h1LM8uegYyVuLy5nr0vrauG6/S1GjVYF09FzVpO6iLLLpglN1HoLGODA9BVgJRyX5f3kxNvObQVzwqJiu7/C0E2GU0WkrbYpw88+q5zT/RKeDMxni41Sb3sQwOk6LMa7wqieYaudq2RJ4xMYM2ujhX17uMAXZp4vjR6kibul4E6kOmxuZqKrBikxoeFee+8tQDfvfAArfKz4amFatRQ0XJ0yQqmCv9Wtc5P7xKFNwwUXnWLZuI5EN/DXEibUs1iKauqlq8Nz/nBCVz5nPDCKmcz4cs4jYFj5CKgY5pkTPScmaRrOzPBcPftNFSvVgpSg== 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=OQyYNmm2Pimn1dvbZEDcRO+KSwa6SXtya5LlOzGqfxY=; b=JV/QvxWZbGM8YYuH7dLmaWvMJdOeMuLCgkZA40pAoDR3iSs6J1YkXX9tLXoiGdtj3qMjt0xR3xtCq6TaiEDYB9TEWc+NRsO+15Gidh5Ci2H8hybWiXecN4R80aVCJScOETkSx+/i6pNqTO6WzCWaJwsW2qj8TCLRsL+NJPArNyI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB9821.jpnprd01.prod.outlook.com (2603:1096:400:233::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:03:23 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:22 +0000 Message-ID: <87lelxk7r9.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 17/25] ASoC: sof: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:22 +0000 X-ClientProxiedBy: TY2PR06CA0041.apcprd06.prod.outlook.com (2603:1096:404:2e::29) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB9821:EE_ X-MS-Office365-Filtering-Correlation-Id: 17f2df16-b668-4171-7763-08dafab46b50 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SEWMxSXj+/2sPSjlW7V25fWNEYkZuwF+1ez1FBvrAe5Gon9z1snTG/ep/lFQISLZix1Gh3Mci1vmZfSFRc/qenr3wHowAxD0wJEY/tRFatd5VG2EyO5/7Qlu3Km63VZiU6+2kGAtbMvi5Jvmrtv5CFDI7l1NatrsIbAO09JqteS3njILBHH2nOvwmgEVU9lXtHs8qVWKqTkbc2omkWtKce/fzb+UMCmaDGBfqJhaFGOQRSKJmoP2pj5dhJmPhxwgTtrBbNRqwkj6GVqzoTu3kBb0VJcG1mC3rCcKxJpp/t0cOReVKZ6PjrYuVaQQ+bapZzD2wZ9Iqi8pOGtzlvql7xV6Zj6OPPWL3P7u5hLG2UhEZ6BIH0YIT5QjPCgUtAkt4lBeKZhT4DPx55nyQhvJOO4QmqkR93BwlIJgq6wa4BExdXn7xfL2ACH8kdE266ObMITfOHNEkecqLj9cPwpynZhG7EHh3tdiisY5QtE+AIWr7pl+5b8K9bTzZ1tQDkF1tQGzRRpyMcjH/NSBD75BbDxbwezEho9ghITY5UIOP1axdgJHexjmjJSBXLe15xIlgrH2SfR7+bOoUcBZA9d1Hg52/p3no7mTIO75Ex/ATIEHE0PUVfgCrWbSUJ35jOAsS9n0/mJ9KvLr1KBE7PnNU9JtDG9rY1whiKyFtiGiKBfl2WrkW+CJ4L17An9Qky30kmD53kM1Myxax/DNd0m/eg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(136003)(376002)(396003)(346002)(39860400002)(451199015)(8676002)(36756003)(83380400001)(6916009)(66476007)(66556008)(66946007)(4326008)(2616005)(7416002)(54906003)(316002)(86362001)(8936002)(2906002)(38350700002)(38100700002)(5660300002)(41300700001)(6506007)(52116002)(26005)(6512007)(186003)(478600001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Da3ovEXwrlpXQ/Z5VM755j7zjRJktFNWGPZ0zbx7tVcwdSp+ONFs/fbpJQFVFDD4DOqcZYG6vEjzwGk2jcxVEpdgexp0gjsTGY/tz/smXJIgDIeVzpuTkTcrQsCaZXuPfVsfZSicyAn6yk5qSKZVhldwNWt+zEO2L/21FDPxoKusLz8lTJkQqE5uC34NBKNZ0oCMykBT7W3RCt6zfZeJDjFKXNj9o2lgGaV9LW9e+nhvbgc6KSb30CDvR79RoaaGgG4VkabOszRhdxQqhmK6Mu98j0SXVVeVWihVfs6/bWGumWHdW2gv23ObJUgQj9+0WDl6PhurPiTSznMo2Umg5fc87gnlEMJCM8iTNEl7364HDJEfMzlQlBnhZr7k2pD0i/yKEqCKgV5ITNtXzRRlFUUgYPxI38blB8Ufg289d/E16CmECRGxqpLJen7HjptdtgJkqJc7klbazX2s+TgEHV253Sp8lRCGrvaDHZ/TaQD2JRwxnQy5Zq8y5pxfrkzqVp0s1YIXsyfvBSYQOLinX4jUf3CqXnlO+DMvpiM8izPaVhv5zh9WoPNsm0+N46aCNA2wXql6lHFxRWMcfKhjSC57EH2PRmE12is9EZsyOnez8gUq87GHotffVv1+9N+rrPAoBCHgFbb8HNoXai/oWjr3WCRf5kBb3GmLJV0Zhqhk6OE6TMFrJBKmV45vgSIy4bak+TMHbF370a9O6PTijuiBxklEpmrGWwequ5Hb9cVDtPfXBRLAwXVD/jXZf9OReOrfGAUDBSw5Xa/F+NJVa0EeASbbLNv3TnJFLb7kVPsRI9X22hTu9Wzjm08RDXtdSSgbkiYyTNoFJGija7eSR2CDSXvBVVrddxjEFFnTq1JaQ5XhXdlgRbf5QF+WhPtmliNAZbKtnV9YXbGdjepRxy+vme6vvFfHSTB95TpnZz4N6ntLmC9BgAfDqpSUcafsypeOFoSeNZnNVl5tM7trjzLmmFd64MjNhz0OomyVjvFLzbAGNZNIJCggyISHIuaTIiYbqaiGkVumrJ+UJVmkBD6t4IQ4QyNY41xH8PYeqyJnLXxi2cNRH1ubMpQeixa5DaE/UbuiWEFLcJb4D+62BnHo1JIIGaRf6b6Rl+5x2UusFuW0/iDShwnvH+Ll3RxxZ8yv4OleFsA3AfpdUI0OVet+pX4632xfHibQ91/T0+PGEPEz2lkQ4335YXqyU4SlEPGtV33eQUUhKfALy92MOWAH5NdBfrewN+pvm9nAADisewBCkv7V+kQxclSn3tinO2DbqT8f5xXpq5P4u5C3Hr4Sok1RsJh6Zb6zWHcaZYLJHz/vxOdfCbn6Op7MnHCsmDXwKWYIXDvc1sgK2ZmvZkyJlHvcKHMoLCdkQXZOl70EvW09y5hBCnwnyxhHtt27AQjyILWJAWAYI2TdEkUQ4JT9skqAJk8mic7lPwJS+IqikedXYLbv1+M9luVm3aDmudrHdm2/iWjbA3bVSTXcog990bUZbmS0obM+l90M9pxFnnX8Mqog48GsB6SI0x5sv7tFUdZfB5Q2bDvxw1PktKE3l+5lEGZ8Ui/5GoTTXNOPX0Sf3J5SLl7zrZfcsUbeibCdrL/48n2vW2krmLcpQqUAcC1UGXaW4BG8PF9ekZQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17f2df16-b668-4171-7763-08dafab46b50 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:22.8620 (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: h6p1dJgI7cg9nKZez/4XhLMOXiLuwpp8WDjLZkPpcaFj6mutKtbr9Zk0+6O8FWlSmjSKDQnFK70/psHj8U5Y0RhNCzLVawBDWfyArcj3KOdmmZlvPqRXsaEzNY58YE8b X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9821 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/sof/topology.c | 104 ++++++++++++++------------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 560771ba8fb9..e9a2d4a240b3 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1055,6 +1055,7 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp, struct snd_soc_card *card = scomp->card; struct snd_soc_pcm_runtime *rtd; struct snd_soc_dai *cpu_dai; + int stream; int i; if (!w->sname) { @@ -1062,62 +1063,41 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp, return -EINVAL; } + if (w->id == snd_soc_dapm_dai_out) + stream = SNDRV_PCM_STREAM_CAPTURE; + if (w->id == snd_soc_dapm_dai_in) + stream = SNDRV_PCM_STREAM_PLAYBACK; + else + goto end; + list_for_each_entry(rtd, &card->rtd_list, list) { /* does stream match DAI link ? */ if (!rtd->dai_link->stream_name || strcmp(w->sname, rtd->dai_link->stream_name)) continue; - switch (w->id) { - case snd_soc_dapm_dai_out: - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - /* - * Please create DAI widget in the right order - * to ensure BE will connect to the right DAI - * widget. - */ - if (!cpu_dai->capture_widget) { - cpu_dai->capture_widget = w; - break; - } - } - if (i == rtd->dai_link->num_cpus) { - dev_err(scomp->dev, "error: can't find BE for DAI %s\n", - w->name); - - return -EINVAL; - } - dai->name = rtd->dai_link->name; - dev_dbg(scomp->dev, "tplg: connected widget %s -> DAI link %s\n", - w->name, rtd->dai_link->name); - break; - case snd_soc_dapm_dai_in: - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - /* - * Please create DAI widget in the right order - * to ensure BE will connect to the right DAI - * widget. - */ - if (!cpu_dai->playback_widget) { - cpu_dai->playback_widget = w; - break; - } + for_each_rtd_cpu_dais(rtd, i, cpu_dai) { + /* + * Please create DAI widget in the right order + * to ensure BE will connect to the right DAI + * widget. + */ + if (!snd_soc_dai_get_widget(cpu_dai, stream)) { + snd_soc_dai_set_widget(cpu_dai, stream, w); + break; } - if (i == rtd->dai_link->num_cpus) { - dev_err(scomp->dev, "error: can't find BE for DAI %s\n", - w->name); + } + if (i == rtd->dai_link->num_cpus) { + dev_err(scomp->dev, "error: can't find BE for DAI %s\n", w->name); - return -EINVAL; - } - dai->name = rtd->dai_link->name; - dev_dbg(scomp->dev, "tplg: connected widget %s -> DAI link %s\n", - w->name, rtd->dai_link->name); - break; - default: - break; + return -EINVAL; } - } + dai->name = rtd->dai_link->name; + dev_dbg(scomp->dev, "tplg: connected widget %s -> DAI link %s\n", + w->name, rtd->dai_link->name); + } +end: /* check we have a connection */ if (!dai->name) { dev_err(scomp->dev, "error: can't connect DAI %s stream %s\n", @@ -1134,37 +1114,29 @@ static void sof_disconnect_dai_widget(struct snd_soc_component *scomp, struct snd_soc_card *card = scomp->card; struct snd_soc_pcm_runtime *rtd; struct snd_soc_dai *cpu_dai; - int i; + int i, stream; if (!w->sname) return; + if (w->id == snd_soc_dapm_dai_out) + stream = SNDRV_PCM_STREAM_CAPTURE; + else if (w->id == snd_soc_dapm_dai_in) + stream = SNDRV_PCM_STREAM_PLAYBACK; + else + return; + list_for_each_entry(rtd, &card->rtd_list, list) { /* does stream match DAI link ? */ if (!rtd->dai_link->stream_name || strcmp(w->sname, rtd->dai_link->stream_name)) continue; - switch (w->id) { - case snd_soc_dapm_dai_out: - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - if (cpu_dai->capture_widget == w) { - cpu_dai->capture_widget = NULL; - break; - } - } - break; - case snd_soc_dapm_dai_in: - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - if (cpu_dai->playback_widget == w) { - cpu_dai->playback_widget = NULL; - break; - } + for_each_rtd_cpu_dais(rtd, i, cpu_dai) + if (snd_soc_dai_get_widget(cpu_dai, stream) == w) { + snd_soc_dai_set_widget(cpu_dai, stream, NULL); + break; } - break; - default: - break; - } } } From patchwork Fri Jan 20 07:03:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109297 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 B021DC05027 for ; Fri, 20 Jan 2023 07:07:37 +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 E1DFE2E1D; Fri, 20 Jan 2023 08:06:45 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E1DFE2E1D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198455; bh=yQepghdZrcvCm7h4uwL/PRBbPFACmaaDrTIVfJGtGow=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=mrhd0bEX2Y+1Oz4fOg97xbaiXAFkZg+AZCS7BsfOw2MbwtP21xmeOmsK295+D7tq3 j62qr6GwIwua0H3oxNk3dzMbcx63stt8repwtazaclnQAEZzpCtMRgWAV7DoQFvbyJ jdgR3lbe273Nh3hz7zLc1wHWuWQ0QBowXLUjSzsU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 42755F805D3; Fri, 20 Jan 2023 08:03:38 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7394FF805D6; Fri, 20 Jan 2023 08:03:36 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2132.outbound.protection.outlook.com [40.107.113.132]) (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 740E5F8024C for ; Fri, 20 Jan 2023 08:03:34 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 740E5F8024C 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=OS+mCJDZ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dW1cwxbhJ2TYZ4JkcmCzoAxXWszQLoKZaSCBF9KboMDRjgdQy0akw8NaLJq3RhMJx1S9GmHZA2UtWGmAnd54segNUMO6uHiZsghMlXRWQY+2g9QFvHfyc3C4BCg4JCb69cpNZM47ulA3t9m+yiOjpxA1tUnb79vxTjTMMa/K+Qce21q3Aqn+GERPIuiN7HfZKlmB3KJBe5p07e8MTBoPnVj22Ke/+VuZFP/adnbjKVnbtMznGl7sYaz7DhjxxRMnbIOKwT4HjDNCOBvWA4I8AgCv14mzE2t7O7AvbsGHmguwCAjUn9InxDwCx70KrQtOPy2Y6GqxAIxfXUqTtgiyvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=KG7siTEsOEZfn7FQUjkFwjTNKSzkDLrUM35wgbsLNZg=; b=Bz99/sh3UaenaOVUxDpUtO/k1ZrxTssqhUkfeCZnnAq/RAfKt/o7yMsvBBBIXsCI9obwgcUgd2ewsxqNp4qvgusjYRio6KS8sByZpkDDFQsrGpUL13NJffdNOVQPKK27o+Bw/ccCYNC3b2X7r0CaxWhQbaEEddr5uoBwrDuv6M4olaOAUCvG5Rmg0Y+7DbsFVUPIk0Ee7X4B62BI4dpYjxyyBVhTtENr5AUn/oZ1h/i3tKiqbz/ZarkPphxRL4+UdUva3bXZ+GUXw1vVcSUVG4ZE0FRX16bsFpV/rQFc8Rho3d5sc/doYyVLG4wRJ9qR1hdkNsx4j4yJFo4VBQ5PHA== 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=KG7siTEsOEZfn7FQUjkFwjTNKSzkDLrUM35wgbsLNZg=; b=OS+mCJDZQcJQaQ0YO4i9AHZnHGrD1/BHxAVTqqOSiUCE1DxuS3GCdQGrz7stkzZXo8WMNVqMbSFwIY+BTXQO6pQl1kgrOQDIwG418EDpAiSjMMwpYAX225mFzf4474IYZOEz8CyKDq23Zqp/k0RDhNo78BjhZfMNEaiTH/73A8Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB9821.jpnprd01.prod.outlook.com (2603:1096:400:233::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:03:30 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:30 +0000 Message-ID: <87k01hk7r2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 18/25] ASoC: tegra: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:30 +0000 X-ClientProxiedBy: TYAPR01CA0119.jpnprd01.prod.outlook.com (2603:1096:404:2a::35) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB9821:EE_ X-MS-Office365-Filtering-Correlation-Id: 8851868b-b3e7-4ef9-4fcb-08dafab46ff3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2ZV0evSKLz7/2d2NsZu3RYzaOZjgFNYGK+WZcYw/37reCx9K0XTT9V+zpYCoGXe1eSGn1uQPtOlVKfZ2RNiuRRaJrDq4r713aaLU7ngr9MstFeLGxBZ4TROlzRT+PUHaw+Ph86MiKfSC4+Sxk5RgVSn23EF9RTQBuAaEVJtOy2oB6rdwBXm6hz6SQa7yTFEFmkDRzwp9ZOJ4KGt+CLIHzDsTItfltwHBNo9MjUruF2XH+5ms3C7+s+9KrHzXsO/uGJLyKWzF99luR0ZgVtbhWWMxSepi2R1/qaKRxiqAu012eECrtN6WqoIaBifaJJx6+oittfBjojdn57aHzYsFG0DeBAS9LU1hFRQQ1bf8CahQAwwsRzly1TucxZs688QKyycFSFdl9Q72pWnxbOTRBWeI/2Z2E9W08I4kB5pDYI2i3ArT89pmr7cPGWfVaIUdas7COhWfz9iElKCKRxSRusn2pyTvcoIWpr3tAmu3HGVJyjh9O3mdv0m0cnR0HdHI/v7TBVDJSUo1aW+FtuMHQDERgXT6fjYnlBFv7gqFmFNUHfD3CKwLbcuMYbASKLglY5nzojBsqCQMMzuVSByDsBSBrrNd/1HxRdOlCMW7WJXj91HWY1S18mMTTxtIM9WBlvft5XgjCZ/ApKE7ZPmS9pdOpXd3+MDMrcsYDiLhlzKLUm/GA7l3IgxoQAIhPFZl X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(136003)(376002)(396003)(346002)(39860400002)(451199015)(8676002)(36756003)(83380400001)(6916009)(66476007)(66556008)(66946007)(4326008)(2616005)(7416002)(54906003)(316002)(86362001)(8936002)(2906002)(38350700002)(38100700002)(5660300002)(41300700001)(6506007)(52116002)(26005)(6512007)(186003)(478600001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 25K3Kj0xGOaPIJ0YDAraZE+iuejH5Shn6fesIfu6pNdybXKP4AjxuQzIk62CMYF7qXCgSac4T5QWKYn4ZrhdXOw/W9GeTkDqjxw4rfOGTlG47AYmvjtDrvmyBOngcRccNkMjO1/cCpnoe3dMN45e1MZ8oHC+tYSlFoCEBpBhiY7fR0usHNuoprtTFWQ2RwQra2JefPDy5jImu0QLBrqXFEd/yWTvKKoBnkhzeF303iLz1yMfq5FeXmxuGgOiMxZ3gI8+6iRDaN1uJIRPjko3F5CqSLnpH1mbaoc1VRHjcQP2we4jU96zUApjGMyXjHxqwDrXNS4lZ41SJrfe502cd0Z/QNz/1x4/vldWvlM54vT4Cx6aoRaYQ0rG3qdFOmSn2+91/LBl7NFzjE8eUi04JMwHdFEEKIEHimmpE1i4+n78mfmuLUqb7bIY6cy08hQ3we6TOJrGC5OkUSFWOxPAEYaV5uwS0F8N79HyF2yIxnFNjW1ehcqJLH1T38Sk9Cck272LUIfjuVB/YGsY2JDgIgpOYr2f5D3Br/D6/uKK/UXnOYvlWIcrpt4XUPutRE5VWU+x0eMvu/tiWHXAM1zh+XkIXLkeUjcni2g3FeIW0xT4ot0JLA0xZcb9yvpDTx10ZdI23Bwv3xx+UBVtTFqFsN3i0gyN9gC0WaGvqSUaCKvOx6LB9Oiq8d/AMT0aTJ7OIATGqEadjaDqPn//+1YWuD6IYefyj55lWNhJRVNRTiDfRIfqnmzOu7ms7F7PaVe/gH20/T/0eKwJz7GjgZRnYk0bPt1SKQ7+nEe4S1b4f9KldOerJ0PcKTX5EoQyE27yHaTkIzSdQ8DGF+EuVhczrGDAD5LsJAvXAVXNnAj5M3nwdNtv1pwEcnORmpVWM7h9CjcsIM1mHzxhFED5L9ccSybD+LUovhraP7UMNH6tZfIm4X1VLPVwSz+tC+BJci10FpltaXShULgB1Bmmi83fKBvTrnEbjfvQ9pesjwon7ydC2KctY9Btp+RX8+jDnEKSbGRKmKyvi8Z+Tj+xbkLKEyR2svKclCBpIUT5wtWTcJJEpwiMLttRJXdY1sq6MBkt0dVWGadH0uJYPUfaSvn1rHz6QuUXVr0/uldSE8c/ss0v74ylmcHITSn0S0QOVXVddzRQGbv9gmTG5b0sB45iqxRzuyKKVA2UgMC2rH8y+vMPIiv5lWb3PRWB0DgoKRNmgttejZFJwqtfuUfYVxDqun0DHjqvLLNK/f2UpHr7idMtF3iRy/iidTXjr0i7JFdeFw5kxpP9UVNRluT0To3tzQCfE3AWvNQDdxQ46tRSxGrijKcU4TvjC3Eo4Ae2FnY74JDUTa09bDc7ML+nqeIilhIkNQ9Ip1eAvRra1wXaF0eNLAnoG9KqgpeZbGcSzGuGzJ5dDUeaHAV7zpXECnFslIBx7z2kImBuSX3NF+afOY2QDC2Jo1BmdBEVFShNr4tzmuTsNeJ/LMWZCOL8EB5oIYw/h1aTy3bqweTrSBzLnBHgdglQF8B+mJK/10fV1p5p1n1K+wRhlYDZ3ZDXhgUhhczzsKIiF2pjJEztivPJzSgMrpFq6v69aKWRfvuhfnrwOSqE5iZVfhOfEx2o5kvMmtxgsFG/W85M4B/gR/HJYNo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8851868b-b3e7-4ef9-4fcb-08dafab46ff3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:30.8119 (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: jL0fVeOqfMr4Om8Zlviz/hOtnqEQDaRs1LG9qi/+XSAEmFOU3q16HD6Fe2M+WFasT0PTDCTYTKUEOkbFc6bkX9ZsmMeARRppxz6lcRuGk8cc6j7xfuhqM5w80RpCauhS X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9821 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/tegra/tegra20_ac97.c | 4 ++-- sound/soc/tegra/tegra20_i2s.c | 4 ++-- sound/soc/tegra/tegra20_spdif.c | 3 +-- sound/soc/tegra/tegra210_admaif.c | 4 ++-- sound/soc/tegra/tegra30_i2s.c | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 87facfbcdd11..d23d88a10899 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -212,8 +212,8 @@ static int tegra20_ac97_probe(struct snd_soc_dai *dai) { struct tegra20_ac97 *ac97 = snd_soc_dai_get_drvdata(dai); - dai->capture_dma_data = &ac97->capture_dma_data; - dai->playback_dma_data = &ac97->playback_dma_data; + snd_soc_dai_init_dma_data(dai, &ac97->playback_dma_data, + &ac97->capture_dma_data); return 0; } diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index fff0cd6588f5..d37a9f2603e8 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -256,8 +256,8 @@ static int tegra20_i2s_probe(struct snd_soc_dai *dai) { struct tegra20_i2s *i2s = snd_soc_dai_get_drvdata(dai); - dai->capture_dma_data = &i2s->capture_dma_data; - dai->playback_dma_data = &i2s->playback_dma_data; + snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data, + &i2s->capture_dma_data); return 0; } diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index ca7b222e07d0..86bef54dfdf2 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -236,8 +236,7 @@ static int tegra20_spdif_probe(struct snd_soc_dai *dai) { struct tegra20_spdif *spdif = dev_get_drvdata(dai->dev); - dai->capture_dma_data = NULL; - dai->playback_dma_data = &spdif->playback_dma_data; + snd_soc_dai_init_dma_data(dai, &spdif->playback_dma_data, NULL); return 0; } diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c index 1a2e868a6220..100a2b6e6063 100644 --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -544,8 +544,8 @@ static int tegra_admaif_dai_probe(struct snd_soc_dai *dai) { struct tegra_admaif *admaif = snd_soc_dai_get_drvdata(dai); - dai->capture_dma_data = &admaif->capture_dma_data[dai->id]; - dai->playback_dma_data = &admaif->playback_dma_data[dai->id]; + snd_soc_dai_init_dma_data(dai, &admaif->playback_dma_data[dai->id], + &admaif->capture_dma_data[dai->id]); return 0; } diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index 10cd37096fb3..c26f960c6afd 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -297,8 +297,8 @@ static int tegra30_i2s_probe(struct snd_soc_dai *dai) { struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); - dai->capture_dma_data = &i2s->capture_dma_data; - dai->playback_dma_data = &i2s->playback_dma_data; + snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data, + &i2s->capture_dma_data); return 0; } From patchwork Fri Jan 20 07:03:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109298 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 C861FC05027 for ; Fri, 20 Jan 2023 07:07:54 +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 17E822E20; Fri, 20 Jan 2023 08:07:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 17E822E20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198473; bh=hZ4qmIsNr1IYsGbCqfC71T9AvkAFMeaLktbP8HlCfzk=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=qLeB++QTLgJNcPboQhkTR87UApY9Fup53JFXNVeiO4mQD+o/FXzkFGgR0dIhjb9s3 AEwtjl1v74NAJNCNTwj2B9EKgsoXfsWO9Ksv68w8VNQk1JlZfJJfklPMKAj+92IB/G qBZJJc4ScwqfEjhgqaDqzZYf+KPwQOZyA5K7Dnmg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E29F8F8053C; Fri, 20 Jan 2023 08:03:45 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AC5F7F80542; Fri, 20 Jan 2023 08:03:44 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2099.outbound.protection.outlook.com [40.107.113.99]) (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 A588CF804FE for ; Fri, 20 Jan 2023 08:03:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A588CF804FE 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=g1ypfZkc ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U7RHV2gwPgIQmBOZVg+4afO0mworw9Rt/oI0FjhNXPqLkNsmDok0PH9MiAOEBMXUcdp1uztTd08e/zrjYOwGJZIfQo4crXlcLVnldmciGP3eb7SqO7t+5LP8a/xDqCJ/nxzEZhWe+AB11IUcwp8dyw76q/flBjQI8MQ2BZnSD2JmOGu0rMA1hzdpzprKJFRMNw4RTK/Ca0XOM0mTPVPA9UWn+a1Rgtr/NEFUZaJI22ct/1TbnAbPYObRcU8gT66kIPMFQn73gS1bDGJOxh+FwgUg1zXAZVtSge/ha7xQZnOWYYjfl/H/Mu5AaTwZZ8feGi/ND8+nr1L2ZCR5Z60etQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=BrHPqV5fcL32FYcfzRLgfjorM6eh7YfLrn6q4GN93jo=; b=J1Dnhlc31hXEGZaTflAWwZChcg6CqfM0L2sd/UsqM39jWwXaqozzWzLkjNZiS1wdBoxKRDNFKia4mhgH4gqoQc7+MFjS5FjhW64Y266w5953FL818jc08Dp8y9FbCmV/HbjvuZRJYt4T2kd5Dgxj+/+fvVK7+MMqFyWuIeGmCIPqm+x9zGtrH5xfz1/BZEXqfR8nff8uW3yj8ISOhmhp+/gHEdLBM7HD3K4duijCt1ciePGMIOKS3+RE9VKryY2HmBbp09N92Og7LnGC02XOH2OHKfmPSRjjMnyGVFzv8LaIp0X09Ph70pHD5GMkgT+O0az7siYzfp+WGh4fE046Yw== 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=BrHPqV5fcL32FYcfzRLgfjorM6eh7YfLrn6q4GN93jo=; b=g1ypfZkchyXhM3c+CSMaNTGD34FLcCL8JgG7jo6vdMc5t8A1kSZYJyk9cO4Sd6OH7VneyEhl7CuC/ZPc2cN5+3QLBRfG/M2d6DI0J/DJd2maTMYM7RbewF8UgWe6G9AY7qGX6sF2M4LOusYREZpiAp9m+K34j0tGujDG+jP28QA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB9821.jpnprd01.prod.outlook.com (2603:1096:400:233::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:03:38 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:38 +0000 Message-ID: <87ilh1k7qu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 19/25] ASoC: ti: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:37 +0000 X-ClientProxiedBy: TY2PR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404:a::36) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB9821:EE_ X-MS-Office365-Filtering-Correlation-Id: 92534383-8d5d-4ea3-282d-08dafab47459 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RI0yOpyvWEdl4yo+/0k4GpzxTW6MMPV3979N5757rdLfTZG/r9YnRaHBD4mOKW17lz+rp5AAU9K33K9wjlbJBExH7TBpwSQ1IpQk/iCcYn4YeKKkYtLK2B3QzQ5CW5Ygd5qD0DtVY86F+9DF1G9MSE01qCtoXJXwTcNUcwvY5eSexhGTvdjTmPiTOL9DNTMNMAV2f0XADbEKz2YkNhlY9WMiekiniFU7u9fkWDJoCMENt0J9lCLLq14FaTlX6IyNN7Bb0hV5cxH+Sw2wyFXxJI/c/ZRU/WbOjIJPe6to9LRvH5hm050cgpIT59gqfzkmmg4IJCoZ8/uqCfbyhV1vOhd10zCNYdxWR+744vAudom51YwPCFLe4UopK+jCR9gv/WlmdCy+tSpvghhpydH3vuYScPA8nd8K/+wlGKaKCfVvrDPQFi6zfhvwueT4jY3fAT4L1yJkqoTWyeoB02rHbhwLYuff7UsjnsSBwchy7zXBLfm8CsYmMXFOPqyiU90UImHtcE2im7O773z4FC2XogMyG/0pmuFDRRm9ducYQDY7XVSD7PPYkbk/sAYwfX3o7MXbOLwaPKdSLFFHZ6ZGrDmN61YW6GNxyQuIqKf5PclJy4o5mLbl/bIYcuLR1pIIJD7eyGFYShkZEygZfpM33QjykW+jWFd7co5CDd9vlij51fIVLlBtC7b1VxyR1t5g/+9giSnUlc7E6Zs75DYbxQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(136003)(376002)(396003)(346002)(39860400002)(451199015)(8676002)(36756003)(83380400001)(6916009)(66476007)(66556008)(66946007)(4326008)(2616005)(7416002)(54906003)(316002)(86362001)(8936002)(2906002)(38350700002)(38100700002)(5660300002)(41300700001)(6506007)(52116002)(26005)(6512007)(186003)(478600001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5s3o5F+LcRQdoYaKqY+Mfxfqgb1nIZnnOc9QBm79YAXWdj+C54F6YEEaeGWsWxhi92LHRSeys38r1I7amuG4ZpE/GNTTsH2f5Lfcgarx46vMw12szPcR6d4PorEXnqjSHh0gEgya+6Be3fdI6RvfuYZXf8kNE/bSJ9VXNChNLEJMG237RTDR9YlpJ/2B4cakpMt6Sp5XmNlvFwg8G9GCNgd0WMOjcTa/HGdFA/5jrjPRkPMuN7zryzJRvyxAATNiKtcXcfYRwwoVaJUc0OuoLbIb5kH5Mn+r7vfs7xHZWzjfdpf6ohrnr/bk72AQvDuJF66ejm4Y99QBwQuYxDsOBvHyWidWkKZZ3aDfN52Mf5o4tVIr9OdK6f0Ym7xAy73H5lrydQGepUBpCoBSMiGZijQmKeJLiNdKf5FXKfCLuBCY5YU3OJZ1ytWU26GPTy0jxZlIlHXgbvrimVK47OipQ2QGZSw1S6NWK558pp3VSmsg0yfxLm1rz43AFzdXXg/dRewSwcVkMPrwtvRRB2q7KkF9PK/+W+5MvxGIbRaPWA/zoaQf6eL/XV1iKPh6N+akRLfp9rhqOtGc25eRjX5nVvV5TVQeWMe7o5W1Nbfnlskgm2piaSLaUo3PWGixt/OL906hHEM4dn8erqga7yJMbOhlUPcvoRm23RBT6RbxfXGH3hzMx8k4S7C5fHbxfhtMk7smLL2qYcdiXdRVpxpr1hKTDRXCyt48OhrBF7E4mxZt3D0zBCbHJyA4WrTNBDS8mYxkcdYBHN578pj1P9Zm2niU9ob5F9dGn8nJ9Hq5l6+M3wPL/Ojq21FaKTn2xK0p1DtrlHm/uno2FAPTbQJO44dba6ex8i77UsWHEwTJ3BHXDBg5un+qItt/xSJi7+R2jqaXSSCIVyRd9BCTTLYAt6uwdy/+lEg3uUqFYzTE1PfD1ik5qxaRfoYwwf9xj+GPeAZVFH+ZL1qZvd7W7JNvIMsgpnZYYL4W3hWdBTFrioQ0C+20f2L7YbMT2oOnD+uk7l1wikEJPhO0OyNoB+sYiBY7yu7BSPftQZsHX6iAspMVBa4edTJpmSGrjvuLfA1/SE8EDwz213W/Ft1Y7a8DhnoxUE0GR7tDTyoj+lQ+bQvONlVzGw+UNn2GejBKZIGPuE6lWpi5r6jbMGoAJRIuNNfxLsjnNQUDbTd5s3NH8hVIDz7nLk45GRcDAvvTdfU3L5iAco2W/VC0JXpI1QIcNWenpPUeF1oQc4XPdGVEpfZricElZkAI8aBc7MWo+VSxIuEdlp1IiqjCFqjWCxSh+fdEgxH7NACAY4UGhP8kdIArk10/4CLfJjZC/Goocm2IXZ3mw+Vp3gk8lfWLuwCIT9o//ckh7prj/15CyPPY+27mJYoBzUudZ2mmJicvbgZu+spLSEmrs8Lwc/BpUxNyQd1/2CtOu5o04E9ejW1hQ5bk7D6F+bdU32xTF6Baeh3trqKtg1vDV/qNwyYMsdTjpANFLDaiUa6/iNjrqKONeKbdqc9hu8lBv/rPsldV2k4oyu4N/J2goF7DFGmjHdX/FJSb+tcndlHUm7OqAF7xUV5EUrgCqxrVquOzjgR5FWtwnjPxYQHD5ulNDML+O6+Of/Wms6FzQOthVP07e7qIEWE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92534383-8d5d-4ea3-282d-08dafab47459 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:38.0653 (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: G0G6gNL7XQSp58s6MCraOXnUopvWlTHSiRqsm/yiMQvmQx97ERZnxJlOgCqdJk9nt/r941BVm4aIxOgiHGh1Rn1HJgjSG5GjEkbN0Vy1cmnnG1uHtIhkGkYvbezyZe/L X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9821 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/ti/davinci-i2s.c | 5 +++-- sound/soc/ti/davinci-mcasp.c | 5 +++-- sound/soc/ti/davinci-vcif.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c index e6e77a5f3c1e..3ccd0cfca008 100644 --- a/sound/soc/ti/davinci-i2s.c +++ b/sound/soc/ti/davinci-i2s.c @@ -614,9 +614,10 @@ static const struct snd_soc_dai_ops davinci_i2s_dai_ops = { static int davinci_i2s_dai_probe(struct snd_soc_dai *dai) { struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); + int stream; - dai->playback_dma_data = &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK]; - dai->capture_dma_data = &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]; + for_each_pcm_streams(stream) + snd_soc_dai_dma_data_set(dai, stream, &dev->dma_data[stream]); return 0; } diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index f5ac2ab77f5b..578254549d2d 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1699,9 +1699,10 @@ static void davinci_mcasp_init_iec958_status(struct davinci_mcasp *mcasp) static int davinci_mcasp_dai_probe(struct snd_soc_dai *dai) { struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai); + int stream; - dai->playback_dma_data = &mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK]; - dai->capture_dma_data = &mcasp->dma_data[SNDRV_PCM_STREAM_CAPTURE]; + for_each_pcm_streams(stream) + snd_soc_dai_dma_data_set(dai, stream, &mcasp->dma_data[stream]); if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE) { davinci_mcasp_init_iec958_status(mcasp); diff --git a/sound/soc/ti/davinci-vcif.c b/sound/soc/ti/davinci-vcif.c index 36fa97e2b9e2..fc16b3b8f71a 100644 --- a/sound/soc/ti/davinci-vcif.c +++ b/sound/soc/ti/davinci-vcif.c @@ -161,9 +161,10 @@ static const struct snd_soc_dai_ops davinci_vcif_dai_ops = { static int davinci_vcif_dai_probe(struct snd_soc_dai *dai) { struct davinci_vcif_dev *dev = snd_soc_dai_get_drvdata(dai); + int stream; - dai->playback_dma_data = &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK]; - dai->capture_dma_data = &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]; + for_each_pcm_streams(stream) + snd_soc_dai_dma_data_set(dai, stream, &dev->dma_data[stream]); return 0; } From patchwork Fri Jan 20 07:03:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109299 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 6E0B9C25B4E for ; Fri, 20 Jan 2023 07:08:19 +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 AA8A42E1C; Fri, 20 Jan 2023 08:07:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AA8A42E1C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198497; bh=OtB0k7w7C5eN3fH5vimG8PR/80l5CV+fBviQ9eaoiTc=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=VN9dfR5xBZGECDq8/d7l0GM5PsEPZkLj5BDBDZDE88x7/lNKvJBtLu/9cUINx+YkF mgda9T/FXp+YHoxEkfWSfUnRNKhBspRCtf8eNHBQ+yBquGDFVWNjchkRDxX/zcn8op E+LpkOcGv5gicm7ku91gJJC3So0LS6VY2uUkDkbo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EEEA4F80579; Fri, 20 Jan 2023 08:03:56 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6FCB3F8055A; Fri, 20 Jan 2023 08:03:55 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2131.outbound.protection.outlook.com [40.107.113.131]) (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 A8685F8055A for ; Fri, 20 Jan 2023 08:03:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A8685F8055A 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=ft0U9X0p ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TA3PYdARhE5BCJwHq5Cr6kDpfW2zlB29Up7CDS8CDCTtdbEDhuupMPr5uiYDOwsRZeRKtA0cbbLc1AjmOY79v0Q9SNZU+Mqa2u+WcqH57XYgri4woOomJHhh5GmmufVV6belmcgVCMhBYRwOs/9x0ukS85BIu+SeiVQZlzG0ld4BJJ7KjFixD+1i5ZKQ4YL5vzN193T+QeXz509gy05+R+0mbT8itSm7Tzv0ORyqwfkCFn3yhP9Fex1X/HgfmAaRzlxSbzfeZvpVG+Vd/Z55L+jbJT08T5ZSrvAolmZXBJ0BfMDnzcok4jideCUyVJV5WWedYmNPy/QTgUgZE4pyyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=STP4KVKhcbex50z8uqxnD2lT7HkMp/HK02DknQellPw=; b=CFyNyD5NgRC71p6lJRdia9+KfFawgX0kSL1P7sS12b+X3qNSaRB9TPLTTNAO8fEAg+aQnm1m+MlxT6FoWfhNoIgA46jp/q5290D+6QDelRM4lzM3DuF4UyrFtKS8ne8TB05cMvPyzWcA5F+nyOkhBJgsIMr94LBWWn4oIYQUGJrYOXWN9S860GVfCkygUhms3sVk7Doe88OK1z1tgaE+Alig+hInFAU/ZSwjFbtPpTmr4JocMwUN+3f8Lhi4i543GBMLbNAiTNj3gI4CMOiD4bTCoNgpcRxJlu4cGZ/G80YjxPsBheEyM676PM0BlIfyHGJPZGRgGHOIjpObKqiqsA== 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=STP4KVKhcbex50z8uqxnD2lT7HkMp/HK02DknQellPw=; b=ft0U9X0pE+JO31AIHwIpSg2WX8PjQt9RpDfnFFrew8qxucPIYhq9xs0fxP1RK9+mXZ9VUN1DhXmzc/A8etq9wgAXYTdSUJy4yZGBBLET5uI2EXu4NU2UTMC8J1kvD9oUsxpTqmdkRaG37OYG/7EoLLAdadifJz6ilc/pW30hSEA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB9821.jpnprd01.prod.outlook.com (2603:1096:400:233::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:03:44 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:44 +0000 Message-ID: <87h6wlk7qn.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 20/25] ASoC: soc-core.c: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:44 +0000 X-ClientProxiedBy: TYCPR01CA0191.jpnprd01.prod.outlook.com (2603:1096:400:2b0::16) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB9821:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c7e00bd-1dd6-414f-df5b-08dafab47866 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PuP3KFSF3lpg+PyCPM4NvNstxwlxmjhuGUq5n/+AgRoLyLasGyizxH9kfxwpnhgoNXG0vLX74DP5raSAWMhQKiOu4gzkaGB/1YmHLFsYjuvIjGipiQ/cmib18dHLaIlvcNTCExNH3DdhoP+L4CMttGUZqlWtAFg9kc+eSHsAGkVc6FjuXRfBMDpdPa9bn0vnMOQrY+OdGV/AZYIi4G/xTpFvA9/9ftnti+bPrYv4HZFQh/+Bc9/1ywagiqN1P+tLtEmMqIYzKfKw1uK8kFIZo2/47S2TrlHMizESoOa9v6kn4DBKZSMCZ+WNekISN1hdj7oGy6MzBwqCq0xN4EvhaUqFiHwZITLnWOQnRuBjf5yEVrfXiZLweG2A3uqiw08Aw5qv5nP1adpWDTCt5GiXBqKRdmldLxf3jvlF6oWwbtzv+q8uY3zvynacL767b+xhqdId2B7emLnBS8IWglxz2Iv/iWkeuy7rvdQFQkvrk7o7/S48aLmQKd+TuW4XOSJ3pYkPdLEjR+78Sr4QHjzywozT/c0ayozB5TjFiUxFaOHtdEBF5hc8u1dWiDO+1RpMlooYk0Kldq22s+7jF4mRBbgYaFs5LEoMXO2HUvP8+mBcxyIz37K1LTveY6hewPaFO7Hdmw+XIIKCnOKyA4tg9n43SdoMcHl59C0Sld3zdB3r2ydl/YLX76Esj6qDax8zjDMA92kCVza4R5KXQH5Fww== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(136003)(376002)(396003)(346002)(39860400002)(451199015)(8676002)(36756003)(83380400001)(6916009)(66476007)(66556008)(66946007)(4326008)(2616005)(7416002)(54906003)(316002)(86362001)(8936002)(2906002)(38350700002)(38100700002)(5660300002)(41300700001)(6506007)(52116002)(26005)(6512007)(186003)(478600001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rk+SpRB7WeRlnZRRFHyepH2yi3fQIM7mcSj/MzwHepL033hU7Q5cVJl+KtMvSOejwY9SZT/E+PJUgKT2vXCeyEtnri0LEztxirLz+hpjla09HDgo8k0vv0dkL7sX7BRNJgn3Hphww9CiqCoensEQy3MD8pDWmtXsEi7zXYncFbqNVBdamphAx3GTi40IKKXkyA54FVh5WJN9k9jhtNEMl2nq70toHVhZCfUjZ10b+9g/33uJyADc6/lwpfgObNVnkw6/H7O1wxQWJVYprlHffL8WBFWvShT78hOGG43OmJv9Hy6wzSNtg3y9q7yvxuHn4orQNlQC4tI4uhN1oG9Nh0HdeUPva6U+cUxa8q9JlmvsfFFdxC+G3/MYj6pa9gixzeozpDjKy8HmPH0znTceBZz0+05QxXasmAdnrqZmdwt6dwFtTZD92UIVkfg/lSKmkJ7Psa/rJcpSJdSMX0yZkZKjhMEaMQTCtDL4k4o3W9WQuKt+k7DKuQkDiwID0pOKfprSkU0yTjBeXIHTVsVR1sv22L/OUQDRwaroBFnZwftiD3E01gaFQDuIUXPyCRk8MiSqflJf+CP7AcPJhr5jkBKV3G3UrOIm4LFK8spDiChkmY37SA4hC8gd6Zb6kIdI3FnCVF19tAmBILup/EhzGFpLMCqRh6lwUZXs5Duq3jBkAA0aipLO4b3gF5Z2RIInpQZW/p/7Xi1AOvaeyxqkfFA7YQLvcyJx12nIlamXg9Fgyx2hqcyf0shjij5nSVUyX8XyQ/l0oPvzfwz9zaQ6HeQ5k/Cmz+tUA+juXpBlhni8voYHSXvovz/HVzanEvONgPZGvqJzcbXrxk3OEFZMKqbkYZCzdcTH2JdZ6pADA/WHlGbIaVvQqm4w0SqhHHkVmR1LMPTw/4WovAWRU/PmkpLJp7YHEI7rFav4KrubOAdfgH5Z7buKuEsaJcfAMyYY3d8Fm55LbukV9mXMOV4+S84Oanovv5FSZHmDfT8im2i19uayvUE6yYCf7fc4HHGOsWjWreowWcN7nxJATWgWD0OGJFns/3W8WVplVnQAa5JEmpVbucloGUrn55AqL9UTLFMkHeqJH13C6iUt0iO3dZ2q1FmVSfQOEdwPgZVAObIBxoGV2FKyqh+HOXlpJfwFvpPpsVsjWEYmBv/dKMvkf5mi6yDXURfXGQpbothgLOUI8fBpOPnFClGea/jKeYVhoEWO/JroM2dTl2oRH3pB1OVvPPlF6YShArc1q5mzULAmxSxRRRfIoxScJl3aTJCUdoXQAN1+1fOYK6qoUsqA7TYmkibH6ehX2W9RG+YaDBhp7KGchomj/fPXi70HcugdF3IAmuyOaf2SqHKig9/Zv2x5dhZOBEN4ln2/3vGWjrp+7FkA+COq5gUWGji6aqL7OeaEIFSdSyAauD0G1UztQYHgrtAofcWIMCnh0xhnsl6PieC7zRlo91D9bFiRMGsMQZ6WsyXj2ICJZs8Q1ttv2i7wimLqk0vbxCPR9BTfC075rpKqHot7a3CrFfZuwo7hRzzklmswYEye+IHs+3n4DMaH2xFbF/G4LsgI3JedDdSRwzcdF2s925YaXyBOpGrPeobi7bqLz+wsNnE5aLLLxmMHNYBcutKEfdnfQWgJEw0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c7e00bd-1dd6-414f-df5b-08dafab47866 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:44.8817 (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: z3v2nS5u7qgL5VQ16KeCnOUxjT/k3jhKLXMfkQKwi7NiaCGjqWgaUjSSi+vaPqLwn5cVw+m73PSEfuelY+8ThdZeQDIC/+Dp8d9LHdmCyixn1StkhEWDickyRayXrdOg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9821 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e613698824fd..71b022f7edfd 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -553,7 +553,7 @@ int snd_soc_suspend(struct device *dev) int i; /* If the card is not initialized yet there is nothing to do */ - if (!card->instantiated) + if (!snd_soc_card_is_instantiated(card)) return 0; /* @@ -695,7 +695,7 @@ int snd_soc_resume(struct device *dev) struct snd_soc_component *component; /* If the card is not initialized yet there is nothing to do */ - if (!card->instantiated) + if (!snd_soc_card_is_instantiated(card)) return 0; /* activate pins from sleep state */ @@ -1915,7 +1915,7 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card) static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister) { - if (card->instantiated) { + if (snd_soc_card_is_instantiated(card)) { card->instantiated = false; snd_soc_flush_all_delayed_work(card); @@ -2126,7 +2126,7 @@ int snd_soc_poweroff(struct device *dev) struct snd_soc_card *card = dev_get_drvdata(dev); struct snd_soc_component *component; - if (!card->instantiated) + if (!snd_soc_card_is_instantiated(card)) return 0; /* From patchwork Fri Jan 20 07:03:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109300 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 1A25CC25B4E for ; Fri, 20 Jan 2023 07:08:28 +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 4FDEA2E29; Fri, 20 Jan 2023 08:07:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4FDEA2E29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198506; bh=WqNCTczcnC3RGIz70NfxDaqMb5NNciDpdyGvHbSsB9I=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=XUPWeapIVY+kajwz2WdEVBgs/FJI3CJdO2NNZVJY/rH3Xxxs7GU5zIA/JFB84MltU Ix16j9ZFhfXGW7U3o8PAY3jiBv6+aAMeJP+T07ZXDBFB2Z6uuEZ7DU9Nb+v3rUu/P4 AnLqPHZIbGnUrOjx+ztraiPZft4ywq3chEnSoLKY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B239BF805E3; Fri, 20 Jan 2023 08:03:59 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4145CF8057A; Fri, 20 Jan 2023 08:03:58 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2119.outbound.protection.outlook.com [40.107.114.119]) (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 CE9FBF8055A for ; Fri, 20 Jan 2023 08:03:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CE9FBF8055A 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=FX6qbiOK ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oJaoXmewdgGBn/kkj8/Mz5ar4qBGRN1C+Qx1UkCvS4BZQYQllUODdDxw9hhwM7+eNlrYgBBrbvYuvewpTRo+i7a01oDxNS9ruPbwFMI9zYuUuga9gNGlSC0ZkUUebLFV5RH1g1KrecMAHfa/kBKKSauxra7mGa96pJ5OP+2YB6dAcHJyiuHfj/p0lnE17raYjPFTHziejY/pCJLZbX/XhYpHGTg0JAzSURedVD7bcmuI61WM6oMdB7nMRW7uJxZ0e3duLXci6FYH+/q/QH7hgyCpwK/UVDOI6oS9y1pm3DA5ae0L7Nu2pZizRqrwb/4cXqERADQDzH9T0rNDnGW64Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=PAsFmWhDm3C44AnR+H36Xd5wIYOgOfk1i7aNO1iGcvk=; b=gzu1tSNBUvgKc+QUSTb2Q9gmSr2xf26QU3x9w2Kkhju9tbtEIeEHbDQFtPoPf7Qe3tdyyuzQ1jV0MQF0/0flpsM0g+hku9HtIeHok3hN72st/6+NNecBSbLW6PNzy4TVw9Pn0urYLkx4TP8nTW6tbH0YVJgCSTxbCFvAza/xtkcFKz85YYhBurGmXDPh4CYEpM7ezWGPjPEcZv+wGUGq1hmQtHvFTlSGhXozfjlCnKKne5SBjsHqNcY76eUNUmf2/q+Wk9jtiW2xr4sMb56NJH4RzOSVawk2j1qzZIgyCNcEVwXeRveSGzxjSxDkYXDWGe9lyz9jMfcDGQwFqiIqcA== 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=PAsFmWhDm3C44AnR+H36Xd5wIYOgOfk1i7aNO1iGcvk=; b=FX6qbiOKRo+jNRWHKLbAvKn1qZBXUjnPgydY+S9VF+ty2P7/y0sPwUBM14dq+DWJDhkXVDfVveZMAOBO22ks15vAPFp2jiLnjMeu7OzqW0Vm/NK1TAldgnWNpzfIuLG83gSl9yPqha85WLTVldMUraGuaUsrD3MieupEwjodKwQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5825.jpnprd01.prod.outlook.com (2603:1096:604:bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:03:52 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:52 +0000 Message-ID: <87fsc5k7qg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 21/25] ASoC: soc-dapm.c: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:51 +0000 X-ClientProxiedBy: TYCP301CA0010.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: 445eb3c8-5e09-4e8a-6e88-08dafab47cca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dCyOtYvGnXlypQCR/f+PX5foeKniSfXOLay/Yf99XkRRqJjzqoNRpawK8CVCxYtV7COo2ZK9dABxTSfZ0JwX1RwRS4NvTKpphRSboEHCFcSsgtjkfc4zRppvvc7Cb/IJGUQtv8SHgRcsxJnW/19D3V3N/UvELz7j3aOM8N+VacUgYmQfIsdYILftQXk0CXSWRillzyvtv+0Rs5n6c0fh+XS4hWY6vpymsgOxuVoKmulJmQLrzyCxVD94sf3nJ4mUp1KjLo6CylCHuxLKNCD5eirArX/EJb6bXp5+Vo1rE35ssUQsbncDrBUt75c5fm6EagPY+f2hNXCcv2BetM8VDs6W9GAf7gVm8csGMu6MpxaJBezlskVe2hOQIB4EWAeSVCOAD6tCfvoTRicDxj8TD95pyfvlxKOZg/hGQhi8BNSlhkR+umOlWqeP9oDd8HgOLS9+hwAMsBYQx9gJgvm2kzk61Gh6QIXLl0xvc93R1o6lQKcywAIaM/f37/VsITbuNxnZFweJNtRc6Qp/RVGFjnpL5/UNLM8ltoBazsa98teUa2aQz/HTpX3BhIHKnKpEL9/zrVqG5LQ6nLcVd1jfwH12bCcqJZlHyo5RNBg1jIQI7HexgbllSQDMvJkAdN2vOVoQ6M2nBOUl9N1U6X5suQPYFCgoF5E3iUWRJJBmk/IQJhxG5NfUYwoJcUkXI+xx X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(451199015)(2616005)(36756003)(41300700001)(7416002)(5660300002)(8936002)(316002)(4326008)(6916009)(8676002)(66476007)(66556008)(66946007)(26005)(186003)(6512007)(38350700002)(38100700002)(86362001)(2906002)(83380400001)(478600001)(6506007)(54906003)(6486002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0n7trYbQdOp4bq0rsci5tTkz2ZCGLwNiultKW1gDeyTuxpfZY2UD8YwJ2VXcT1aXN9CwMaCkY5JJitHrkwZj4k2vtBU2pVgik1YgcxfwkIv8h/DMCGcbREpPqd+CDOhaaPlpAJf6EpBBaMIcb+tva3yA/MJWXLwKciypJCRU/opJkWGlXF1xn2AjdhMic1+sAzFjkZUa2iUyKYFER+CdioLVR12AFy7fO/n/R2HYEj3TSQkVeVU/qQRM1wK0IVVWkB4BFxQ/C962iNhSr+W92VSHXt6mJ/8y3mpxshBUDXEyx5sXtkB0XVFtlBK6H0mscT15KSsZMiv8h4lOU7Tzc4KjKZ4OrvDfGS0vrvHToN1PFlfZrChgnq5YODpCi7iJff288B9ldtIP7GnTIYDk9YvRdSJ2MgfmFEM/12IFtmydy21S3oBt0XesjONbcW8Hc52Ghu6oBBhfMelMAo9uqNLzj9y97fq/+pg6Ywd2x6rca079me77ZU51RmwzS6N0awdVPfX6ZGMFyoc0JIigQuEXd/lTq4vN5S8HQIvHuVBJz2bc29Wi2qKatEyH8kJ80Aga4uQHoHaQ8gsueUYAYprUILUbwa/d2sVzVhFJlyZPE8TPxAQLpTJ1Q4yZrN6Wjs45ccQeoJwkdFuc2CMWAV8q14K4MOj0oDgQORXlMm0mT5shNXjyXmGe8yfNig1R/UlV5oVApyN8nsMLYcffQe85g6LEIRppV+gpgCxwPrxHHeTTRFLoTxh02dUN3igZRoHDzde3wsZhSW7oEjtyyvVgVtCy1oa3u7UvWEvZW9+tyZxCuT+JkO8g7hWYjXQ6TYTgr9TEWygGKTt2UT5rNR0jV/6MyLBK4eUW5f9DAudMDZr3YwqZoQyUMZc0uvGlZj7aCgl71FO+EaylK4vSxHbMb2nzdqXSYYjFhJwlXQdg8DUxYBYt2Pjo+7QgdYAj1jTH932XdYdADmvpLQPwIDnaOanWu5qK6eQkHAnrKadNGKvb1wCBeMRphv+6SNU5THEyfbMUoZGUbjmSwJoVOwrGNdKfg2uThA044Pph8ZvVW1kvmfUwmay8eIO7eGnGCa4DyGKIPPLBnMGkGBrvRToGMJ4E6ZXmYr47yzZY9kKPhGiXK3YAM+EjFXoxFAbms1P85P76b1lXFcCRf3pPDWM2e6VWHf7p0PiDxgSg3KHxe48WwqC2pzH0ndKBdQqzgbQH05OJQkI/nOv+oAguOOJvGj+U+1IPZy2Y3elT/5caQ/fIB7urz+YzDqKaadO1PcEASsgJ8ZzCopUyKm3d7E7LIZLM4U65hP+T42kmeJbrZ6Muz8/AEsbiGb65RsTiTzxsHK5Ea13rOyfXhH1+53FJbXEtxNIqjaYqTHk8uiLnmZqPMjh1Gr4SICs5HPE9X01+M/Of8ZF+WZqcWnZKy2ktHcaf0DatI7wS2vU8WYhP3oiUiHYNwC/coRfcnVUj02fZCJsKeMDzqNfEoCrH5dlL4QgTLIUkz+YfRvMv063I/2DPubJcAf8+8KT9GemH2rMzHgPT/vRVDSKn5VAqICCjsPV4yqrMIflOvd6ZBvIHMinlFAgF3y/Hmgd9aWGVSBwBi3tbYRdaptHaP/e0vCeby8J0u7KYjDia/VoQXgc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 445eb3c8-5e09-4e8a-6e88-08dafab47cca X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:52.2294 (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: QIdpPBSnsaCmevFMFF+65CrrjGgs3IeMKIdqHijURZ54uthVhDD4I7nNJ+FJu+o1L7zc0F2D6IegpYxjlgRkPnLjtO9in5Ht3HuTD0ZT5Be3cZfU8Bn7fzwzsws/b7FS X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5825 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- sound/soc/soc-dapm.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f61c8633e7eb..5d9a671e50f1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -149,7 +149,7 @@ static int dapm_down_seq[] = { static void dapm_assert_locked(struct snd_soc_dapm_context *dapm) { - if (dapm->card && dapm->card->instantiated) + if (snd_soc_card_is_instantiated(dapm->card)) lockdep_assert_held(&dapm->card->dapm_mutex); } @@ -1297,7 +1297,7 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, enum snd_soc_dapm_direction)) { struct snd_soc_card *card = dai->component->card; - struct snd_soc_dapm_widget *w; + struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(dai, stream); LIST_HEAD(widgets); int paths; int ret; @@ -1305,12 +1305,10 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); if (stream == SNDRV_PCM_STREAM_PLAYBACK) { - w = dai->playback_widget; invalidate_paths_ep(w, SND_SOC_DAPM_DIR_OUT); paths = is_connected_output_ep(w, &widgets, custom_stop_condition); } else { - w = dai->capture_widget; invalidate_paths_ep(w, SND_SOC_DAPM_DIR_IN); paths = is_connected_input_ep(w, &widgets, custom_stop_condition); @@ -2614,7 +2612,7 @@ int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm) * Suppress early reports (eg, jacks syncing their state) to avoid * silly DAPM runs during card startup. */ - if (!dapm->card || !dapm->card->instantiated) + if (!snd_soc_card_is_instantiated(dapm->card)) return 0; return dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP); @@ -2908,7 +2906,7 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, dapm_mark_dirty(path->node[dir], "Route added"); } - if (dapm->card->instantiated && path->connect) + if (snd_soc_card_is_instantiated(dapm->card) && path->connect) dapm_path_invalidate(path); return 0; @@ -4229,7 +4227,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, return PTR_ERR(w); w->priv = dai; - dai->playback_widget = w; + snd_soc_dai_set_widget_playback(dai, w); } if (dai->driver->capture.stream_name) { @@ -4245,7 +4243,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, return PTR_ERR(w); w->priv = dai; - dai->capture_widget = w; + snd_soc_dai_set_widget_capture(dai, w); } return 0; @@ -4339,16 +4337,16 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card, int stream; if (dai_link->params) { - playback_cpu = cpu_dai->capture_widget; - capture_cpu = cpu_dai->playback_widget; + playback_cpu = snd_soc_dai_get_widget_capture(cpu_dai); + capture_cpu = snd_soc_dai_get_widget_playback(cpu_dai); } else { - playback_cpu = cpu_dai->playback_widget; - capture_cpu = cpu_dai->capture_widget; + playback_cpu = snd_soc_dai_get_widget_playback(cpu_dai); + capture_cpu = snd_soc_dai_get_widget_capture(cpu_dai); } /* connect BE DAI playback if widgets are valid */ stream = SNDRV_PCM_STREAM_PLAYBACK; - codec = codec_dai->playback_widget; + codec = snd_soc_dai_get_widget(codec_dai, stream); if (playback_cpu && codec) { if (dai_link->params && !rtd->c2c_widget[stream]) { @@ -4367,7 +4365,7 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card, capture: /* connect BE DAI capture if widgets are valid */ stream = SNDRV_PCM_STREAM_CAPTURE; - codec = codec_dai->capture_widget; + codec = snd_soc_dai_get_widget(codec_dai, stream); if (codec && capture_cpu) { if (dai_link->params && !rtd->c2c_widget[stream]) { From patchwork Fri Jan 20 07:03:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109301 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 A344AC25B4E for ; Fri, 20 Jan 2023 07:08:43 +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 441FF2E10; Fri, 20 Jan 2023 08:07:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 441FF2E10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198521; bh=6FfNFXBz47Dx6rMU0maquoTwo5w7uUt0eHpEymvf3ks=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=gay1+2u5WupUE8xvVmv76Mmsadv5z8aRYKS4AfYedP3Wx6Y+3/iYUimA6X8O6LdnL kF+nqiDRsZ9zgcfI7JZxWdXkQTp7uB5IE9qReoEKC8sRekG4JuBOiZQY1cTOceBVYS iVtaCMCh6BaRoeC49CYZi3+Rzpsn39/zr0EOoBYk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5D358F80571; Fri, 20 Jan 2023 08:04:05 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 13992F8057C; Fri, 20 Jan 2023 08:04:04 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2118.outbound.protection.outlook.com [40.107.114.118]) (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 3E330F80571 for ; Fri, 20 Jan 2023 08:04:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3E330F80571 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=FE6MjW+F ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LlWyjuXZvfxLlCtSCxqEjmma85BjV6P6tQPdojxA5p9GgUh+LIXt3aNP95k9a7ky82sonYaRZJImUK8JoiRgB3Lsngk+EkNpps4Hg2mu6eOrQoP0k76RzJB4rkj2Z6sulZ24Syonj7Sn+qGhMStvavcalyWUg6VeYma0ZiWdrS49i6ZZxgb8yxpiOx7CYDx7DJAZ0BU3HGEJu0A7W2RbyyG7aovr2UQpfnfw7YOaTnVrq5HxSRwkPq4ZT0LvgnWylJwOhX00A9T1sXoO4QZnDRIbuKReWhXtMBK96irW4fRai3FwWAd3iffL72LOSwb2ZinDcPnxjfCRkWnd1twUkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=+EdcOb/DHyBzrFRJqU85jer4bvxNeURMaqU93JpvLkQ=; b=J+Nw9qPzof9ygpzKfoTsgZ4J747q8lat6PpY+JgPXznl8SKi4XEjeVk+j1V9U2c76SL3AiZ7NFNbyu2Mhd70R2zHCL78PyIet+UpBj8snmmYiza8jegaQTD7QK2S1Fl7kvExE9txlrI+QqGUKZGe9aOKcemz09BIFBIp8WvXXUonmo+iqAPXT440uMuxUWj1tLGaRSXezrF4YPSS1KPNHi0FcvppgzXaEltTAygbUowds2eGph8LxZwJvrElr4+cJpliO2fYth0HXpCGQMt5MsCirfauH4kCkmPNs3R4dR3e6d1pOw99yxzO5almuvoNS42wf9nHu6pZvJ6YvJjcIQ== 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=+EdcOb/DHyBzrFRJqU85jer4bvxNeURMaqU93JpvLkQ=; b=FE6MjW+Fo4zAJpwh/LevXTlYyrBBr7exdfwYtrL+EGCJ8aeFZfxomVtnIGyKUNWH4FHiE3JRXFjqgAztLn7f4J/trS5v1WsLzv6vI93pZXFlE/Fq05DBkwDRO/9hDGnmW8OpfYFo8svyUlYyrDZk9rFIlqZlMM9fDj75J6vv5xw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5825.jpnprd01.prod.outlook.com (2603:1096:604:bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:03:57 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:03:57 +0000 Message-ID: <87edrpk7qb.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 22/25] ASoC: soc-dai.c: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:03:57 +0000 X-ClientProxiedBy: TYCP301CA0005.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::8) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: 0eb63c08-d3b3-4ec4-5064-08dafab47feb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PQG5LnxCY27Hq+i8RZ5jTkhgmLg3DxjqM6SUt/y/vFK6i6EWeq6LQjXPzXDl3uyH3LbHwjCYkwDI5fnQUZvCIjAwUGW+JVjG6OEXKYvOvU1/3W+1BMYXg8Gicdchudojkc6vSgFBTd8VoVQY1GynG0oY12ddG+a/u6Su0y79bEdurwBOxP1SVsALkeJl9TAvAJTy1KdOH6SPPucwxa9BoZ819yHHegLn9H1EBscYS4tWcmaekCA+C/lGprH/4gXJAyArvz1UR0BDIxGIp5t3QxdeInJeMZ86voWnuM/UN6O2ovKFjLI5oBA84ilq5uKhZmwFWknhOHN5HTTJpMZjg+B+FnE5XwbnAnNshO2PffLAVDceKjD0hr6wf8RbMml6QCQ96GbJaqpSZRK5z0lYIMnMU2dopIs/1MVE73MEzLILzu2IXCKKZ2HicLWE4L0bUZdU9Bvi1VYwhDPTZmk6DWGvMOhQmRVHuXW8p42XFzA3cN37qfL7YXJPfXWC4EI0YfKX/kRivF6Jio9905N/0sNbRHpQKZvKtRU1ojTLT0rnbk844qV9ith4MweGHJp24+rxwfTRlqDVdfafZF5ptrcck/e/CpXXBr7d/+kXSmVg4cyhnTkG2eQLT8sQlAfsejjp/yvQw0LD0ueGUvj/sLe89Z7JDa27LBTGJF9LD301GE81vVGm1lFvCAjBY+e2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(451199015)(2616005)(36756003)(41300700001)(7416002)(5660300002)(8936002)(316002)(4326008)(6916009)(8676002)(66476007)(66556008)(66946007)(26005)(186003)(6512007)(38350700002)(38100700002)(86362001)(2906002)(83380400001)(478600001)(6506007)(54906003)(6486002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1BB/z2CC7C9PUMkUcai39QZOGFpUljc67vK3VZtuVm4VEPMq28BY7sx8JIusQcwBUyQS2WlmILOWn/c3+ttyqgR348EGgQxvZ8i8S1fvgJi4Qjz1Wb0rMd6lyqJIiJ2lGp6gDHWiydfSIPMAiA/LqY4U513g1a9PLKCD00pVXwUfTpMG7GenGT+fzVjJlRujBXzwLU2/+SemlHw1DKBzdWDwK87Cj9eKwE0ThGHvYhb0fIDGqxV3QFKBqdG2UHu32DpAgNg56Uz7PNYv6Uy5lxAteqXZTK6DLey8f31VsIMLti9EA+Wx5DIt6odCEvwCjQD0L1yevi6+wZOLcNRK7p+POXO1kUKV9I/KFC3kySQJxWnm75IXqRg061I6U9aS6CbL+Jvr3li4I66azWNuK+cJVQrHr/zHQkQwdAw+CgUGG1jaH35cQklgMTtzaR+BlraIh8ggjrbM/741sp04ZJhNusOL4l9Y0ap1wPTyw/zoqfKDIV9E8vsBZix5s57Ljp1Ngcd1/94rqnYtIZKFbues1HV1QDs7fRin+j7FQAXNQXHIIlvCsl6m5OrD2wl6xRV5PsY5XJT52V/YcIzhRSm3KG/fWauoAWnb0a0l8JcKczqMA0HWtTo0NlcYZ/vg4Di1FEtnVshYcqDcwxoOYOIDXHnqKV0WFvtxKcsvgRj5uR5b/gtwIfFqTv8jvGmzjYvSG3i+tXejQEJHkrmN0ioVbCBkx4gCi89mq21qgU45H7xBtWCv0piy2xSb1Vg4HwrqxFvQ0uW9F5zqj2IW9e6nfvQENitqzZ415RCjAhcmw3Awe81uHql0ExI1K9PPsTWmOoEf0hyukWjflxpovGX8sQhCNoGLH+jaTPRemlmoVy7Nh2bQjfhoqePKGT65ndMmEqAFv0u/he+cUOUvsmEZIwOZX4pg8Rjizui8/tdYzrfXBLaqA6KaC4T36zMIBYX2cAMgfknpIVL3x+xMgemuDdReSHFtLmKB6BOJ5t+xLXIGqM+AysJmsut2Exe1iLpGdI/lC3euPrB2wG33dtkN6EWPi3vqu32tVUBrU381VxASbzjsX02ka/8vSItaer0dQChX2bKrhJiga5U4haSO2UoIpA/6c3LMaSUOg5DKPncw3myAOeyMp1yJBVABixnJQvF3x/sv/uNTbf1/yG0FYedR8trrJOxUbGwyVSyaDuIiN6rWieWHGfkTHxjnPcIMc3gJca/NOygENhDzHiaLx0NXqGjqsLtdlI4raB3yABvBzOjxdkXhhWEO2bVSR16Xdz7l6ezLNr2FMgm6CveDpObpWIHfh1WItVXWb9yVsnwodJ+oTTozOI3xLIWN8+0AZoUlooNJ1E22MQmbk3B/jSK6D9R0iF60k9vfgXjkgl1XBIL7dmaVk1sFItbnJr9FakohVUWrxmFiV7zZ1xDRd4tXU+NRCNDEVE8dRWhWata30ZKpAuaymNaKzFWeADw5nExEccnMva0iFIOiXuhdnAzwMJLSEOkzMS2yDLU/hHr5qCFow3ZSrSpG2r9ZKSQKzaYjKieSxbc5Z6S/gQQt6azBkXTpBDjiqG/9RWB+TdHfZQyji4QA2IlQ3wThVTTQDdL37abOpndhZRsG09/bXefLYnqp4rcLmrcib8g= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0eb63c08-d3b3-4ec4-5064-08dafab47feb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:03:57.4312 (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: 2jCH329ascgjOP0zY+7kg9tg6Y0oQuThH7EZWn0VW0L8ibuL3q6SoxqfhGK+/NMho5PdQc2Zj18FjwUxQsMBHIGabZbRnSvpyn+gQsCMDp7jfepn8lmXNwRnXUV1MGUs X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5825 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dai.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 29a75fdf90e0..e01b87ea04d4 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -267,6 +267,11 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, int slots, int slot_width) { int ret = -ENOTSUPP; + int stream; + unsigned int tdm_mask[] = { + tx_mask, + rx_mask, + }; if (dai->driver->ops && dai->driver->ops->xlate_tdm_slot_mask) @@ -275,8 +280,8 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, else snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); - dai->tx_mask = tx_mask; - dai->rx_mask = rx_mask; + for_each_pcm_streams(stream) + snd_soc_dai_tdm_mask_set(dai, stream, tdm_mask[stream]); if (dai->driver->ops && dai->driver->ops->set_tdm_slot) From patchwork Fri Jan 20 07:04:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109306 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 F1A7DC05027 for ; Fri, 20 Jan 2023 07:09:09 +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 3BC8E2E1B; Fri, 20 Jan 2023 08:08:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3BC8E2E1B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198548; bh=VMtWelD9fLakCoGBidp7XbMdZxnRxCsHw7y5dt97dvY=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=MaQSA0p/sh/VlvxojyXiF4pMjYAXLrTP/lODK6iI0tkCyz+umcRPa2rYmEZ6rL5ml ZeHHlIOulghiBTGXsqkvniFDf18PcpLjHp2Mz2O63ED3jONFf9FUO9y9fKx0EBBAmX 5bpYz6Ipay2X5mxIDAlgu6+kFwfMtkfie+l0AUs8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 97CDCF805EA; Fri, 20 Jan 2023 08:04:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CE010F805EC; Fri, 20 Jan 2023 08:04:09 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2097.outbound.protection.outlook.com [40.107.114.97]) (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 095FFF805EA for ; Fri, 20 Jan 2023 08:04:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 095FFF805EA 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=e9ZsyUnu ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwTSUDXTd+Pf4TRkMLcggWao1wyp114w7lJS8R55uLHno04CfIicx8kB9q8eEwWqssCcDyh8a5+Z+69O4IwAVp59F2RsLEwqsXZPBGcqg3to/GR1b7uIBRK97TfJyTbOMx1QPP2IFaSV2TQ7mWLFelCB4wRpJjgWmGH3Yj2C/jzKIurVGHu5fVFMND1dtWzFPnb3AfW8vgENo53zqLxzQdpCjsxI9NkCLmASr44qQabR6kG36ecnqX6bPkvm6DZfTbw7/28xVWYsIPyNapTavVJAyZ5ukJNLvBKFc4fKyaOy5Acww68GLaOKPaE0pQnagb9x7pQf6BGVsdkNPFuciA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=cfSBwC1PbmdXPFQs4+9KKPYn1h4V0AVu1SQwd9b7lPM=; b=YHTzcXCMvUxFauhrYoloLX6QEx3G0hnp7JNdXTTkXDZfO5HHbjv2N757Y8BUlz2rKzqX1nwScVmULjVAP7j06QrSA4ckU7fyfldbpxjuVtG5mfaLLXL0fJNNOmjR+kc7dmn1cUt5j3vf5r1B8igBANCgUBotO9p1YntLhJf7vg6s1XRUq10erTqXXR02WflTLt2WbIfLNLilnHTzGhjfqn+z4a7zqXdBR0+UcVpfEsXBKdmUBmQFxTPVChM3izYV2LhmDUK6B9Xmqc93SDqlJuBJh3qxVeKkVNW39KT5DsAf44Q35kyLwkvcsK7IYANNZ6ObDg19+kiMEZhjIoNPcA== 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=cfSBwC1PbmdXPFQs4+9KKPYn1h4V0AVu1SQwd9b7lPM=; b=e9ZsyUnupiCwX40/5HXTHTq3lGgs3vapiNPyctgZBXq95CMA2hXn5bwupB+SPoAhakD2VfO5179ctIrTGWS9O0Xg+nRMV1QgtbyNwfl+z+Z2Sp9C8jSmLSWY0SbZbcz6wbM+OUaizUnSy4UlHCrWAPNhmUyjfrEjsXdCCthkXgM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5825.jpnprd01.prod.outlook.com (2603:1096:604:bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:04:03 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:04:03 +0000 Message-ID: <87cz79k7q5.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 23/25] ASoC: soc-pcm.c: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:04:03 +0000 X-ClientProxiedBy: TYAPR04CA0021.apcprd04.prod.outlook.com (2603:1096:404:15::33) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: 51df9eb5-be2e-45b2-526e-08dafab48373 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AYs6837AJWoEeMQV58XZtZ9yCl0yuo2XW0LEZZyg0z62/nsHsD9IFMzdkKibYJDv6ZEaiC7yhnC+C8+WzepVpbnviUVB5dhgFMPIJ/rVnO5Jf03kA3AIvvGkodp83+W/PnxzmzTe9teAXY2s2xI7guindwCdp4JhqqP/d9h2hYDPMILSbJglHDv+5BKAwvPPfpA2NM+fDUSP4XAdUP4C8i9zQ5bhbNJXMdrUbAZ1v67D2IeUreBsdFjmNzLjuKcFl2j1XsRkbiZxwAhISxb9lbqVefBOQrLsA0pFLgM9fzXGYe/cig82wo/NfnP9SIaykbVdnD6ZzpXOCjNc/XXPGt/Z6EX9Nla7+SX6WttOTqkxXZqsG9iQQv0UBjHr5Ml4bIU3Ii1AIh+CrCy5Jvk1KNhY2vut0eivgOx4XWMdlGwGFwI65ge/qKjNH7VJyRQZy5DJd8OoXwbMgSdmsbwvRPAj3aFxNkzr5/5Z0UcDw8QQlDr7FSO/JR98DL/2uh3MJD9mnBj3zZQyxVTZLpP0G6n9lfWOQKKYxFYA8Yya23RgJya5lUdNP+IxE76stPFYz/gUlU7zBW6h6P2//lTscmMpW6+lHrwN4cH2mgvId03LoPsBRS4BuiK5SgfRyonwi6jHo3xFDoysX/gT7aIi4Pto7AKLh+sg5uXqlK3x2gophT2BHaxOKYuKTTMl4nk8c02RoDNoE5AB4MxrwhWSkg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(451199015)(2616005)(36756003)(41300700001)(7416002)(5660300002)(8936002)(316002)(4326008)(6916009)(8676002)(66476007)(66556008)(66946007)(26005)(186003)(6512007)(38350700002)(38100700002)(86362001)(2906002)(83380400001)(478600001)(6506007)(54906003)(6486002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xkcapcgvzhhk6kIYUSU1zHp/6Um/X8FfrgBqvO52pZdvPDgKqP21IxEVqenReYspcZOGOjXI4nMY6kxJ38HzCduu5K6kJRXoRCPpxKmu05dMU0yqFXRNBtxCMxISJqQjcxm7j7jcJrsn8zlq9k9BH5B6RhB2c1EEJssTUzfo9XxdoP9h+cxzFdqxGfNSkxwXey0SgVM6KK3sMItIvT6YH+JpJHj22tVv5rgHs7z2nMqsuGVffUG1XdMIyxM/C1nafzOZE2+TPy4doKOmcUmBtlMu1/ZJqEStBj5fUo3BfgypNiblEZtP6y3fksVhwlyEeazT7dXwZ72yXMQBp93yjcwCIx1GY8f7DRuE5OwmhDUku4kNb0kBOO9mZeyckwkHNYOA9kR2OaLbzXyV1kwWZal6DKQY2m2W35hvBqbhRrFvgg2Y2MPIJd9jU1zq6IT1wCyUimMMPCbTHzMmL65k/dGtGo6AeTdPuPOG/qh4gPzkOq+T9DZuVZ677uGgVmsG/i3551wv+PFJaMwLrnOTyZQQYqchbUp49zVVQUEDWPpJy866wivFhVx53eS7BwzkimoCA2FDzr8wrawrAjSxQ38Mf21UFnB+ctHORSA2uiosZMgcszTI1jNbTBUdBvwrdDCotIMtAGc2Kn4tN/E9mI6lXuSfP2UueXeopUdphLDganK56qLc0Lb3OUaJRiUMTfo2GT2sBig6X0hUcG210MQjBTwIYweYBKDxCgQtLKRxSc+TLRjNUpY1viA+1J+CvnLsHGPakV/QbYsL9hVE2AbT6MKpFzRSZaImu1ofCBc+Lzv8iH+NOSWoCW8lyOkjewXGESOiMxTr5FjY19Oubi9qMry8+SW6Wnkoha0hDzpJO4rKQbCu38IhdsdAbYzNRKW2jDxiqe3dvBGxPU5y0hk3KA2XnaJbLx61xFlj3f/U8/tyZn6x/WQ61WKgeknDb++hUawR4XQZkjRx7avRxsH6ZH6IoU/3RtVEgtwnQ+BIdsoKXaEuyNsJkNBlk803K64QUYa14kx6MtJPzeKjY7X/hMFEcXjQvpr0TuSsGxq0wvEbtOo2wapAqwUcz3c3v+pmrD0wckqpYBeRyuWGeLnGcG8WoxTg+HSg6bqyZM6giU+LBy0s5WQfNOrLwjqK6GRHvtPbPYdzGTSbjM7+1XoOaLD2IL0q77Tb5ibpvtmI9VFPbS8vEY5gcHsKCRr8kgdwoo1IcyK4CoOYiZgaR/kmgl5TMSnbxU9WNygAudVMEvh+fz/+IUEgqilGduJLM0YjV2ibwZEtl5hrvkWvV9DI93RXM6rxc9utzw+LfbrmfFhIuw6j+z6eZ8eaQIchjpt7SPWRMJ6CWRZwsDg5SSQozZaI/0Lt64nPUFlaU16SM961+lvS+/SSnu8zMwB97YLt2xB+kk/AFzucuIrRIH0cMvAiqoB1Z+LxXL1qcc+TOr9HWFIranVTx+uTcFCVkypIY5JchpKhxMV75+Ct0+dMUJZ37IovovSWw8ojGDoSAgrpCzLgiKxei8rSQWVVpJMfDsps+qxwFt98klr4gt7pnqcDWOGzm2MK5KfPq7BtQOBYi0p9NFYsQOpA0RJq+P6sEqMxBEUboP82ub2rldkUluiCtiX/MYKR9yWVOc0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51df9eb5-be2e-45b2-526e-08dafab48373 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:04:03.3557 (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: bE8UMfX/Bo8QQ+pDw8oRxKbsFdItuAGIPT/RQmoBZKrhcd3wEN5kKrUfY9NRVAoErL5yjykFk1wq+LHXm3XqxuSq3twoBSSNWpBL1orj5BjHd6gbFNDR0qNwQZHbLoBn X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5825 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- sound/soc/soc-pcm.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 82bb46c7f5cc..8023cc1fe066 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1012,6 +1012,7 @@ static int __soc_pcm_hw_params(struct snd_soc_pcm_runtime *rtd, for_each_rtd_codec_dais(rtd, i, codec_dai) { struct snd_pcm_hw_params codec_params; + unsigned int tdm_mask = snd_soc_dai_tdm_mask_get(codec_dai, substream->stream); /* * Skip CODECs which don't support the current stream type, @@ -1034,15 +1035,8 @@ static int __soc_pcm_hw_params(struct snd_soc_pcm_runtime *rtd, codec_params = *params; /* fixup params based on TDM slot masks */ - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && - codec_dai->tx_mask) - soc_pcm_codec_params_fixup(&codec_params, - codec_dai->tx_mask); - - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE && - codec_dai->rx_mask) - soc_pcm_codec_params_fixup(&codec_params, - codec_dai->rx_mask); + if (tdm_mask) + soc_pcm_codec_params_fixup(&codec_params, tdm_mask); ret = snd_soc_dai_hw_params(codec_dai, substream, &codec_params); From patchwork Fri Jan 20 07:04:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109307 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 A32D0C05027 for ; Fri, 20 Jan 2023 07:09:18 +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 B95F02E30; Fri, 20 Jan 2023 08:08:26 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B95F02E30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198556; bh=aBIS9eLwcw2qWqc3fSOiP3StdWrMhyu4mnVwlbnI1yA=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=EL7OPm4BFbgI7Jp7a31Sb+tdnWWPHl1XcxnCZYLStiLfi4GU+95Yu+ImRV0/PpGpQ Spu3B9smxoEVDoto1oril1GJXkRMXp1mcE2HwAQpFRSNmmL4O7Pe7qr8TYlNKyJlLs cYpsP0D07fJYtWCAmNeplXP1Xrp+Lkdyy8+2M5yA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3FAE8F805EE; Fri, 20 Jan 2023 08:04:15 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1392CF805EF; Fri, 20 Jan 2023 08:04:14 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2112.outbound.protection.outlook.com [40.107.114.112]) (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 4EDE1F805EB for ; Fri, 20 Jan 2023 08:04:11 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4EDE1F805EB 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=jUfTPtcv ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oaJEXgSuTyBfGbOd4FdvgnbQPPR27hbK0Qbam5y2X4T/x1kx0CnOLroJXuPYg+84eFYSVrxm7ofvnVA0DYclnVPYlk79YX4pt254smfhg9PPX7OWuPllKrlpcoDpEFL8HVxe6jLeCBWOd+VIHNJ5onVtA7TwAjxzjh5dlFsEVdYvwgmPviVsMERSg2rXOrT4MHpTfY3NmzW0Q3XWO4TlF8E2VMh3MGebZuzw/G4x7000wxIGYkp+3Ch8s0BQ50wvUllg2aBUo0gJOvD0MY968/F9gZLpHnLBAIFvf43Iv5ZP/goFlatnWbvmbjdPf/EPeC68wr16pDyDtU1YWWfuuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=VXK2sxJk8N/3kQByOfVX60fjYZw4VWoFiws6HBc0z5s=; b=cBkLvvx52RHwpah9gWqyOoZJkRLcNt0OiyOEzOHsVkpgvUCEz+tTS8yMJbaJMfRJ9yQG5YB/MjjISfjB49iUzMSG4F+Xmj39Sfr+qRuzZnk92m/6MI4UNeAzNKPcQbaQlriyHn0C+NXtoEAcO8RWYt0Ox51cwo3tscxNw6DATQFh96c8X5WfhM8e3Nh2ra4fNngR77YwcY1tVPdlP92D4i+b8QhWH5wSstzJnhiQZunWQwoEgqPyk1ifQnScfMBVBfBKqFUwW36pPF4+pdVvlOhZ347VuoJlnRzH7dyk15iXYJFadWna+JN5kbTabkbexUBjHlrjBrWSl0HmAwQoiw== 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=VXK2sxJk8N/3kQByOfVX60fjYZw4VWoFiws6HBc0z5s=; b=jUfTPtcvqMj7EVrxNpjAgI9Pj9GHnTMb02ytxkRpff8efGvg0UkiNildcZstlKjWaepBJr5he86q9C/sm4Kqlb5rtQoxabt3bN9omMxn4GCbfrlJsSYjPkHgwQmYZa+hqpgqFL1t+GHSp2K2slKnRzxQEDvRDCD2oCngf4IbHkY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5825.jpnprd01.prod.outlook.com (2603:1096:604:bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:04:09 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:04:09 +0000 Message-ID: <87bkmtk7pz.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 24/25] ASoC: soc-topology.c: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:04:08 +0000 X-ClientProxiedBy: TYWPR01CA0025.jpnprd01.prod.outlook.com (2603:1096:400:aa::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: b5827093-d3a4-4f01-6df5-08dafab486e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +UvnnJh1c27EOvMnoIKXhLWLEbdd5G+XF2zifh6NSz5wJqRFb6mREoTQqGbtg4+DH/gqi7IV7EunDrOzGV6E1xyvy162TaCFueo/20aCc2jTMWxJvq7duMjy5R8MKOuR7Hjp+kKtmau1fGezULMWPyI/Lp1pblrZ9ZpBMP0IuHQbjU3tix3QNzeyERbyA0WMihQP9+yVrHdzhql5mbA2ShefG6Ng99OBdGwOxthjVhWSPk2lxOslomRy291ixmZn5b4Iy4NIqI6xsuZYl+pDJMY5g2oxiszUaVpHfFQgPWRLmbqX6bWTT+5IzksOegSC5D6Ey45aTQNQn53ACORHZZz3gbPiVvuaso00ODM6vSMKqJq6ce3QF+gFPBlFfQUhRyQ7zr95GIsllpofq25cDsjb4ltL3y3mj4JbpxQJjhbrQp+52m74gtjLQyQ76+oa7u7/ARMraBaQ5zMDOTcZQByk/BAL823w6EvXcaPTqinwLtrR+jolySSHrCJ2/nRziQYdHhA9/rrt7Cmastq89venZd0vZnOb0ri5V2g29WKyDNuKZahpeun8U1+WuXCFU7KOVCAhMJN2Q0d32Ci9OfUMrfU8UFdYfUFjmxBirrGVbk9CVWKCU5BKbmojU1CvUV1/MMx086aeBkG4irCFuce/VuodVLndbxbloJ+wkxZVzduu9H+k5oy9oJtmo48Zn1PKA22y6VQRWoMEDqbiDw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(451199015)(2616005)(36756003)(41300700001)(7416002)(5660300002)(8936002)(316002)(4326008)(6916009)(8676002)(66476007)(66556008)(66946007)(26005)(186003)(6512007)(38350700002)(38100700002)(86362001)(2906002)(83380400001)(478600001)(6506007)(54906003)(6486002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nQbLaXH6cvQ+C8/Ziu82XqiNw47L5QLxOUpi9xTzs8APo71drklslG8WLfHMIaMLAWyJPxCogCJJNLlXFkypevd/15UikH+iuASux6WJQMxakj8aX0/LFjhOW6q6SvtSAdYDNb2/N1co4hT3eAsTv+3s9qK+oN4AR4aCIpTGKuzsaS9nE6LWQrQhUoOfSomVnO6Eo1ZIQoKgnmfSbZbpTWLBKk+mhjW4G5d6zYdY4I06vJXb5F8AigUSBcwItR6WxIHpL9OnEL+WWL7O3X2jO0+xj1M29AmFWL8iQzer2irGy8bk0qlHimlNC8dbHrbEeiuyoBr1lSopCrAWs1XdUMh0kXYA7v1hvMbQradhzfJW6gohcB3J0Dt/e9RZTwKb842/cO5XdVG+CA+XiG+xrzS4y5dhXtYnTamlVURDsAeZ7ENOceubcQwrDLd6idbjuS2BY6/Ca3XAM+EjHkrAPKJMjgINsYQ+h7tYymRD9cPUEmNRA1oVmfgjuIQeQr9uIJJo9tLzcpYkq9IDsKPFXCPcngun43lQ7eQKpQDi+m7U2KZ+M/DPcByCj/9JY/bqp09XkoTUYMosOtbF7ZkkPGGJCWfWKy5d4JOCJj4W9TICzj+1+8oqiD9WuIQZAA/mSKy1DIhUKzeHKAbq4rmzlr99o7G+xC4wH+0z1BlATGM5KUuV0uT3n2lCrLKcn/6gS5A69mEBNCgt57g2l/9+1q45w0QH7hlQ+YXIXjix0Qhg5ru4ymAuVe+rqqp4uZaa4TmANvgmQ2a/DAzp4FnRDj7wUNjU0uJBavQgsZxOuMQKtFBGLaMdu6Dvzu/3zr9os7A+Ew7rYpRQwFZ0xIuXqRgZQpS2SXgO3NOUtY5J43rDjDOaqe0pdONb2LN7KxhOJBBkOwqOCUax6O/45k1fEnmTkY5HYw5w4CF9AjsyJZr7rDwxVrqnMNOVUh+UCmltnhs/mV1wJnSiFYtchzoB1GUXaPS0xD3BI7FeoW/GPRaaqq1Y3JZ330x2jtu/iSAN/W5gwZBhq2MzLIlTXFzF/WWnwwio03x6QcHYvcRANHlccx5e5ZN56ElvFyNX9A/8s1TnnxqKSCELZaavqXq+6Kdz2Sgbj2Uj8PiOWkWI68nthp5I1DtayQMXr+9rrBU8syrYmnIvhfDujzWSrTUzW1/bbQG5h4u694LNzLeBpd0o0jm2BS1+Ap/jgULm0X69Mpa5Zgn8DdXOuZT+23ipyB3ucfQlujFtzUR0pbgfsPm2BYgtNucKaqzOJlDVt4O55svIx28j4Ihd7XSJ2xEcMfmbtBxBLJbW2Ow11AMrcJvxMwGLMLFrE1iU1oYneAuiFbxIsgTLrRcwQ/ehqfIOYmVYn63K+PjFgX/0XpDLHfYh4XUz7tCaGpZ1nr23rTyNQzMGjZRpLGrxhGWaIBqpGaA0QwLrjBkLwq9vsK7nWoIf/5qf7/37Szd0mfV5mp19E3Z07L2h8+5HOb5qeLCVHMJN+fpJwXU+0ZljPDQWyaQlJMyBwZ5/BuBVPXYf+Z3P7zdGwr0s3/utUhSHdnNj4cEc8gVEAM1+ZRuO7F2S5bTSSQRX6CSIvibJZs9zpYPnnPoAfIqI6vsC/5BWVjqZ9Che6JJnH/sh9sRFN5VefQs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5827093-d3a4-4f01-6df5-08dafab486e3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:04:09.1392 (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: WphmPw6G0gxerOqHQDgRw5NhEUg3eHsuMjH/PCFu+FKgNcrcCiP6o7I8fCjkjQFeMAkLj9FvDElYzqGvlJvgQF0DEFXoGxQy0Pw81rEZpGYyNqoJR2c8hzf05cxXnrUf X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5825 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index c3be24b2fac5..6bb3efcee3b9 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1468,7 +1468,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, /* card dapm mutex is held by the core if we are loading topology * data during sound card init. */ - if (card->instantiated) + if (snd_soc_card_is_instantiated(card)) widget = snd_soc_dapm_new_control(dapm, &template); else widget = snd_soc_dapm_new_control_unlocked(dapm, &template); @@ -1556,7 +1556,7 @@ static int soc_tplg_dapm_complete(struct soc_tplg *tplg) /* Card might not have been registered at this point. * If so, just return success. */ - if (!card || !card->instantiated) { + if (!snd_soc_card_is_instantiated(card)) { dev_warn(tplg->dev, "ASoC: Parent card not yet available," " widget card binding deferred\n"); return 0; From patchwork Fri Jan 20 07:04:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13109308 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 D0319C25B4E for ; Fri, 20 Jan 2023 07:09: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 CE6892E22; Fri, 20 Jan 2023 08:08:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CE6892E22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674198573; bh=KMNnPXtNME0Lt+8dIuUt43IyplJ2d1gAMHrfYq0Xy50=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=J5REFEJFwITWnSP01ljGtylMvfnliMjcgfkE6cxF9KF7Ucldy0Yduj9cE1LKPgENU KLT7pM4ND6fqsOxFLEEjWLiJX5y45NOk3AkyOryB+1oiHVobOljLwLRXCxgk0H8X49 DqyX/RHYd0iKeGhRKrwh9BLoHC9WlqrpnwO0a1no= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 173B2F805F1; Fri, 20 Jan 2023 08:04:22 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E0D2BF805F2; Fri, 20 Jan 2023 08:04:20 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2103.outbound.protection.outlook.com [40.107.114.103]) (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 B24D8F80564 for ; Fri, 20 Jan 2023 08:04:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B24D8F80564 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=CFoZQ48r ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S2wGXUT+aMeaEihebH8wneWyY9VCDEMOzTmXWGn5bZGdoaZjgV2VWytuJaMK97xFxHr+AxO1nyZyrPm4c2S+pJU+KihE5OTekL+PKC6+HVeFPcaMCkJTq4v7F2aycB/BcT2PqfrZsk2RVpobMa+7CGb3k8Z0onZb4yhYSmylStQa/20znJ+XFD0zpMhNANW1k+opfpx03S7o1U/OJT76OkMqGnqpSo8blmmca/Hw9MvKyRQIbOGOd1W96XY7IXS21eLwogh+ssPPmIwPiScK5hBRqM6A7nIwjFvHOleEcuLQQpEFRrzxj3uP42rBUR626cLtpb7oDncR69wjmdWUdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Chw0QzF2b/Ks8lR8EJFH4gVfsy4H1ekqfDJA6ybtK40=; b=dUGcoKYFSXty7USJ7M+CDZnNtsy1EK+ByrZdcpYvFRE458WC5NCcyBcZr7/YBIRZehc9GuxAXsCuu9NKl/QTk4ugSuRMUsnYf0gK4UI5vw8UAVVaHv3JUa3T/TVFOR0g8Dcr/FO28WSyUKHJpobkanpMONHMsdiXZL2nxZ1qtzX7Yilut1g9/p0di2MlDltbaLxLEJYmQNfO5Jb8NiT79hQb4WOzdcvuoXty4xqL25rPpQsop3fgN6CMq8xu8sXbO8QvWg3StskyVsRn/BaPLpApAoANWw9qijfG+QzvWp7JIipC1qxw/JApZFGNyV7PFQGH6LvdhLSyQY1obPoObQ== 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=Chw0QzF2b/Ks8lR8EJFH4gVfsy4H1ekqfDJA6ybtK40=; b=CFoZQ48r/ozGZKOCza4Dt1H1E3LDdK3z+v+zmKWel9H1BUohZHmJ1Fwet698DfkAYs4XnzujgBCfCamX8TOXPcfHgOP01m5sB32jqG7WlxFyOh4JOiynH7xpuy3L6+VM/ki6d3cLuX4PxShdiVBB3ESGTIxZnRCRhRiDbQB0Z7I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS0PR01MB5825.jpnprd01.prod.outlook.com (2603:1096:604:bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 07:04:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%4]) with mapi id 15.20.6002.012; Fri, 20 Jan 2023 07:04:14 +0000 Message-ID: <87a62dk7pt.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 25/25] ASoC: soc-dai.h: cleanup Playback/Capture data for snd_soc_dai User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> References: <87a62dlmmn.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 20 Jan 2023 07:04:14 +0000 X-ClientProxiedBy: TYCPR01CA0032.jpnprd01.prod.outlook.com (2603:1096:405:1::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS0PR01MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: 15ac5f8c-a3ec-48f3-7e60-08dafab48a28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7v7cqU6HGtC8zkBAbrIpAtUWvCqNIF/mvP/ph8knloiBWo5mpbWhnN6rol+PoxLhE2s7kKJmLnq6Cpss/uZrI24h6XNfrij2yA3tZHtDl0Fx7sm6g3M39NGGrGGs+/nGnHgtdfojJeFMF1z4QTW7l1rd8hWO5fuJgnKDcbMtKREC5hORscAfNDCfeqAdo399iIhpkCaM4TLk492BRVq/nsk90QWE9EOvLCvr9s4q8ff1sEdQmeFz34hMNowNVRZfcI0pYVdYEB9Js26C+kiH6p+S3Ih81a64sVw4VoCDK5tByHRtn586Bnw9SlKtoe8RgFu8opDPN0VzCz5HaJ7Df+NsfotqsoxPvrEyHqYHe7cER8pSoZ7aajD2zQnExicJl/SHaC/PqS1W2ujz5U3n4SquLIxcGV+wydLqSN2VpgYCwN2+m3eMb3XZUhiaeBD25byLgUEa7Ijiltw56q59XdJwxNcZtC+HlsDmxIv/+mUwO/EFQKX1BxB1bi8eO7sL9eILSPGnyLPce9OYtllXBl2PlwHujdR/jMh6JLhZSxU0Kxq+550OnjVuIvg+qb6/knO1goyGCQBEqu1rb2lA2iqnBg1M+nXil1I7D94LUbw5WOizjagtpBsvvDYJfKZ9qL976TZLk+ZdiqdPhUvPNc7nLEUSIPM5sq8ZeEv44G9KNSMSG0HZJOKkzlkiYkZTNi9Wr+ITRbDFKQMf5V0VDQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(451199015)(2616005)(36756003)(41300700001)(7416002)(5660300002)(8936002)(316002)(4326008)(6916009)(8676002)(66476007)(66556008)(66946007)(26005)(186003)(6512007)(38350700002)(38100700002)(86362001)(2906002)(83380400001)(478600001)(6506007)(54906003)(6486002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vh1vXQEzgE7hqklW0mowS38R3pQpNzLpOXupt7YTiqP0HjlfNpnS/Lgo6Z6S6hXRwOvUUibulBxjCRrieHNMPuRUAaT5MAp0AgZC/1DvEImFnwFp12dH5iZIW0NO3llTqq1ZXb9d3bJtRvqOYuQbS2gHykqZdhPY/L/ZoLR0HbdtchqvQi3+AtWEIuuMT99jW5iS9ICmcSQIis0AunIxWkrWck0ypr+ZAEBbqRfSlUfd4oz8TJorK8V6a3ENhVtcPgDnbtdFD3i2BlS8MwA9trcNl/gYbSdL37hPlHA5+IbgrDwTYOwHEA4hXONI0nfcoxQuBkqbWWjGQ58Z5dHO1AfHGURBp9tR2niMcYRIRMhbb8OfaKUX12xM5oFw7LEAbeBa2ghIjKmGkeGrSmsMbsTlJJwZWWZugk2G9PutZtrKdswgogzUHxb0RtduD/zjVqZUZaeoWuqKgPlRzMumqxvz8bf+bh8y70lGvz2sTqmMFRpPgI5pb4bUCG+DSlgaoFUScFMi0048Dgkxd8cm57Wqm+GQkxgsL0+juWwRYfdhNEEKamYIezoknxG6vFryvACrKt8wOJ8oilswvvoDGrWmrFIrPcqguYUnd/E+H7QLfEcfLZ4peVrBDnBHpmE9CIN2MYqTfHDsDUJUl9ZGWuQGQndmB4is34fodWAjDRR/9uw6AlMA+MHsWfoZau86c7ni9ts0ACp+69W76/21e4vm0h0zWCkDZEscMNCKNtZ9PBgG3d5IZUo7dFQbcReu6D6q8HgHHJibMfp7zRAowNIK5gYfhHCkmk6rbM+BmrGNtCdRPNBR1SnZryIoFQnmMvcaDYvoFygsdYU5XBS1WsDQlFTqxr8SEIQm1emX+t1L5ePoD2hkPgIyphb1DB3OTWuT6cY362Cc7mcxP7vF4NGhYRXj00OyD34ukcgP7shO191WyhnAlncD3FlXIwk3umNvOkVhC5WJ5urHIIsdd09ZyiK+43uPN7Vu6+RWy7dcrcdEIh0tBeCtgbnZZ8gTWm40aXX5A7MO4Bz+DtSjZPnwAexbt7u/UsjCWXtCU5bMRz0233XieKYhIfL2LEZW+vSaq1d6famSrS+MJPd3FV335z7r9+8By47lZeUDXfIxl9uUucmcorP5J43tyLhOJdi75gwvmzwn2rKUDLwKtHdTlnzVWF7tqSQ+pODY5srDUrY5RhxWeClwK7P8gfrs/RgNgc/+jv7Lz15bFEs/jVbb+gWZeS0i9mTAd58Mb/0QOpbRwp0pY6CD5JVRNe9ChnBtFyCnMWh4vx1qv70ZgQ0McFnpN6tnip1H3c+HKc/gKhONHjsAy0TRtcTWNCV6FST6BB0hZjtZVMKg8TW7lXLqLtVbG6xjuFJBISkxlYauw+yQWNt40iPb0K7k7qubM7nS3nSeZPSnAAtku22+x4HIFzY3a4baYs5BExHGreITQ3g8e5uY+5KF6q0TQt4+FxQ48H2iq+8/F+RJoenEfkZtqoiTAw6q4B6kvShc6xSZ0KpdWrY4g+LWrHvVbBJrBGSGFQnZ95egWH6haPbBt/A7x0/1TnB9IHgOIMmiHC51NDZmlzOy0UPe6fDMO7vvqxl/qI5G/u1uDv0IYFDMN3yN1BVz226p9+TFZF3V/AM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15ac5f8c-a3ec-48f3-7e60-08dafab48a28 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 07:04:14.6406 (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: fWKJvUcg0MNVbTGNigknXF376UytP0iKXZB5KVpoDR8/9TO5JIipKscBBOEBGAwdQPepF95V7+OQ5YvNeAp6sjzOhUsqOAHxkftSdaLNnzK4rNaQId5+gLVvyLpMSitO X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5825 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiapeng Chong , Linux-ALSA , Charles Keepax , Heiko Stuebner , Kai Vehmanen , Daniel Baluta , Pierre-Louis Bossart , Jonathan Hunter , Nicolas Frattaroli , Thierry Reding , Bard Liao , Colin Ian King Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current snd_soc_dai has data for Playback/Capture, but it is very random. Someone is array (A), someone is playback/capture (B), and someone is tx/rx (C); struct snd_soc_dai { ... (A) unsigned int stream_active[SNDRV_PCM_STREAM_LAST + 1]; (B) struct snd_soc_dapm_widget *playback_widget; (B) struct snd_soc_dapm_widget *capture_widget; (B) void *playback_dma_data; (B) void *capture_dma_data; ... (C) unsigned int tx_mask; (C) unsigned int rx_mask; }; Because of it, the code was very complicated. This patch creates new data structure to merge these into one, and tidyup the code. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- include/sound/soc-dai.h | 68 ++++++++++++++++------------------------- sound/soc/soc-dai.c | 4 +-- 2 files changed, 28 insertions(+), 44 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 197dc1629708..e3906ecda740 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -423,6 +423,16 @@ struct snd_soc_dai_driver { int remove_order; }; +/* for Playback/Capture */ +struct snd_soc_dai_stream { + struct snd_soc_dapm_widget *widget; + + unsigned int active; /* usage count */ + unsigned int tdm_mask; /* CODEC TDM slot masks and params (for fixup) */ + + void *dma_data; /* DAI DMA data */ +}; + /* * Digital Audio Interface runtime data. * @@ -437,14 +447,7 @@ struct snd_soc_dai { struct snd_soc_dai_driver *driver; /* DAI runtime info */ - unsigned int stream_active[SNDRV_PCM_STREAM_LAST + 1]; /* usage count */ - - struct snd_soc_dapm_widget *playback_widget; - struct snd_soc_dapm_widget *capture_widget; - - /* DAI DMA data */ - void *playback_dma_data; - void *capture_dma_data; + struct snd_soc_dai_stream stream[SNDRV_PCM_STREAM_LAST + 1]; /* Symmetry data - only valid if symmetry is being enforced */ unsigned int rate; @@ -454,10 +457,6 @@ struct snd_soc_dai { /* parent platform/codec */ struct snd_soc_component *component; - /* CODEC TDM slot masks and params (for fixup) */ - unsigned int tx_mask; - unsigned int rx_mask; - struct list_head list; /* function mark */ @@ -482,8 +481,7 @@ snd_soc_dai_get_pcm_stream(const struct snd_soc_dai *dai, int stream) static inline struct snd_soc_dapm_widget *snd_soc_dai_get_widget(struct snd_soc_dai *dai, int stream) { - return (stream == SNDRV_PCM_STREAM_PLAYBACK) ? - dai->playback_widget : dai->capture_widget; + return dai->stream[stream].widget; } #define snd_soc_dai_set_widget_playback(dai, widget) snd_soc_dai_set_widget(dai, SNDRV_PCM_STREAM_PLAYBACK, widget) @@ -491,10 +489,7 @@ struct snd_soc_dapm_widget *snd_soc_dai_get_widget(struct snd_soc_dai *dai, int static inline void snd_soc_dai_set_widget(struct snd_soc_dai *dai, int stream, struct snd_soc_dapm_widget *widget) { - if (stream == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_widget = widget; - else - dai->capture_widget = widget; + dai->stream[stream].widget = widget; } #define snd_soc_dai_dma_data_get_playback(dai) snd_soc_dai_dma_data_get(dai, SNDRV_PCM_STREAM_PLAYBACK) @@ -502,8 +497,7 @@ void snd_soc_dai_set_widget(struct snd_soc_dai *dai, int stream, struct snd_soc_ #define snd_soc_dai_get_dma_data(dai, ss) snd_soc_dai_dma_data_get(dai, ss->stream) static inline void *snd_soc_dai_dma_data_get(const struct snd_soc_dai *dai, int stream) { - return (stream == SNDRV_PCM_STREAM_PLAYBACK) ? - dai->playback_dma_data : dai->capture_dma_data; + return dai->stream[stream].dma_data; } #define snd_soc_dai_dma_data_set_playback(dai, data) snd_soc_dai_dma_data_set(dai, SNDRV_PCM_STREAM_PLAYBACK, data) @@ -511,34 +505,30 @@ static inline void *snd_soc_dai_dma_data_get(const struct snd_soc_dai *dai, int #define snd_soc_dai_set_dma_data(dai, ss, data) snd_soc_dai_dma_data_set(dai, ss->stream, data) static inline void snd_soc_dai_dma_data_set(struct snd_soc_dai *dai, int stream, void *data) { - if (stream == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = data; - else - dai->capture_dma_data = data; + dai->stream[stream].dma_data = data; } -static inline void snd_soc_dai_init_dma_data(struct snd_soc_dai *dai, - void *playback, void *capture) +static inline void snd_soc_dai_init_dma_data(struct snd_soc_dai *dai, void *playback, void *capture) { - dai->playback_dma_data = playback; - dai->capture_dma_data = capture; + snd_soc_dai_dma_data_set_playback(dai, playback); + snd_soc_dai_dma_data_set_capture(dai, capture); } static inline unsigned int snd_soc_dai_tdm_mask_get(struct snd_soc_dai *dai, int stream) { - if (stream == SNDRV_PCM_STREAM_PLAYBACK) - return dai->tx_mask; - else - return dai->rx_mask; + return dai->stream[stream].tdm_mask; } static inline void snd_soc_dai_tdm_mask_set(struct snd_soc_dai *dai, int stream, unsigned int tdm_mask) { - if (stream == SNDRV_PCM_STREAM_PLAYBACK) - dai->tx_mask = tdm_mask; - else - dai->rx_mask = tdm_mask; + dai->stream[stream].tdm_mask = tdm_mask; +} + +static inline unsigned int snd_soc_dai_stream_active(struct snd_soc_dai *dai, int stream) +{ + /* see snd_soc_dai_action() for setup */ + return dai->stream[stream].active; } static inline void snd_soc_dai_set_drvdata(struct snd_soc_dai *dai, @@ -593,10 +583,4 @@ static inline void *snd_soc_dai_get_stream(struct snd_soc_dai *dai, return ERR_PTR(-ENOTSUPP); } -static inline unsigned int -snd_soc_dai_stream_active(struct snd_soc_dai *dai, int stream) -{ - return dai->stream_active[stream]; -} - #endif diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index e01b87ea04d4..906819d441ba 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -514,7 +514,7 @@ void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action) { /* see snd_soc_dai_stream_active() */ - dai->stream_active[stream] += action; + dai->stream[stream].active += action; /* see snd_soc_component_active() */ dai->component->active += action; @@ -527,7 +527,7 @@ int snd_soc_dai_active(struct snd_soc_dai *dai) active = 0; for_each_pcm_streams(stream) - active += dai->stream_active[stream]; + active += dai->stream[stream].active; return active; }