From patchwork Tue Jan 24 02:07: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: 13113309 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 081D8C25B50 for ; Tue, 24 Jan 2023 02:09:16 +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 E3872DF9; Tue, 24 Jan 2023 03:08:24 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E3872DF9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526155; bh=5nfnmU6K/b5YpFEaPjMx9URUZy3EreAXlmaLqAWaUkk=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=BV0CsveL7fUNvCCLCJwmHeMFQQKgoPqHb7XWsmV+/QY84oWFNgob+i6EXna9xosKC aT+2l2fdYvJgi3N0GJPYLGf0DEjWZEUAcbm0N3ein8ZASAukqalUFBMm87iVigA8wl 5Tkakl38u1uABdgg4Ht2EcFTM5fMNmC83iIpa8OQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9A051F80515; Tue, 24 Jan 2023 03:08:24 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E247EF80515; Tue, 24 Jan 2023 03:08:23 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2096.outbound.protection.outlook.com [40.107.113.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 6E13CF80163 for ; Tue, 24 Jan 2023 03:07:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6E13CF80163 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=L5xlrMEH ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fVhl3sqEdTJGgyzoqrAJhFV3uWFja7Ztd4lw/tb/hJsCexFCOVHtYuoxaip/hTXqa1TuB7quYLCKaUgqq6cH8IvrWj+XMAT5lYNS3zLeFuFPqXnTkcdgv9gVfpxHWuRg96c/vge3aQY9RVFzzHf1o33YfMHrDpkloejNyUcln7/9Onks+xPt4U7cT9ttPOurtxhdB5YwC0U8GQ/QkE4Y6IxtFxg/fLnGiUZEmX5wejNXi8TQolzReR28a4k95/CK6IRlBO/S4/G9ihafHTp4i80FAJEW1xDtM4FNvv6ut+IcENywqyrjSx2+D1upKXU52lHyG5TOa05gV7ZklkKt1w== 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=JIWlI27zncJI6mrCeGB4mikKky6wwvFOOPrwT+cojGI=; b=XKRCC2c8/V+Ag0Lhe0g4IGIjKZHdytuUS9ZZ7dPG/hc5r+F5sGYJGqcocNuD6Du3wowWRf5POCD73XEn/A6cqGSbhdUY0Yi5lydrW8LQ5O63HoZK3gljFkoQffFJZL1p5Q9KL53ncb33jwsJcEsRJxDkUtZSC82qITCDZUhc3xc3CnXJveowFi4+Sgisnuua/NQY/XQ9zHAfPWckZAjD1PwZE5fQUtFBW4qPeZMlhzZFI+hgbAap7k8BB343V10HHz5RvV/t5H8UxwWWVpheA79++ULXUeh3axgtLWXXklJDe0xk31rdiEyH4zQzk5B0yjrZbiYw1acqTU/wNk/+Nw== 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=JIWlI27zncJI6mrCeGB4mikKky6wwvFOOPrwT+cojGI=; b=L5xlrMEH2hO4ipkSv7jbAWKZhZylWnPi9QBGueHcMAHeddRMtWzG3YSt8fgguN4XXZIZ6je8qbAJiZt50DMHMJJckBVE7Z0BAQe8mXSA0EAjYxyKpYC2w2wEXGiHn8vuVCywsnBhylVCNhWhfi9R9qKu8vIKvg6DblA0oECroVY= 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 TYCPR01MB7701.jpnprd01.prod.outlook.com (2603:1096:400:17a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:07:46 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:07:46 +0000 Message-ID: <87wn5cu1la.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 01/25] ASoC: soc-dai.h: add missing snd_soc_dai_set_widget() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:07:45 +0000 X-ClientProxiedBy: TYCPR01CA0043.jpnprd01.prod.outlook.com (2603:1096:405:1::31) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB7701:EE_ X-MS-Office365-Filtering-Correlation-Id: 17af2f33-ccd5-4346-6a54-08dafdafc8ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T51hqsJLMIly618JKhsIYg3MeKmZlSxV9w5j24zWKznynqkwSlRFWRB/Soi9nvVdOmtLLpcsc03kv+i80AEIH3vuV0/WVrCj20PEidYmuflnzwf/7nsl9e6SPH2IFmrRS57xDXGQgLsNIx/2ukkI9FoELAzNw8fa/tmmmtjnEraSUZ7u9d+s1BXNvWZE6yS6PdMzzwN0avEu2mtB40Y6rDIn9v0phn+h3IGlkxbpzl2hos7xKvILkLhWvdrpkbMW0F7GUejsUrXTKm5nTHgkcQaTfqtFIkYhE3c12GKN5XpNF5HLYCGiXp1zWXBpMR/jB7TtGPtH/WXaWNAFbeFFZDKKKA6b64kFItBGWOEK1UciLeAnNd+4AvQ0jkBPoHjngB8AmXdIw8Xmlfs8EGkL3PznwRiNufRG7tB+xGJUEsI+EBrNFOpN5RH8MRF5+7/N03ivbCktrvhMxyFfG2sJkw1ftaOixmUldjs30U3sewftZKGaryDDCqeISSr8dVLXDxLFck7gm3XYkj6VdHgNocHI5PBinlcf42jEXeuM4d1IGNG1YND86fD0FIMfp6cJUXXGScjXLFf534gOVVtL+7wjsmtZMShHO7nt7h8hlzNtc2Cd/De/PllYK7Ecdnxn78VoASQfsDcvZbTKnK8fr0RReprvRuw6Wvs1N2WOiyLb+tGMkenni13WdSzpIhlr1d96FlCEP5Ddrtp4970GuQ== 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)(136003)(376002)(346002)(396003)(39860400002)(366004)(451199015)(8936002)(6916009)(8676002)(4326008)(66556008)(66476007)(66946007)(36756003)(83380400001)(6486002)(478600001)(6506007)(6512007)(26005)(186003)(52116002)(2616005)(86362001)(316002)(5660300002)(2906002)(38100700002)(38350700002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Df9IyGmixPz15+AHy/I2fKHsd9vA+LH7784cisffvQ8KAT9fqe4/AryC3b5wR/lFADE1D+aBL6eJpfOaZgiBYW4h4wYQmAJ8X0bl7fhh0VBYA9Gljq2SUa0MO6v7fnwOYHBLGsbzs1nEIDPfq0YfbDnlrA5aJHUcMqv3LMDW8IDgeC8onZoCEHGk7BeDzcRWbooIZ5lQGSev7Os/lTjJgGDqg3O1FZrcXCB+mVGn6+2p9SDcSemD6pLTiwtXu5NyVMoUZIxuNpV9nO/rJD9XYvmVCYQK8Qh3REi9wnQKSiywDlPChT4mmUnZTqPeKaGOf8Uc4QtWepVlCyRacix8wRgGRrE/1xUP6wxLWFTg/KTfXYiMDSuXyQgmICObROsnHBcQ1z7y3PbTBi6TaAP1hyvOGNmmjL7Mg5JLmhuMsD9eGh1zkDiXmMqmNUlEjf0hGUxmduVfqJ9fpLZTd/bBCqNFs/KcdztSLVReQSHJB1jq0yNp1TxRjLnO9gvXwhn1Dk7RF+jh00zoIW4JBacV5CBLqHXMXQZVkI8J/+sYiGUZXp6R+Y/kNqXWpa2Ywo7zQm+/qsFVtUSx3kVLefP2FEX+/RdF/vIihEcllwVXrrC8qBOCinegLDvIdSWNqj62Y0vD8S7iqMBh66c1D+CgolyP7gTZT5Nq08DyCL7tz23dTpv2VIbftMxq5aAl9F+aaN/u3zKwat0F0F3S742hXHGYBtt5ClfRXJ0uW/00+VdSpTCM3dbN85mqeQNGWVis4hBu6Vd2c+J9i60wJWXPWJjPQnuK25HlCHueEGBwiuiOXtvQUYSzt743b9s72s33N67ZC4JRNa60htLXkavYFBN6Lw6sZ+Hn8UDC/n93fjW1LjQzgWoeM+HJD/bYUllzEP1rqVIAgaAgYqZk6PcPp8q8Pe49S3m0NJtjOAjjdr7TnFM7busG04KsJcZe8VWXpe62JMH/7rlUBfiQEMfEkEAuwa42MHHGfPJax+nbY25myOvYWkFJD+aQxvjsC7UbPYbdUY01aZg9MIhduI0ZLihyGsO95tl1PiXZUmoCN6SeK0FCM4mfT99poBd5CJjPr6MFJm40xCpjQwD/E3x0lqy5NlMN8RYV9OgXdzKcNlSAYb1qhr1XiTPLOwvZrZzGt2A+P6v2eEDLorW7qc9Fk2pga1JuNNFjfSJtCx/6H9ri1DoDjhqaSNhjFo7cq1tIA6Q1dUIbS4oOPE3wzzOtpeBtXV68J8lmjESt4MmNzJ4w+welZQaKzZf83e2mq90VpKlBXEDhMLeSthWzmlW3juLwlkFqcE14AInyEOt1WAEiKTWHiwRj/0tWm3OmReIPBTRD8qipQZRXRgxXBm48VFNVh5UDZGQ7LV4ZwN9ePZHZpvMJb4IVon144ituKNV38PjPHKs58K0cerZMR9KJdDLB3sNbpjW1u5EDb5Yl5BjK003FqUmSDOEniJ55BP3UDzZObCceOipaGokIh72HkJBnX+WDLmAwHjXwWOtCoZTqkGaJviPUTAxrk8f6JlYKmCwFs8u4GCLoWis0MAuOcbhC7pNdjJr4dePSuFFP+ORKFvJ+X6q9x8F8teG416IiQhSfpVmXPGNsitJyTt5LNn/BsOQK6rFhJroo5jl5aIQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17af2f33-ccd5-4346-6a54-08dafdafc8ff X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:07:46.1364 (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: PNitGNh433Hdkcyp2hSG6Ykj3SIIjpdxBotkXnDkBdyawzxiOUCjHFO58Nf25xnFTWPX134rwjo/Uf8Mwnu/kHXXzV37knzoxhNK7z7n6KqI40LyfJ++GuKnlvqZ7g1F X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7701 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: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has snd_soc_dai_get_widget() (= _get_) but doesn't have _set_ function. This patch adds it. This patch also cleanup unnecessary line break for _get_ function. Signed-off-by: Kuninori Morimoto Reviewed-by: Charles Keepax --- include/sound/soc-dai.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index ea7509672086..ea704d92deaa 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -478,13 +478,21 @@ 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) +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; } +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; +} + static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai, const struct snd_pcm_substream *ss) { From patchwork Tue Jan 24 02:07: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: 13113311 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 7618EC05027 for ; Tue, 24 Jan 2023 02:09: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 491D5E89; Tue, 24 Jan 2023 03:08:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 491D5E89 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526174; bh=CyzRx2bD1So0VkJzfv7bi9HUGyT90m5ggpvn/z95xGg=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=IIpcIfFchFJwfpNvf2WvWY83WbpuAMlV3yS2i4d4vUJYHSAeRjsAhHLVAecXMuaEJ PkTzWbxQ17c+IGKh7KU1HjdRL+Zt6o05Z2d8QEb8vKJIFcXflTG1y1bGzv6WjI7GNh Qrs2WLeRSMLKx5Zn77eg8O6gYOnySX4b4wqAgL3k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 86207F80549; Tue, 24 Jan 2023 03:08:32 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7D0DCF80557; Tue, 24 Jan 2023 03:08:30 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2096.outbound.protection.outlook.com [40.107.113.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 65E12F803DC for ; Tue, 24 Jan 2023 03:08:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 65E12F803DC 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=PuIfesBe ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MxD7Jog0drflgEqWh+GyRwuHN8mjOFBUeCCOvWIomCqNGNv8QnnEepmIgxUwKmYyMtVQfvtsWM+a2gIyuioo6Zm0TpZjzjNSb/ZhQlG2MJP8tMr2Mwj5wAGW5tI85GWkRpyaKW3TCTuZ6OJyZ23d9WzTkIFSjk9h8dqHuj90IYoOFJe3tlKKwzpIsfsOq7m3ij6PMt5ULuq6vK1+txWKrP3a47q9VmxhHcWkU3YpJuSrBXIVr9jGPgSk3iS9k7luWoLMA554IA0RA4gZTgaP0S4hZVnD3fZ2zxVHMVlaZqjbj0ZV7y/tbqKyoP5xgSqrFc7YOWeh90p6xIBeZ3uVfQ== 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=DCBBiVpXXVVV/WdixsKJwRGj8NlkbWf+jRkxdl8LC/Y=; b=eCItAGEjaRtDdx2uspUTv+0cpAHAh6DCT6GqJ2/w8xQnaed5VwzL+35PjSbmGuzoqCWLGB/DaujfwtYgmEXIJaNK9MmLFExdxcyzo89sD+NZ0CvL3uQmtHVvCt759SJe4YCYDib1XJk8+pGqpbJSPQct8aSoFidMiPQzZFN3xP0bPUSjz3qJSsRW8m9SZdEbe7F9trRdbWun03BsXkMmiV9mtfL5zkMZoJ3Nly+S2OXEjI3hW2iPP5VVr3UcE5vwMdB5oKDC5kCP4bR7k2nRPEOL+gMEBqOCmQOZs1hpWmuC9IoEXoyIi50iNgGde/Dfpjk2UxZyRxHFJqRQKSRDWA== 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=DCBBiVpXXVVV/WdixsKJwRGj8NlkbWf+jRkxdl8LC/Y=; b=PuIfesBenIKXczxP3lNyvPpNmtoUq9yRKbTMUkhqOlEDs3Vmn6mRqMojrJhJZWKuGPJu3k3+8QL0hE4Iu578JXUcvXtSQcSWo1PlqVJY1cN+HuldpDpI1zmbDDjIPEmS3C55mMAqEB0OkMwuM9J8qBVTBKEHXzFI5ZCzdpTbvOI= 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 TYCPR01MB7701.jpnprd01.prod.outlook.com (2603:1096:400:17a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:07: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:07:54 +0000 Message-ID: <87v8kwu1l2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:07:53 +0000 X-ClientProxiedBy: TYCPR01CA0144.jpnprd01.prod.outlook.com (2603:1096:400:2b7::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_|TYCPR01MB7701:EE_ X-MS-Office365-Filtering-Correlation-Id: 968bb0b7-77a4-4298-64b5-08dafdafcdc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tQz7WwjWIv/Hd9jtbNo714Dj2fwOkfsiUlXVMcLbIqoiSvsFiNCugPRppIgJuotSEAik8JHfKP6QjA3UJVNEEi/k5lwxRDHLXQYqf9m3C4WAevfRdgrFc+dB65yhJaEgLmX+I1r41+GXy37WozeXg5zCwq6tmbabxxC1wLuL5r471m/2CmPgCUjbJ/MJzXk6kiH8pB/wXyX86ZqE5mbiX0Ea3M6PJmQXX+Xw+kZzFXjRKxe7IchAbY3aiH3C8ADGRU1ZOqpYBnimSw6NgsOOaAmXSIwJzkGw9NHVodyuadIywOaO3L/LJy7ZiqiNsp1bQhM6mizzzSNtIOecqbxYURuq48DpoVwe4T7/xa6O0FMFV5mdGibC6TYgcBOuqLU5YbQPw7tPPWaYvF+hOJz7ghVXzno4+vAWb2wiUtIGWojjEiTbNmTbA+0eHqwH/l+PUIDuj9i5D5tuQBIGRi5mzi8VmssoBSR5+ZOgJfvwAfy3zfcrRgreXPB69hxhMK37YsySxonCeBLzXUYG1WiJzIsykFQVMp89uned7EsvZbi/enrryfkRwiPU27jDR40IAEl49RRdPWbkXddfws0uHsU6LBKqXK9gZz9cjPO0yPdiW5mXIlR5QcM0mS0QpSzETV95zlCJ8vHUAv0b3s5A0CVvAMy3ltRStxbIs+TQ270fenP3BeLkaj3LmFirxABiLwJI8sIN+IjeZTJtDjqScw== 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)(136003)(376002)(346002)(396003)(39860400002)(366004)(451199015)(8936002)(6916009)(8676002)(4326008)(66556008)(66476007)(66946007)(36756003)(83380400001)(6486002)(478600001)(6506007)(6512007)(26005)(186003)(52116002)(2616005)(86362001)(316002)(5660300002)(2906002)(38100700002)(38350700002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U9G92UYwumfs8C6Tn92jPbhaMD/hYv2ubLXCLJt051G+po5W38oE9qEtSX87vTm7Sl5xf8qzIoJRXnbDQfRe72+0CcVSrk70RVUrLnAuyl0PXEZ0jj8E1iINXTPw4ldogmyCN10byg5J0mUoC3Xg/juhbdfcINdZ+J5rh6LQmrWqIjHvc75qB6xk0qjD5W5nSlxfeQrg1C2bKB2j2HaYoo8RZdLjk3nrwg4M1Q9PoH5a53WcdI6IXxtGRrEFRMDG+ofSY06pUNdsSiWYbMrAsVy1MNNdyZ7svTSDG5WjkTrqkHhojfRzEr1XaoEhZggdPX9CqGHs6Y4wVSz2AjME2+mQH0qe2K04hmH9dLzxVMV6G61eTfbgWKOFlyvmMe9Cdul69q2duUV2eYS0ALe7Uvsg9PMQPSocGf2hd31sqBEkPws2FGgFe407wG3pC+75Ft8F14TMc688y8NON8WtxOfo0r4L6Sh/gYy3i5uOIehGd9hY0bmbEQ+XK2tGmQdjndlLZWycbi7HNfjeoI8w0I3tV8dksRO+en+OEJh+hCEdf4E/uDpD+Ak+XuEiNBTQluI78N9wI5ICvOQWKeoyrBC5uR71646jAMGimkS0rZ5CfteELYtNa9KRMp/TmZnYo/J4mUZKo8/DmYUqiJ73g//jRgtTrF3W4EaUE1qlmoGjG5HvlylliIhDDJO1kZCpR0dTQ0zgSYKOrLvXu0+9bWtiz9cCSWp5c57KZ5Max0MIR06C35HWn/YKLdf6fjtWfIkGc+GmgdEY+7rI+do5VKOf7/gstMANveB0u1lpt9kOUi4tI1LfbmLDB7eW0ty3co3xVoTt5DdPmxkT8xDmHXD4Gv5NjKGbnK/xkFy1tk05GmYTsDheYAEOMI3mgg+XVduiXgL9LySvOLbwvSrI8WfvkaWXW32TW6MDjcH1X2fyP7/VDh6RK3mthGzXPVIX16ep3uTqPs8cF10qv37HWLhLGWr7IiWh+0awhY9RNEdeWL89IFb1SCPDP6TtuCvNBAgoIRc1Cdosr4RrPjZzKFequcCbyOZlHQocFrHHv2hIk9/IZ9nQ7wNm3p+79F6Io055ktZCqd+Bc5RazVebNcqf3PgWSHtq3g/+eLGHtEOk7VpR1p6vUj9hDQSo2C6QEelhvFG2Ah3Yqyg/vOg5d3NLdc2bs4MBmx+g3pI4v6VgGuzjX/5uOhTKHu69KnmYZlgx4kp36lbW+ANethbgbTKvDbuz0zTQ/QZJtC7SySGt904IDqbqRjMkQBV2lklR/OJ81j7YsetbOJYq6AxwtWvmucBE92MzScyT+niJBhAIh57/JuGDPqbiO2QTwwrnff1JfVfi6cKGZN14JFaUorVhPTYTcgKx8/hVd8XN8LRs4WnA9i/fLUoZkv6BM+E63vPScjAfjL9g5QbFw1bq4RGmaBQgDNZjHS15ZvtRuwm5hjMZ6BeXiR3s5MxbcER/4Dqrdp9/lAP3SvCP7V3oiQ9KPreCj9EG4jtfQLbGZb5x2GvRcLtydgG4ktNihM5gPtE/ZCF1b2TXFSsz7YyJXhlR60g3lto52QJQWIGPS4F/rKANfT9xIFKaBsYYcaY7xrJmFPaRv0bm8C449GBlf31lKTTyNZlW35TyIwJ6Oik= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 968bb0b7-77a4-4298-64b5-08dafdafcdc4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:07:54.0744 (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: 6YnE/P9U+uA1PLZpqfVFZlIlCYEZZmaumoTZ7/l8sA5gRCF8EiPr5hlV5XIe5FBIiat4XKJvgXq/NFJBDGEBa8eEoQYXc/e1bSmbMt6UJ2G5HBQrW7mJNQhyffnKK7A/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7701 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: Linux-ALSA 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 Tue Jan 24 02:08: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: 13113312 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 94645C05027 for ; Tue, 24 Jan 2023 02:09: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 3163EE83; Tue, 24 Jan 2023 03:09:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3163EE83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526191; bh=xoEM967RBCE84rKL8tV+Es7AoOK9qkJIpDJOa31ep7g=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=aI4sXWUQB8jt0rpAT0zFxt/ah+IrKjcALXNHEzvSze+tHTBqavmqV7dvBn9cSQQ/9 DSUD4XnL3X95R6K4VRUwe/AmuZbXmu60bffkUs5auaK3t4Oab+A/AwULWdoTva9TlK 1Gos9WkBPUIGZhpKCrWwXoenoo17cSjsgV92HZXg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2FC9EF80553; Tue, 24 Jan 2023 03:08:35 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 73BD0F8055A; Tue, 24 Jan 2023 03:08:33 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2096.outbound.protection.outlook.com [40.107.113.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 7514EF8030F for ; Tue, 24 Jan 2023 03:08:20 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7514EF8030F 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=Y6vwVbQc ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uzc2eQ7V1koW19mAeTW1Yi8i0g4vi0VnPh6hoeUbR92kIetM00qUQCxTo0WyEyjNa4yCw5VAXBoBLoShthIbyG2TvVfhUgcw4Bgnnb3qPzkT1J3K5ZbRd4A3GjZwCWASZAyCOjoB5y3ADuFD6fRI0MmtPYIXHO952B2BC45nH7WFtqdx6hEr16nPIN9KGVjlzBj07C6fl63P3/xcTfUqycbiCuS6d+LXxZJNim/jT+aRNQ3gCg29st3gPN/PrI2icjNeO5+K1QcvR5gdWkemyDOoiEsWTq5cOxmJoD5jucmaxGP4WsEYtBQbDkedItQ7a7Q2x7IHCB1O704VAg9gQA== 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=08SmPlzFDGfNDbwuhDOrffmpY/DKoELMkOYgxQ6SQcw=; b=WZUtr5sUgz/EHPmLNoewPPc9ZHKAPp8d68qnlkw7c8e5zUZr6cmqj/b9VlC/4vrhQg6tozEvrpOwWE5E1YZSylsUyFbH0m0Woi/ogg0gXh7lftNI2qjfxBqxi6tNqmg8iqurxcSXeBm9oGlv0uvV1jd6kcN6AvcNpTHkPYRRYfCEISgVE2ev1BEOxjzQdM5Mp+cTmGxVyk6yHgtHv3rP4GHtWq9Pt9PnS29iiwBC3KKf1J1qoiGn+NRXSTFNvcJ576b3MFhv4nrS//gcdCR0kGcgIy/g7QZ3UrQnAObaQP6Lw5ymKs57pHwDuOGjjCqCgCqRO7Wr9Oz6E8zkTglwNg== 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=08SmPlzFDGfNDbwuhDOrffmpY/DKoELMkOYgxQ6SQcw=; b=Y6vwVbQciVvqBIjuvUXcN5BcyEaDT08CivMdwqqJnXIq2yqBCwtSx5BkCuaZzUQY4Z5WT89CmS8tOSEvo8I+EraGlHzq/UHWNU5o7jMBBFBVEPwSHQJyXv85WyBuQ+6b1TvV4gIxtzz5lxc2zf23i3TH3aONwLwppZ14BDryHwI= 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 TYCPR01MB7701.jpnprd01.prod.outlook.com (2603:1096:400:17a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:08: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:08:04 +0000 Message-ID: <87tu0gu1kr.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:08:04 +0000 X-ClientProxiedBy: TY1PR01CA0190.jpnprd01.prod.outlook.com (2603:1096:403::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_|TYCPR01MB7701:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d29b6b5-5acd-4280-ea32-08dafdafd41e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gCKirk8a1NmGjG7jBO1IcD0BYEw9riDT3m4XBpMTZP4kY8jXnB+x2S3gsAvltCxVxW+PieE43rOrF1WBdLcgIvRISnDA/lOPOlGMYHkWH8XOEQBkDyIizSScatBEkUz0VZO83eH6B6hvQ73b0MQVLvvcohxTK7NxWovLS5Fx7/sBkxtxGYLssBYxF1pe5kFmmmZ+eULJhaVarV+L6sYHHrc1ZjX9CgUBhUVEcatnlEamZm4K0GWDbIAcSz7aqkieb7fHD9la7mjYBczMHb2sKShI8VlOch7cl+QUa1uRdPTvAFNxKo3zo4FKEAu0XXChUli2buCoiqAWpbVsJ5ouHhyr65lDlTbXxa2jnD3fKeftDckN69Xdf2OaJOjrjxd14DwS9vw3canTjFBGxfCzjm6eqk+ejFffQhahnN1yM5FkGmqhgRGOQeEWOcE3BGuxmxcZQFRaam5nbQc840S+WNjKywQ8nsoEDJ8cFfc8kU/Ew/cPGY/+tsXiQsLj85Uup4VPmC/vQft86JaUmxRSzRTi1PyAkT/4NGn4AHP5Q/iT+L8zckd+n11EH/ejSeLoFKdgso+hoYvpIZ8IoWBWL7PsS9nmmoMyCd2rIWwSj/47axXKRFSnBgDF3zDLt8MdmegFq+FBVrsrPKGiaEM8+VQzDPQ5PCYee6Oov959kUUtwAv4ZZize0yNCGlfXXryakVpwMwt6At22hrnl6nrnA== 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)(136003)(376002)(346002)(396003)(39860400002)(366004)(451199015)(8936002)(6916009)(8676002)(4326008)(66556008)(66476007)(66946007)(36756003)(83380400001)(6486002)(478600001)(6506007)(6512007)(26005)(186003)(52116002)(2616005)(86362001)(316002)(5660300002)(2906002)(38100700002)(38350700002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5SZ6jzUAIo/csPt2bcu657Q/aoJhgCqGCqNwckBmS+SHnz3vwv3QnLY6OKa0MOZcEMIbB8T+ionmtSu6BHd/3K5bQtWVdicdqRBSwqNTOSEwnl/C4Mb8aoS7Nh7MX9a3BegPTAUwPFk5T7ZmuefoU1i8pjJAQJFuDWicXxX7Zb/6DflIypyxSK6LGOVkp5p0RU0gtIkGCUHQDS3Ngi73sKYa7McGtHE4yfeWhG68c8pIMhsNXQUXB1mr9LVVPXbhLeJkotDobwUKXv+t5Khq/9PtzO6j4Njz0b/ngq8ucB4vKVYRGw/atF20BpThIzALRs/WA84fF/5f4lqRqEGYcOfgHkfxPBLNGfdKONjXKlnVJI8bfXfFTnkiiKyyAVjWE9AodlKKemIa6bil/C4MUqtKyX1m2Q/pxE8V+yInHnH5+7/Lyau0ZYZP9T7lwENowxC+uIEbT9vyPcF2v5zxIQ210zQ3jS1/8m7GDxQ+jPegZonZMTb4nHvGTW8ICD2ZYZI5RSUnl7rlgPEQmKSpgZfeukvI4vSW0VzxE2Hz6uRxRdvWJ0wvZtVzmmbXz/f7lq4XjDuDyAn1bLBxot/6l6oI6K6Fc80bsW5NPbuEZqr/RghCHUHNtEnk2nBpqzE0hPSeIgNUVhRHAfjg+RZtRRwnQJdFaRrdnIlj/1TOO2bfSVi8jldHmAXgmSA/1Qmbp2S2eSkWfypZIvqljpNmlQ710H+Bt5byLuQRbGcle6/1X4um2NMiJ3wOtJh562t5iLB1f3mwKY+XMYY+PDYquTSmnN++IUzlLWS/PyScgiRFOnhrJ6SJb8GuhgcwKpY/JaYfe9fgRLy5616QqN9uGPmYCJ9Le21PEuZANn6Iq0ItpJv4wDbIAh7vp3uAH4TnjbCQTxq3NmctqqXBv7lFKt5iAqeica3k+Vq3gAvSm7SXb7/ftGBjOHyAyntzjh/2RXG5M55FRdfD4LjBNsaWwLeZ/XPwWHkt5h3vOF/JF8FOijR0/+ZB4Xz3TEApvGwMUcrKU8+Jwyv/Hst6ZW3D7y8Sjh+diz1bGMS7T+3sYpJsUEG9wK7omNWaGWI0Um/WOSjgxmT9a06m13/WZc8vKAkOwmZGrb1NRuSNDGacUWXSchUlhJODzLuwoCLAN9oF9olsyTs4TCgrpnURaPB/C/H22OgYUPWX94tFOhYQWbOHos3/yCsSjc/R8Yl+Y9WdVxaZXBh/EBzANNh+uRtkNb2NKE6hpKmoW9UttPsLXa88S2kXjaAe33sLerumG5l77jW1abJYS8D4uxQ31/8FZAICLI1FhQazpK1xmm0wMrJdOmh1DuJlw+dGR/8MQzoudD1A1xAg2b7s64TpR7Lxbj3okUzEBtkoo8XJfeIfrXTYXML14QtnY7+mh5SP5mJofUPrOFSkztLr1ShaG79BWOGH1Igbycqz3dyCGcXCPRp11Yj/wW4KhwM2URZPPSS6xlt4QIIHoLrUKFyQkio4wiOFxtV9q2NosQL5ht7aB4LVuGXhuELSSfjRynxKFg5H43XtUVMCAOL4b0t20fmah5+l88SyDrD1lVZDEzOi8cDJUHEYJowQ/sJwgGaqevlUroeqCJhqJP1mPW83wmgHQUqR6QYYq/H9oOIA2QGctWA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d29b6b5-5acd-4280-ea32-08dafdafd41e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:08:04.8589 (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: aOY3oB0CYbHwJOzjqcChfsXa2jwFdgnVcF125yCnkVyC0g5RlcNfzWBBpdcmTjY+2Tim7kiE6Q+KrDHXAtTZt9y9FKZoSYbMIXC32VBReh73VEbf2tRk39FEmlal437H X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7701 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: Linux-ALSA 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 Tue Jan 24 02:08:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113310 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 E7DBCC25B50 for ; Tue, 24 Jan 2023 02:09:22 +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 CC86EE79; Tue, 24 Jan 2023 03:08:29 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CC86EE79 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526159; bh=cnZxgJOpDmkVmBcM2TMoQnU/cr23c+Zkl91FHP4lN5M=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=qd9+kUI1LR9A5XtyTFih88QNZtATAwLfd/EaUUpMYJMatxJDUunKDnt58h4TphqAL aT/F0nomDLN/2TFRGoDDxvRBaomJvsUU/rBlvCgTR2k+n841gekYrQSjAOxqtu6a22 FHtJMCUZGg4ILFlmdvxhLwXJhCtBCre+ezK+k4tU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 39C12F802DF; Tue, 24 Jan 2023 03:08:29 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7DD3BF8053D; Tue, 24 Jan 2023 03:08:27 +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 16530F802DF for ; Tue, 24 Jan 2023 03:08:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 16530F802DF 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=dr8D/wjx ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fxil9k3p2RJiwpE887RCmUzivVwzn7SS5eJNrhzxeqr9K8v/BRhdA6jvOBR5qgHR43NuC5ldsbn5cFKBfxG2JLIDh+SfbvWKIoW53qTIVk4woeRUnXGt8hLrGcQEmfJ2kc1kWANtAobsnNbwWWgo38ZoJ/BTl5qgNQyO6EsJH18puAW7NOSFtPUG247RCezX53nSkxdb+0YKglaprZF0dC9RiVQfiG9KEdm64TjG4SdPT2dElXJvxLYwTZaRx1hsYpsQBIuP/EV9bTw6wG0uc/3qZyFs5Nm417144O4HYbIQGqYUDjBBRVAKwwBeE0aJm+Q9jWVHh0HetF/SBtyGKg== 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=InVWUW6g4FGe1LJnTolBTyS+unFt/5azc4hxxvd54qU=; b=gqCerdXA/RL2+5J4lH27s/sfkslAz0DeLjaa6JLggEI6pnFi0OLQCaznHQS4k7mz6Gjjk2LA7w+M00nMijq/0knHYDTHcCw7+OfB4Z+wfEar5M1Y9C/+avHJjmGCPrvYOXBnOoBl3WXSsBWoYXL4obQKMKgTZ8ezEvVd3cGnuueSqGgDbdNQY7dv6o+hEFRHhO4wQZlwl14GBqNSDgX+ENmtyv7Eei98cR9falIBfFqEIkMNdOv7Sjxf7gViL8oqJlPARytdFEdxst9kssytxW2IPnBl46AvvdX5af5cPWYUU9ZuztUrqXCBz7buOcuUmoDGVdUugY0eqM1iFiD6Yw== 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=InVWUW6g4FGe1LJnTolBTyS+unFt/5azc4hxxvd54qU=; b=dr8D/wjxIqjMbrYzu1+fU8J8x1PwsZnBloAgZgyY3cyIOiQofDi6D19TywRwNm1FWGalYH2SuKOoNisR+ra5A8AJ0J6WiEUdWf6Jc5yN7ccXYxmi/LpNjp6jOKUfWJYO0KgzTe7r3VQNsIBfj5T3Y51yF2P5RsXUMTVHnTi2dEE= 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 TYCPR01MB11738.jpnprd01.prod.outlook.com (2603:1096:400:3e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:08:11 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:08:11 +0000 Message-ID: <87sfg0u1kk.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:08:11 +0000 X-ClientProxiedBy: TYCP286CA0136.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::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_|TYCPR01MB11738:EE_ X-MS-Office365-Filtering-Correlation-Id: a9a64718-ae65-4949-b26e-08dafdafd835 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kaX6pMy/ezszPIuP3rEnqhQuYoJEP1IN+xfiBFsQokRDagFh/bGwggghs3sbHk1nSgIUdfQmNt9Xw37fd8eKp9/3syLVUnyE5eEkkpd/r/lvLOPKllPknekgz8qU111GDoEZf/4PQOtwEMHNJTTxR0av7Xy3VD+vV5/kBxTVzWA/W0k+2w3MYJ1Z9OjDEr1sFz5ewf4LVaCgLCcqUE+RdB7/mSevcKSnXgV1r5X612YT8+fP/ScttDETodP9Sw+eX4Gd26uMaaWGBmaurmrHJycT68XGOWrEjtsXIy/dEd5qIq6NvXsCerQlVjQm1uOsTOgo3OetTrEMM3Q9NLD3yMhKME5pX8TpwhKXZM3pVtnEPIv/GHIX+Uz8YXGV/n2up3FHeiikxvuRzThWf73JX3t+1KWdyiaLjVJN4yc7WA2SvD0EjiZs6fJcjaEtmYPlENro9M2dme8NcGUZyFeNHsns+3SsQiBQYEsYlEHOupm4p0hj4hfLfW/ZJ4+qQZUa/w50SkP4ljMFjFgRO6JljZgjJa0WlVVkZDmlJdeFD9R5rAiJ3Ys7ztwhFCnwVpWetHPVYIumMb015C+7tj4UD+jShEKcROASGbtoEiM7I/WEXUq9yaU8exOzoBUJ5Ikb3QT9eE0ZZVChlnm20UfR81pWadgbJ+RpQzlUOVHKoOk+Lxt2/x5x+JdcDMcI0dwFuL/iR3caVvX0REdDr8+Yig== 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)(346002)(376002)(136003)(451199015)(86362001)(36756003)(52116002)(478600001)(316002)(6486002)(5660300002)(2906002)(8676002)(4326008)(66556008)(6916009)(8936002)(41300700001)(66946007)(66476007)(38350700002)(38100700002)(2616005)(186003)(6506007)(26005)(6512007)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CpNQwUaW0P1wj2yTwmp20dvj5loGahCBLpa0g0hJDSYB5PsOx5DYPzhgntuNQfcwFwryPijq1Xb7alwYeI1Xf9D4hl+6aVHO532adYosztVmY3o5ZcL9Ld74FAsQvzd/0h9bXbwprPjIWwOagYQs5o2PrkLNMOkKz8u/sTyLy7lMJb/I9H0si3XeR8/uFBWJpeJ0/B4Lof06LZhgRfU3u36Zr32eadt7l2kSTaIRRmPnmGvOItplwwI49PMFBode+4P53tuBndNwxUMCdnP+x5RwBJbelePV7z4xvyT7wkfmmFqd7F37BWdaoUouOAI4HHCyB8mfy6kFbIEpKdAlUnTs5kiuNIaRhgV+iUAW0MJybyWgIMg248BGmN9Q/DzQsI5uTVeKSeMdcfKY175FVeAMdhBnj8M1mmYxoD5UQ0yDFiNcBQVrnHUCWrbMvGmw0wAbCDOV/1UZm2USAuMyLlXYMGGb2ak+NZtAu5QliJPLWD1CpI/gMfbMP/2AdNK5v48WFLk+VaLeXXAbGlLlot+wEYDuumIWi+xEuYvdy6xvYpNL3wviGZwJqBKegCm8gtoKfiGG6SDmvG0ZwDYXmNZpnMW8+OWgaFZO7GU4I06D77K6UtsLXuRduwMKcwocRuC27Nd46yez+gooKCz872irLKLxGbUM4gAQ/JnZBVbwdjz+VOAJnzuBnbWbtzHeCwqTXhZdHRgmqgLcf7lKHE03TdkmMVyX9Ew8IPafKRAxljZkDhvrqoa3G5xbDIpSAo6mSxxmh951CfDWch5dUae6t412D7AKUsa7zzR8zLhMRakn3LFTEDp7IrodKGciclinmTpVu1Xd7fZ7eiBlRr6XfHNTRp17ugZJyjtgvtxoRzpIu6Mvo//4c8LZfO305Y+wkt7VOC8GpSyYexbIxlckrN7fL8fy4zFuscgjD6leVC7jUDJlSxRbHQCIxpzjuBT6JgttzKTpaRb/Y+Rf5Q167UjspWfPhPcGxAZHL8i8f3y7IRGY/bPF8k1oj8wzaz6NsF6OCSVUY6IafHuhKkljevOfBl+YD25y4T5ji51NK9e55QKAIQ8xouKoekWvMW3C4cGGeiDZkApulbE3293VbwoqXJXMeUI3ZkFaRfGjeZEH9k3+fJUijhC8d9Zgbikx2fb7HIt+Lb8YejFX3kiAfml6oa9MG1CtnjMWTBiVJAgY4D/dIdwyEeabaFwILpNC99hIMiKgbccnIRp0V9llwwbBvOIiKhw6O8EjXg84qGA4pv/FhTKgVrQljGyJPIkMELOYpyzMIJDKljCPO8aURseT9+WaoZapXyOhZs+ATXfXqLIsWZOLGlfNIy9OIBQgiLL8DIXllJ6DvunBf8UKOGfiBlN64NCDKAWhLevGApmnqYYSDRvpCWSTUWWFa1XNnMNcx8u9RIDfK8GYliJK/Jj6afd+bG7ejHexwnOhZTHCiBDM2Mxy9GT/MfvZuitxNEZ5WGzevJbSgkzRoLEyqizuc5gKm9jHSlKs0hKJtRUVHhAMorG9p3FKCvQAry1Sr8pgDW5g97x44al/IiTdchfH16jSCO+zmMmdPW7knl7iTXMeI3jf4pNj/CEcjkSPdUpmn6MXyCR84ZgZNbjOIA7myDdpEmRgeKvzrAI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9a64718-ae65-4949-b26e-08dafdafd835 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:08:11.5944 (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: /qQ7ZcdbrASMMpJY+2bJBYjR0vcVSGRB/5clkjviiGa+evCMqJE2lEA0lQCoeQyhBszVFff9zCjbuOIVj1mKWUfm6xfYLYBknZay279wOkrW1U+XdvbGeY6+/+/7siIm X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11738 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: Linux-ALSA 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 Tue Jan 24 02:08:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113313 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 911BAC25B50 for ; Tue, 24 Jan 2023 02:10: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 76C26E7D; Tue, 24 Jan 2023 03:09:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 76C26E7D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526207; bh=vBTOQaZ49F6ANUXrzwapNKExAQIm8jWSCaG1V/yTnVI=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=Itcqdqx9mvpKdrY5qr0KaDMirifdLqbfrHs6wwVRjXmGRn5aENFHVHhHOBtLKT+Pk 3HcJsVXmwZd+TOgSBVfcDBDAULmuRqrgIaLVnBI7kpHUCqAGKNauuRjN8f6dDMphbF pfIzaczIeKKsb6+g+liBu1w7QASTrmxkL6SWExR0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B1C77F8055C; Tue, 24 Jan 2023 03:08:35 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 715ACF80558; Tue, 24 Jan 2023 03:08:34 +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 4D281F804D2 for ; Tue, 24 Jan 2023 03:08:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4D281F804D2 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=b2qw3pxt ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bb7Idy5gbGVL9r5Y2Mqga7dlpkjYC3X0aVLZf4R2lbU6SiEvR90Fj/VEVEPzbs5TWSpylqw31wPcK0hJViqL7R2F1t04S/rlubD9gdYAtUjUdgq6VV5FHQEUwkMk72n4ZSKlsCdKOGD1eUmTivLE6KdxRoZ/+z84Q7AxVKazEi2Q6leoW94ykWCAlvRr0QleOHQN59lQ6VYPwedmeTlkZUHJdqJ7tBTi95bUCEsn3YREq+tw/+pjrD7vDYzp3sA3YGE0InhTafEVmCYbAZYbogg6g27NuOhfwvehWxedqHXWXDkRG7gj4prU1afhS1fKe9HpgH7eZFpS8wcRHSRT8A== 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=b/fZ75kVDHBU1wLcbZHXe1AOntqNjN8UwMjt0c1H/XI=; b=FpIaWfdwdQ80Ir2BmlfbjaNBsPuuYOIAmpsC/hkgKxqMiRU4iXzha8nZC7YO7/o2738rZbcomqAsITBD7tTna7ZDNsEMQDGyeBiAxp7JWpzwQL0+DFSDAT3687B4K9q6jXnq+DmfUpwM0Rne0GODZ+gtWPbekI+nKhFliXvVNemBdBJfIEs4pPAU0vmblmf28Csr4Bi04Vtn0rKMjiblc58zkgVpj1GactgtB9XYG5lv4zpV9D1OckXJVmpxwqSMr2GwhQAu6m0pmsLlwh6csTiGvj4t48XXUvvzvGW3vQRzRBw3ssMehfIIf7x+CPEwp+4s9Zg4fzbLuiZkU+HIkg== 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=b/fZ75kVDHBU1wLcbZHXe1AOntqNjN8UwMjt0c1H/XI=; b=b2qw3pxtgw4CCCUcR9pkejVStu2kcB9xRNfWQZCgJvk4OCAmOqnOITqlSTvxW3OOzqL4MHRg9z44Z48fxYM2c7sOeXWqGnQ9szMR5SgnD9j0d62C0rCiC415HCEL79KUEdYbOou7VZyc89SgOG7SLeOfadC0jAfymeMl3KKyY2o= 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 TYCPR01MB11738.jpnprd01.prod.outlook.com (2603:1096:400:3e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:08:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:08:18 +0000 Message-ID: <87r0vku1ke.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:08:17 +0000 X-ClientProxiedBy: TYXPR01CA0055.jpnprd01.prod.outlook.com (2603:1096:403:a::25) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11738:EE_ X-MS-Office365-Filtering-Correlation-Id: ee4aba8b-2c12-42ee-8ae5-08dafdafdbe8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OkVSrQhqEkvXAvj8uFxLUrXhZvPgxXqCL6lPcyIzP9/hf0LNDTzZzgn3S8bNndngmha6DZ5M2mpdLgHVJfSjZT5d17Rv0NqBIiNqvrWz/31F57Fv91pGInK0iAy3b1iDrgjpePE4leXGbiUmoBcakAkNlkszKMxP9Qwwq+iUhaodKWwt8Q6mk10cqKA95iXhIXAet0N4ybv2m4dg66K98JZbG6XBZfKy5b/LsRX4DHVfJD1WNqfHkWPQnHsVAoFGIuh182VFqDrMKXyE8AxiPmiq9XYD/9p9hYa4Ya3UbPcCDBlxuXSh6DJjg/Zcap3cBSx9mV8AtUBuoKkSgMXW2419BKSU9wgLpPwHy5ok06BAl5LYaY1p0n3eAwtjVYk7uvI9GOoB3pU0azGhaqvkO3JpbSVVA+Z5C85yFNzo7gZ081kjBvPztyFYCCxP8bvuHP/bh527WY0f9a4gn07C7+xawASOIEEIiLIT+Ws3roDrqrSMG64sd5V7ha3c8GKV7FL6HY+nQVHCQcn7+ttM3Vy1nABtE9tH9DIxe3/8f2iEUMgUbansyVrYjsn9RQIphk02PX0FT6bjLQ/FsiigXUzLDCkI3T733jLIsVxhOnBuKdGCzCcS2vPSyylDmxTrb2sfOIC+Bm7KF5i+WxL51MHakXApo9jlak6/p7AmJVyHGIwNyrbXBKUOHnCufnL5GARJ4dxajuahHLcshqUjHw== 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)(346002)(376002)(136003)(451199015)(86362001)(36756003)(52116002)(478600001)(316002)(6486002)(4744005)(5660300002)(2906002)(8676002)(4326008)(66556008)(6916009)(8936002)(41300700001)(66946007)(66476007)(38350700002)(38100700002)(2616005)(186003)(6506007)(26005)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FtZTD22O48B2Y9cMYgmQ/W8eydM6AThR/hIe2ePJXAuL/XrQBLUimCWcQGVx1MlbCaY3uUHCmqTtBWEQoeziPMs+j7ax9wQrwUU0NeWneywOMnp+QvYp4Uug5ztew9SuDHt9z6psTTm+9pygDm1WI3Yg3XnJh1duE+R+q/3ZJFsmzZb1O3gqi63pM6CyTFdXqoAgyUomEr0ntPfQc6qXyO1zpFbbG+Kd/3GZ7pZTK5T57VrvV6CBZM38fj4cD0si+ssYlNo6BW82b6OwJWdgf1ZjI+yf4OvsgSDNJVFRe+PoZ8OYkvY24XEDuzN+Va5d/p20Sf3MsljlWmLJdAPthGLQUrblv+KVGMn7DkgKnZrtTKCNDhMEx5zjx/s8l0dN+DZ0wdfqD4ubzblsLimVaTa9XXKxWXE1ZvGMA5GN7smdNgL1u+uTJubLk65PY6YqTA3aQHi+g3LvHkjmGM2ALjuKFBWU2pKcHFGXE2DXG2WMBkcE1pr1sLRnMGxzX/hN50TtNMjmVo6nLe+rbMpIZgHqdRCYVs7xfk71qWdruvtPsoLz/SYElyVsjmFLC0IKCd7ETqKuYot5E2wl4o4OZ8UNDqNbKhyqIRo3ER0mDROnM/F3q2OvTrzA6jKIZTcR34AGdKgWDKhwi2MTGTFym0HMka03jAMN1nT6QTWbbnnpEo92eT8NPXa9AF47h1RiCJnIWrtrmSAyNcUA5jfLpxxRMpX+XyUTCWk+H+5efYRFMuX9f/62hqyYh5TrzaUGV5ZxEYzNw2gV7B3tNXRkqjJ/9vRr/tI6Y9KZtkgwZ3RBv/gqUly+ZHmG2hxPoSUO1paTp8oCsj++01kTqpRAvGMZeGAOavlRdtJ7A0D7oZw/04sRKKt8Rae4WAajI8QX8nDMkwV66z13Gg7KikE+bNskbNdyu1d3dSGdqZmN1sD2mMcjmFZK57mYUq1AUX1WHkTCEVwl5wnF/HkIcKXHX664Sf+KWcMQUPUTowilNJMpgKanHMNDyPv4cGWvYIeb4LZi3I2inLIPwQMQRxCCVS2C50F/a5UNwNqLM1yGuY07E5qzvr5fN21l3eug49jOWWfmh8J4gF0UNHUtdhxTwPocotsQWlsAuuPXMTkHNLAEFG3pUgkat5JjrsmSy6377vigAK5+2i2mChtyPhOT/YCnWHfKF2OygPRWp7/q7IsLv8okRhv3ls/1J7h0IYcOK2/+ffD/exNfDjxHU+V2xYf4/tvaEt+wm5kUlBycHuu97yuXzzCXctMblznx3sazOdTqvmrdgifj2ZDMYjGMEEpIGeHvZbgS0BMiNFu4vIIYCqr55UckD0ApJPwIjltCoQUp3kU4PT4zqxKJR4dF7lpNBoUYN0wFqU42U24F8i9CBkBmcnusLpOZwZelHg8X0HA2yC9Ozz9Z/R3pSddxOOMAfJpaZRU7QIgPRMebfrHquE0gMA4DaWM7/aS8dCZKrajRuqsMo0UYPiO02ZMpXpsIXTRTHJFsoLgzzdjkwMgpfCt1Y0PNRxUpHE8oTA+5AxOlakw8V68eEUfUQpdW5TA9uAx4lc1EF/33EWnTcGEGqKMJuRaeZrQMtzqN9EJE8nXjP9QtgJUbh6DDukEGOLcM0w8FQNuahIH6WZTuvVg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee4aba8b-2c12-42ee-8ae5-08dafdafdbe8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:08:18.0163 (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: v8T51VzP6V71IYkjp/8Sq+Hx5+3xwNVMzzcJ6auRy3WYhvsIvYN6IJMQtTF2vl2GuEDbclxbni41d3COhnasuGR6uD0V47UOzkSwyfWPXK+3QV2h/80lQC+RbfZwEGyC X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11738 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: Linux-ALSA 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 Tue Jan 24 02:08: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: 13113314 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 508A4C25B50 for ; Tue, 24 Jan 2023 02:10: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 223E1E8F; Tue, 24 Jan 2023 03:09:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 223E1E8F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526229; bh=2fNNpSfO24r+GmKD76Pbiz/ETMMgq6wF0jWrKVIUeL4=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=bilo4VTt5f6jfTW6jY86S55oUACH78yx9OPAgv2TOu3o1WyZ6xTbU6XRL7PLml7FD mTu9NwO4/r/mFkm3nCSmasHbcrzulzerXaXJz8GjS+UqQPe+6KeLTDP8ziegPIx5E4 1/NecpF+8gL5bOgfsHhXcjdxeSbz8hASqGpYoZIM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 01EACF80543; Tue, 24 Jan 2023 03:09:04 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DB177F80548; Tue, 24 Jan 2023 03:09:02 +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 57D43F803DC for ; Tue, 24 Jan 2023 03:08:59 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 57D43F803DC 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=WOS0wnAR ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mH/V5x0rnvFCAXBock2ZhC+/wxAYaw9H6PTVTpkvLD0LhvbbEUU2Qmdcv21MMO6w6aep7b7CJ9s8X46ngC5L8YzpSCI5JPQsrpoaoxjtrP8eHPoJF8iBZA12zgfia1vEgdhGE9XGbEMOWuc0bJxMIxp4adoCw0nASuKZF7+Ut8ccCX4GdxWci4ZUOEP6w1vYvI2tJ0ZjOnHfL6YRSUyt64IG5atI+CC/FKS6/1vFZy2PC7AJjVtKEwZMrKoaIudfLXOmLImr9ytZiNaGzxORyip1twgVx9tzdALes8BZ8l2RhTXYUz2Nu3eOmWDJkjvDcHwyNknhKkU9yipywVI2DQ== 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=I8v+Lp9sjfMqvdAe0B+DIzmPPtKHihRBG32sZjC7UGrNJMICcYsijzrjfuLLln/RPBJpCTcBp2d//ojX0IjGjGpYhs9G+y25mXLwddPHrJxThcdKMJiPmJRxzrvjdLpU33OAscb331cpVZjpLr1Z3b7XSk1diIv0JgvUKTxpyCUFEQm+sLlx2YxFpBOTmSUdrJoXL7MDzqyDIpNboRlxl7YYYLQTvDM/M+ebYyjtnVXA29FzWfpz8ZEpBGC2MEIAsfJXO4BVbN9lZtFPVvnBaab3Fn9PlR/6n0ZADl7AcBDneAm0lLrVovkXzEFM2HI17ZhtoNoKEDE8ft7oAoCV8g== 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=WOS0wnARjze5u0lIj4QD/yEUBleLsdB6uJ4y8MydcxdXv41uY0iuD9m9YWznRD0i5ekQ6R36xwa0XMsHUQQYz9Tyr4AOJ0vtocVI0tMhDSIQLT+cdyIGMF+QFfXUQ2lDKlrjAfM2l427N9KfWWCsjXt5elBunaG79ERQ1W0DWb8= 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 TYCPR01MB6128.jpnprd01.prod.outlook.com (2603:1096:400:61::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:08: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:08:54 +0000 Message-ID: <87pmb4u1je.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 06/25] ASoC: hdmi-codec: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:08:53 +0000 X-ClientProxiedBy: TYCPR01CA0149.jpnprd01.prod.outlook.com (2603:1096:400:2b7::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6128:EE_ X-MS-Office365-Filtering-Correlation-Id: 243fda16-9b14-4026-22d1-08dafdaff186 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZC+0uSNRRrArMv5kUauZmZasAAfxKi7vLSK2MsNVpVONnIQb42Cb8gGPiBX31r0MMbKT0g6ITDWOo5RqgcQzWobEF3OUqHVj5CkOfGWQU+Tzgt8v8dxlbEzqm9KEZ6Tz0bAVUil43qM8/qb2086mWub8Q8iYkweVJZ9Ttpgq3ki1KQnK5ovr9fXvge2Nm7vpiecM4kbJ1/zAqflMdM09fGqrPOhxz6yNLWjETvkj3M34ERHF8ku+vUGGnmkHH2Hqm3md2u1uAdNox2Z6YhTWJiAscdUtVJxqnZT67Sta6j2W65Uh4/28QIn3E+iLUMr6yBHBpow/jyeARAqw6F3C/T3C8LsIpFN9a1yO5JG4U4IVe1e29t/RjguxW6O3Zi5l8jk+69KRMJRSPuwpupNZCBURbFYidO9Xo2VE+dn9AN0huo+k98TSL4a7+upVeqsUAhxUNGRgOcUWLVZtAY438IWreVtLOEcxK7Ce5zdIjKWScclLR2T+n9nAyixMbd8E2naL5NEfhKPKhgeBVQWfuBDGJQf82ALC3lXhHnDut12vWpCgy0qaZg4c9i3PCfyltalih65HnhlTWfffjgzy331m8PIL4oJD4w2QlfoSFM5pJ95iMcDzkHSpAPE+kZbUrlbXo/wqBGHefHW/WiSeFOSV3fOhaxZl5wpBM8HhNIiY+sv5DjER/zHcdWLzGxRm5n7Q2GleJzgkbHpzdsNaBQ== 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)(136003)(366004)(346002)(376002)(39860400002)(451199015)(36756003)(86362001)(66556008)(2906002)(8936002)(66476007)(6916009)(66946007)(5660300002)(38350700002)(38100700002)(6486002)(54906003)(52116002)(4326008)(316002)(8676002)(41300700001)(478600001)(83380400001)(186003)(2616005)(6506007)(26005)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RnsXDeJ4kqFIm+9spf8pHpDBY1D4p+O8SVrBIfePj2qZD+tt6ZncNh0HrKtxd/wp41M8sZ+R2BEdhvScxdInGAVym+GBktqKGpw/Pkb9z3Mfrmm2pDSSvilqky4k0yeBMezPVM+RJkwbyuaOBA/5eFt/+c+zPR/3LWNXIOAtjmJaanglzsDYymVTLclJsrS82JGsc836ies7ruNSNpK6nkTv3rbmVBoZStTrrcG1IVxhNyRTbhbt/ArMxF60MlVYNImvPpgm4rh2kpJwiMpE3I9BepAOu9FraHmnexPDde9b5ZxX/5HcEs81FSEZgLuu4PraJTEtteUL3vwbYzeR1OF1KzyWnGttPq1hdQ//9zU+Ju80THbbcANwKbd2R91jqaz/wDah90JN2FCtHJth9rOfxGATrXkZh7oiyZuay6oxoAF6ctVPcRu6KpwlKdTBLcm75YN/BFTNLkPeOC7mPElTD28p5eUVLIlsuwfsthpI5eMuL5eh+hCvF54n7Do7gzam4Nlkh8JuCP4qXAXfYrJI4ImJX6nJ4kFYU0rN8sSH4rWwtES5No0A3yyvd8sKbi+yfRaSghG1RFSm2Lfj6usRQfA7PTxN1qHnZxR02zKwCVpes8TZNT7ud1E6jCAGr9pR80skuGMGDLuz/v0AJHrncYkV0hd93iSn1ZAk7le0dNJw4A1bEApjqiV3UNTeNDYSDIpBwpqiPcvQaxdPkL+bdl1+6z5HL6VcEZiRrLwMnz/HuOZ+kR8qtV49w1fJFg+3vnRrINn6TQAOG4Gj9wK3Cn42CI6qaoIgnfluNgdCsZzFVH3BwdUbVn/oaasIB3tAgGUtNLFx5YUah5BK3tAPNXVmnVXhBQcJFThBiBXGvSvpCbucr9/9JSs6Dq9GTf8PzlMPr7/sv4ExlSXECQj+iH+AusnHThAph8cvYTa2YvcPmIBY70xEA2+Ly2jIh6colQROHbGXmVvumIsmTCRSVLqGavYTX8UWlAr1Hl7CCoQHz1jUtMMOeoYdi1XfMWimfdjT76o34PKLZX/7/2r85NxILmkRWcZ7cKBTnyrmqJ/tRazVqofDdMm9ZlRPChe5jQtjwcSPqt2tE5gGpov0mD0mAlNAQyx3nYfR9aF6xveZJ/Ol8GP49r0ala/70DjOA+gk2RvxszSCTOVUWBA87J8dzgI2be6jRiXh2nqsWnJbL+lvs4XZdjvmM/TSaoUgtEfIn5lVpHfUwEyBfYh1j0bjj+nRdmptm80D6hnx31G0o3cNUKvHAW5ehB4uwsJyij+J/bk4I5hI2Sp9KoTBqxGlEtAlH+ezB12BDzE0EHVDIJ16UY//pD8PRto1U2nyqfjfFubsTHpRrMpp10XpwiS3EzAViXf451bBUTg7yqlLIruB85uiUQpavdpd/6CVVSgzkE9UErKbuK/3Mr98HjP5OxDMWqivEKOolStjKR1UgbKaW1ig6Bpk4WhCPEC1AQ6kJU1Gqoh0fMdVhmo7tt5qgx9Ful6RprZrWRRPirRcS94GZ3Ec7aV0hJHq0EI1iZ7LtNqttumEbeOobCkRgrmTGAUciP6/ARLhYIPBoxsqbm1zaombv4jjEF16mL+WT0HWyctNwBTZEVPFHQh6nBUkcOaeulMPlsL4yYk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 243fda16-9b14-4026-22d1-08dafdaff186 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:08:54.0800 (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: ki/n1zLbsXG/AQFqXiaiYYefanfxr8tmBlLzjOi3eR0MfARhS7i5Dd0UU88RVNSFqB5w7FHAUx0k2pPF4ovzhNpx0Y8hIG7b55pRxv/Xme3e1Narm7WjuRAoC7DqsKy7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6128 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: Dmitry Osipenko , Linux-ALSA , Charles Keepax , Pierre-Louis Bossart , Kai Vehmanen 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 Tue Jan 24 02:09:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113315 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 7134FC25B50 for ; Tue, 24 Jan 2023 02:10: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 E64AAE92; Tue, 24 Jan 2023 03:09:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E64AAE92 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526241; bh=CTcchOkvpob68bMHwkywSzJcRpjmweYX7cPtxyy04Ak=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=MjW5V9AdNvlvT/4VGK3PVYL6tVY3hUQqDcUI3nwENJm0kG7S1U8g+L2208bJfM4sG 7RN9ti3CJptbczT7vj2dP0WK5EkLZGpv39g3ESs5qnZOOUBsX4AGmSVl/KmQSMJ8wl wWc/5+7GnUWc/E7StLN3OVzrlKwF6VnRbR2HTrfk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D01F7F8027D; Tue, 24 Jan 2023 03:09:36 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B7223F802DF; Tue, 24 Jan 2023 03:09:34 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2136.outbound.protection.outlook.com [40.107.114.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 81039F801D5 for ; Tue, 24 Jan 2023 03:09:30 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 81039F801D5 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=ExSrsItd ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eHqF/DQj5w2sAO8oT8ebUM0vfRUGzf+TRQpI9B1AywPAw/NlaGAIVBY5w+Czcz4TMk/TLzaFfojb2nsHll8qmDfMXmNiJIM6nHCFzZu7m1JC2kxVGLgzdNUwsLEHil+zdSo21t9lnrXiV9ymJLvgfmFjzWUtxDsNk8PSS8kvzpvGVRbX5Y2l0yT0mWbtKQsCUWX8l/3meoqprnNjeLAtqCTBk9o3rhZo1kvIWb8opR8fLUeEwZk5rJ9h3St3L+RnGlWpvnz16GTEMXa9V/mfeUpmRTrR5LKLbrAbXS44jhPz1sctff8M1fqyfZbaxQ/TYT7gmcPOsjUZgrfSOO9B5w== 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=ZWWYkxOTOqJPWWwxCvn8+E/XpJ08v0Ni5Y0yF52zU6Iv6pXUUY6oU9Ntqgm709XxGeYQQ2sgqkjiDL2WcroKNTo1OezvtWKwLDvMwXwed/he1VPADhRLeO7f9RpSnXMfxRxFix1K0ypzkHxaDKA1+ZguVchkONHBC4IdxKAXQF7PHRej60dSXx1v2aqyYpRlxF0JP/cCIXWKYW8CWslnuwDpyCe2Nkb1DGS21+KRRTZbDs+khT6PKjE6YLOVc3prpoZ3OK/4RIClND4IsuMqth9ra9kRzxlsEYVb03TlRMzYNlOcTL1I2/7IzkHa2AjZvctP8r5c/AmmPhH7FelPZQ== 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=ExSrsItdqlPYxbRVBMfA4FMs4nHUdJ8UXNo4BqmOYf20wScCdBVTlSUX8WtTI5q1kj4XthvbRM/lz3UxABkK2754bIatnISGuK3/L6mCgm9DfiGyEORpIlF6ZGf89UYJZsE8oQUC2N3aOPJQ84bjXbpPy0qFgRx1T4i1FVce9aA= 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 TYCPR01MB6128.jpnprd01.prod.outlook.com (2603:1096:400:61::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:09:25 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:09:25 +0000 Message-ID: <87o7qou1ii.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 07/25] ASoC: hda: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:09:25 +0000 X-ClientProxiedBy: TYCP286CA0224.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|TYCPR01MB6128:EE_ X-MS-Office365-Filtering-Correlation-Id: 643f416b-2f5c-4dc7-f3a7-08dafdb00454 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zfa8VAOYqUf+GbY6XbjOJY3lAKu3LWLsFwWwlDdG6ylLGEmPIBwvL1QjlZHQbooovGYDBclSP2dPPH/lAsf+WdqxMIEf6q9X3LvFVyEv27X74zj2zSk0t3MkqtXpg+EG8JDXs5fUq6KywLM+zFF9BjV2aiTVozpSy3xoPonV1yaufIspaMFGu40MXKnbo5pXNNN6CiB5gbIzI32cYIzHAu25JnvVYmwhdx/xWvDPk4O7/bc/CC6JuEFB+/wElyECOW/cNWsU8EyThpb8j50GB7t0abYnu9ckR8TzZv82518klwN5yWIdqsbi/245xTGCFk8HhUwKZkZvQX/vPNXwJhxranMgsax0E3Xffn69gmKG8W+L0wC6BlRH7LLSSP4GSM4bxDBUq2qThicnp3LIpY7PlwZT/IixO80qfNjG+4Avd1RfTFdIrnxR+4UG2uCXCFBXJFYaq+Ww4tiMFZPtGCGXR+s5mbLuo++gW32ySXLPELserQoMWfxWIWIRcR+mWa0rE5AFT5bbAM9KXRYy7ObtrGH8V9wiwfC/H0SiOm/YdXULi6eFA2cnVdxI0ihCqLDEMgSABxZly1rNRZUt2dzOGVpH/P8BqSiegDjTaqcfXa+JOIh11TLLedy6FOpJiDVi8WeCz0e5bogVyMjm4gHadYIYYGVrKG/ksDPNXaJvNz2uo1jF4hVgMqyIV9Ke16eDIkpHFk/mHbZwS/rMCQ== 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)(136003)(366004)(346002)(376002)(39860400002)(451199015)(36756003)(86362001)(66556008)(2906002)(8936002)(66476007)(6916009)(66946007)(4744005)(5660300002)(38350700002)(38100700002)(6486002)(54906003)(52116002)(4326008)(316002)(8676002)(41300700001)(478600001)(83380400001)(186003)(2616005)(6506007)(26005)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RQGIcUy5/mLJpFG5jnrMvfhTpQAVeGZshXEdGZDacKinu2GrnJMbk4SFMEvPNR8/JADKcBmMVLXUhuV2EWgQCt3v2NmA3RRgL8bco3s+qc4MgrX5hyEK/tPDMzD30exu2KuM0g3gYuzx8tDIJP92eYfIPRXCKP5zBQE+mXs+45nsWPEaQjYWlQCHdmwCCruzr3v0/SvdNwLGlEsZCtIkugQSUa1JP23ktD7/D3MmWCiz8fsnIyxcPVmuowwO200PzZxxy28A5mPUziApbUU6Nw0r614HRno8uleR5UAFa6WngIikOETwMslsiG2wbg+gREvJ2CK5HBWrBbsvUttp8E061geiDQkykefrgxxruVih6jvxvpCh673wr4iRCxbUO1Hpu++hCzN0QDBz2zDXqEwhRW6L8WEGpvwNdLEiffI4HYugifqttiG397DGqMb4MnJFlv9fjqw+SbRZzfb5JTA3FW4obMbEYtv3vtIqpH0UytfJ+V9mgBuhEk9Uv98/bm0D3g+Gz3U4mI0aQGFzGLxiyAkfYYOOq3T+SBzP0DFlVPfk70cjT3OOt0G+y1Rj+0WSgWLwurSEWNlC1Rn1To1OFJ04nqpBONmjDalryYyLf9eoXK9jMvSK6p/Nqn6txKtI5KMHClPNDxhPtX2MtvZayrsLGrP6KrpADpEdpkFTO2mZCz3M8YeuSsfSSggXpuwEQPdSWzENwvplY7xQFr1a++q3RznO2NsqNb8p73sUsOj8s7g0pjSF51MZ0tEC85bpltxxBLem5kss4QMjxX3P/W8DAmdBZuIe0X0psS9lVH+WzRD/gZvBKyEQogcHh4smUK9PM5n+IvBfunqUnSCQoIlY7DWRIwbTFzBJZLdicVreNrP9czFgBekOE0XwlcdiNx4VcDGhL2CAqnb+wrPgERzZahc4w1v4HaOjSQYf4kMGOUkrzb1hcctxUxNGENXJnO5bGTeSUa20ZusO+tPbZWaDGl0KVL5Q2fpMgUp1VAbODCBLlHvXYLg1MOkTVOTBFdwhaLghdNfzNV0HzF++BKMlEzAg+qT++nPnDyHNAAaiF7nu8dkGQgy73lC990zNVLIt6kDMjNUXXPEPX/54laiX+iNM+Ti4ISBNxqgjqCaZsrpaQVIfGZYQqGFL1KXWXJdW5OHcd/74ObuLASyOgOjck4Jys0IAPuLt+McN4yx+kn8nJ/OMfORQx/8VeKvZQKNjwFGMaMNa9G9JbsIeyy3JevxEIeeLRH4k0dW6Ta2NDmSFs4WtrA8a8/twZ216ViqxsOfyfiJ+fMZBTgWjwR/qUDg0+RgNUqLzeEtI7nQFulSncHeFT5xVG5jeVXUJgfz/16rLki6feedUAjUXEf0lD5jZe/4BzkEwqz4Fq21A/OUgjg6QhPU32g/MupBBgp2iQdq1P60wkhMXboGeYYJmKF5E0a1WNpAPRy4Sfzjlj2r9poXNn8DuN6KYDGkDQbUj5eg+f3r8r9emiVRpbhQCCgEUzRN31fhZy1zg7ZB+86c11Xgn5lEFm3W/q8EBFA18dI3hQPFq2neGlexZcXhReXvX5NPXvNZ9MPc7y6JIV7GHrkIzqvXGx9eYD4BiVqlHnC2dtfd4gVqN6w9eoS47L2Evly6thKxDwBM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 643f416b-2f5c-4dc7-f3a7-08dafdb00454 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:09:25.6187 (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: MTK3YgKWYkgp+TOkQ6IzcD3/b8SmGUmJPS18oYVJgFnrckQyNy1JXtAzojmJ9RsgMpQOwQp2zRYuJxv9sNMDS54PR5adSlp1kqo9nrRHLbc2ELLMFp/ppB/XEaZQV0qY X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6128 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: Cezary Rojewski , =?iso-8859-1?q?=22P=C3=A9te?= =?iso-8859-1?q?r_Ujfalusi=22?= , Pierre-Louis Bossart , Linux-ALSA 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 Tue Jan 24 02:09: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: 13113316 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 BD175C25B50 for ; Tue, 24 Jan 2023 02:11:00 +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 DF3D3E7A; Tue, 24 Jan 2023 03:10:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DF3D3E7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526258; bh=9l34JNrCKH/X4nvx21PI1aNB3NuvcrDUD35HM5FU7ts=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=Vey+az0o4rzvwJDbGeHsiH2EcORKs86L4VEq3Qj7zrFqvU6eRkpFSgmpNVHzVY9rK VCPIYxz5GcXBb7dXfOnXL08R1k1jaaxIRdUXmaaVBRFJPD+b+Afk49Abx4FMOnJ5ye VIR7bEY3XeFgq/TldhSJBBOlvLXgiZkOWDhpD0Sk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 902C3F803DC; Tue, 24 Jan 2023 03:10:08 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3AAFCF80515; Tue, 24 Jan 2023 03:10:07 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2136.outbound.protection.outlook.com [40.107.114.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 44A4FF8025D for ; Tue, 24 Jan 2023 03:09:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 44A4FF8025D 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=kVXrlUdC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O2T6t7Wtu5ec90ZkX8yYKqvJcfvx0jyS6m7EH2TFc14BEFlTbKOeCIyvzOSeKLLsnC7tZhzCruf6pZWwTD7dc1rjHkOt7tOm4AUbr7YEZU8mjQejAHGyge5aXADlxO+oGN55zyD7IrmoOKjUTYHXVDWZwbL+iexFa7bRm5kAHTv9c+Rnk1Mi2F+TZI2BSf0pR2J/xCFJ03fvehPOFOX5eQxtFVef9Kk2c2F7Ieq/sqlh60sVsxHXyPPY+DWLf6wdCPWeINzVW0r7T6h0wdOxvLaw/SSlZ4utq3WJZAiUZJfcHUdrTwz75kb62BEHgjm6DLmR/k3wNUn08XymVOFvFg== 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=V+kt2UtQ0Y7xVVJNdypL9s0PlOx+jukQagJb4+hz+LlM5GVMhIfv4GMZl0+sKqMUFMQbdVCNBeRuX/K0aaE2QT24i4P7WsxIxU1RZIBJccKxDFheDuKViLDFYfnHuhsGU1wv+JwTeA8iOe5xls7JQhRotE2FQimjG4/Sk5hmTNOvqPbo67L94wMHO7y4fVDqRaBYgnRjDxtdH/p03PWCSB+h92cZIOOpTzlTclg6epCQ9/9qx2X+dCxdcfUbbYKkjMyFKzm+XUm3AeFRRakTkY36oBjgR4vg0zAHqEghbQFGdejNyPTMRop3n6Gs+ygQZe/TJ0wPrN9pTlixDJWo6w== 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=kVXrlUdCBymZRAH9OSTEz/yEAerObGjeffFnBx7mPQql2czOVMG686HoPagq3R9lgw73A+Gt8caFDUqEzoNjk1Jj3oQ9c/UHOlWcKYLo4ejEuk0iaTLQyf98JucW+Z8NvLWfQgdbyvJGJqwKqRl+HrXoHvH7hO/4OU6Y7AlJ2b0= 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 TYCPR01MB6128.jpnprd01.prod.outlook.com (2603:1096:400:61::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:09: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:09:53 +0000 Message-ID: <87mt68u1hr.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 08/25] ASoC: max: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:09:53 +0000 X-ClientProxiedBy: TYCP286CA0051.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::14) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6128:EE_ X-MS-Office365-Filtering-Correlation-Id: 888b5805-a0e5-4e0c-9fbe-08dafdb01505 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vTbReOJweuHca9sXl+MvwMa1Rg7Lj7WVObtb+hU969fVHpxaSF65bZTYWE93vWFH1ohjH6dusC71Uh+jyj/xOBZRgJvD1PTdyEP3F+TFrEzm0hArW0av9ciCqFzUu+ZJw8fCJ1Sj5bWJjQjryP3qMCBsoj3EkGsjPWka9l7aynCZoX1fBjUqhuKUr7M++PcX3Lfm64PwF8QSwaec+oAGWHSVJU/k7THEDa5c9b8h3/lAs4XtwuGF+tpRGKIK15O09i6WkJch5KCFFKq5bGlG6Q9uq4HirFWw1swxFMotEma5bMEW4RqOu3UbJ3aygzY3XYkvhDkhrp/ih0RtdMqlKXnQNhM832oUtR5NxANLVQm45f6LLbZjSZJ7B4uVD8N6v9tLtdaf9zegUHmV7LxBismWn6oNsHHN8WjtaBpurKlxUcfwebix9Js7HJ5sHdiRrFVFdN2+QXOlM45wcPFSt3rK1fmmSj6erctx5+d58qxADPCt6Exj0gulOxbsVEyrhJvgmB6NGjrWhpliJgKj9lGPatc1nGxnCnObWJQOwSn1uk4r8ohmqh6w2Ww2jA/sgkZqds9QgNw0r7mmq5ZqnDfa3UBwTfxKchwQATimSGaAT4SiCNQE2jiM2i7nBuJlemgwlEIu/aW1lOLR4PDyaVbsUbH4tsArhRLg1UG1s68CDQ4J5Q1igrjfY67wblRI2M0/vUBPEaIt7U+WbOUVDw== 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)(136003)(366004)(346002)(376002)(39860400002)(451199015)(36756003)(86362001)(66556008)(2906002)(8936002)(66476007)(6916009)(66946007)(4744005)(5660300002)(38350700002)(38100700002)(6486002)(54906003)(52116002)(4326008)(316002)(8676002)(41300700001)(478600001)(83380400001)(186003)(2616005)(6506007)(26005)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uqMAhXEIbcpIXBNKEEaSFFmuCThm43pqkmMS5MQfscrM4zXpupIa3BGpD3iGQbvVU0cJBtMPT5ZPJnYEeTBe9irjz2Xi+lIRWTsTnkMZCy5VypfkXUe1gf1IQ7QorFyyCdlCihcCUhEGJUYoLAROX6Yk/XKtIXiFlJ0uYzTAWBjqwWS1AM+wXT+lA/E7rmhtEvjq3O+SWMLIhtzYtqFWGM969lZThy+v/2fn0wHb6s5filugFfhlaU01lopjfM41TE0YFvGMAkwcQ2xI9E6P6ZOCqAHCEpeDjbVe1zbI9/FyggMIENAVLIeYjxLZqnVbx3B3l41jeuNS/kIqOQcjTMZBNg/CdUMgI0pwzQmI7XfFavD9LvI8c1Y484iT6G5gBItdK1egieRbBQc7idkjbRJtpfH3wpSQsUp4+CKuIaQdDKgU54CbglZcSDgvXqI77wPkTaSmwEh+bQuVo7u++94T+QHyiIUBdtKWLOQaCmkWGogLEtLOYkawu6LpdSI50XJcC8fZc2gvuRS/NT42hFQpi3IkmBaaEUNXw0K0DtRaJXLTE7azUCeB/rZG9x7ds4iLJytnbokdMvHzDL+9f+J/KZkNU8YAptyaTmYE6Y9IggFvocgdxEmmio3EZYUbvHDn+Y14E4vsvVNyTCGcsHvYB1bG4W54LmlasQJVdN0rMiQpmALoZPSAW/Z/rinCuvotRKS8jglye1ZTNAtvNt3NKXasH7PisrhwHeoFbeEybBjzfCLrLmqmAGLIgImvAS9ft3GGs4Gkpy29lnz4GDeMNvBOekcTj+0LM5bab6FmmkfZyOI38kDO4do7a1DJqxR2uqw7+fbZGJDc7b4tc2BwjFMuniLmSg6Fbbhmgz5z9U28btbAG/AFobggQEnH2ijDzRX1JXdIyWrGYKbVo/4Gb8UWMN4g7+B2Eq7zaIXnG3P5szo/0KsToZybPrMqCDq41DKkkVLFZQwJSNJOS3paho5MVou8shV7P+JqpZ9L1JEw/jRa8s8r/dB6PbDi4wdzTaCIu5T3EE4ao0tGDWpv/9bdVg/yrJT15kFil9UycUrjStIJb4m5yfxPDGFAkP1tYEPL458vLSMtihrktot3ceo6t4fu3DaGRXSMI5rTjdt8aZH0nFIbVHquxv52xv8KH9KcDQnp34W08AW1NzAPJX3SDMHpky3z7/2VyKgIUE9zFs/hVM6Lmop2KJuqRWqkVJ+W8ugW0Q/SIcdfrQOZv0xplSJo+na60YsQMnCmExMo1fvdjjM4LlapBA99NpNmonQwlVnZNIsbnH565IkA7MFGZe3QAPL30WolWvQ0FCr0ClOVXZAoqMoPj9hBYxq8vcrvEguYy+k91sIGFix5JaX6+6ejwsq34B2MG6mMwcZU9nSgbJcLRhtXgcKAmb1wqnFERitGkDMO2BpYTIO3wID5Qq/uL6AzAdnmadTsQoF7tfRfyka8Y9tnJ14otWgP9Zkrgcyaycrn8GGibEdMXTW/duSuMV5niozh9g7H+R2+dsf15Je7TcW+cCCzaFiwicvXM6VrhenCPp0KI6ALRrW/lvZCEKV/zbHou766pCiZQbIxrI5P4SbjcwvzxlCaOcW0c6n8/jGvP17gx4WxicpRiJsJHxk4EidwcI4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 888b5805-a0e5-4e0c-9fbe-08dafdb01505 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:09:53.6358 (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: gK1Rxgw17tmQ24OA1/eU5bskVjaVNH50G/2P5PgHEguR6Du72kC3awSRitAhyTV0CcZpjMXkqE03BbvzkxcdxZFskjDrUovcBK3fQMGmW7N4VqqVnMhKY8pEELR/+ZXi X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6128 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: Charles Keepax , Linux-ALSA , Bard Liao , Pierre-Louis Bossart , Rander Wang 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 Tue Jan 24 02:10: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: 13113317 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 32B8DC54EED for ; Tue, 24 Jan 2023 02:11: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 803B2E8E; Tue, 24 Jan 2023 03:10:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 803B2E8E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526282; bh=FYEMEZverDpT/l8VPzz1dryizpJ20nREbYHc+hLbIgs=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=YEeA3/dnXjvRDEughbQ+e4jwCVek5CthFER6l5O4HiP7GNavOypkY0XLkJ/LGYa7S K58w1FzwVCS6pIOJzJLbKhT2nOWRl8dCeQaFBX9IIsP2nEqaInqGLlbsw8GXBpXB3/ OWsUHMpsDd/X7c2VtQ1wG5QAZxs65QJ8SZfMZcI4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A615EF80533; Tue, 24 Jan 2023 03:10:31 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A384CF80543; Tue, 24 Jan 2023 03:10:30 +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 6C97EF8030F for ; Tue, 24 Jan 2023 03:10:23 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6C97EF8030F 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=MSKK/z4p ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mDPxPdOyLLGPx6TGUbLvhKgMw5NWnEU5WLblQd3npcq+lglDqx6b8MNPPoCoMcrTpudTVP6NgRyhrfL5z2bM9Ow6vhOGyLZmTVhgk4Qan/CZ98sbwbkVe6nRAu4wGyE8xN2WeHyi1CMwXQjVv9t2Mvh79LzWWAkg7Gxd9TcnWBjwSV87t+qyLq5ThLg+XMURGyTVcvvpR7LCUKT+6LU94+QgjJaBJ6GE7i3mhUli8XNUffRr2uivR1kF/S3LQyXx8RjWxNsX6orqh6Xfev55rGDNWuCqQtBNB3n5QtTJyZFYBQDtJbLLAGP5sDuUjjfhvZKEqrWrz83VLnV/Q/SECA== 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=W/z5WOPWbr94R43EuZJ6AAt9CAopShc2Qahztuys8ijw8uZ2u26D2ECDl2riTchtqo2T0+DxJi03RBHcM7wvPbeyPlCnfeQf5U6YAdY/VQ8JoCs8IlFPC3pqMzgwsShNdER5+dYkINStAegEMcTBuZ4mZnbVHXMD6LNNWaGQRTM+p/ve++0lay6fEEVrZnR5ruxgKAZVhbQ/oowIuHqCShp4SQd+9i/g1QxO8zaMpXYd7Vt0WxHv7q9IPmzeMfzpk07KhnZgnYgQMaqEF0PToNXjGtvpcQRLejYnRy0U8orP2PVwEv4a5fCPrbiG8HBK2DjGYb6Uf/Pi+3wSLLrnFA== 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=MSKK/z4pRdUDn5nBSqDg3Un/1/W1hBBTxF05UFcEEqATqtYGSlnzj1RWDcU36JJ3oRiNpOHwnmeYczy8K6F2k2zpVFyg5yWYWrlNpIoAcxX7MhH9tbtErWMJ3zPy+W4D56HAn2Kmnr68nJal7n2OVXKjQCPzqvvbgMVopfB/Qro= 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 TYCPR01MB6128.jpnprd01.prod.outlook.com (2603:1096:400:61::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:10: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:10:21 +0000 Message-ID: <87lelsu1gz.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 09/25] ASoC: rt: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:10:20 +0000 X-ClientProxiedBy: TYCP286CA0170.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::11) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB6128:EE_ X-MS-Office365-Filtering-Correlation-Id: 571d2605-ff57-4a82-ee95-08dafdb0254a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C3NpA/jbwMuKCW6C0tmtVMKnADnIo5erMT5RyR1LgXhZGU095Z9tg6Y/6uwBh2owteaKswJHRVr5kdmRvFmv1kWjQs2VBecFX2LypWB6rEPEyOr9jt0hfioPWtBEA8G6vnY5JfCDmGAoYu6sk4wE+qyZHwmWB1pqo115B9HOgHMaaXJV+ZVJR/xY6sUI12q//wrE4qgWey73mgSzPdUJ3MI0txkY5fFBqbAlM5QEjdqb6oTcXgF6KCCDzKK4lc92gzWeKz4JXXBRpzC/QBgAQsGLGNOoV0eZA5Q7HbOo7QFNq2Cu1ICjAH6mdVrodsZ04wkV/Xg49R/tQWkx408dB+aB7X8s779RwhOfUbKo+xxI/GBsNW1S79UyUyXH/4KHMcHuYOnuBmj5kWu9n0+Mm5yA5PTPo5TNhf96Tm9S9SipombcOXlDJ8+gtX+az9OdwL3kWv0Wa8VuF1cIIYvXB8i5FwxfEbOb7YMB4p8kHPfp0JTSTBAoJfmxSq2jo1LbtDNlYMlFNmj6ojzXH2p5eo0h+P31/BGIBAcBafQ82LOxX+QdC8wlTMsPpEjg/5t/1itKQJbGqWY3Uxii/4eTRR+4NktJGyZG8btmV47UsPmsza7iXi4kKpc8kFWn+4cOlBZP++/QuthNAbNY9QAq96AkH5hEkLKbpl0Ta2+cLS5IINfra020ODTw9vArzswfy3jfx2e4ILWFXcNIsWoMVA== 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)(136003)(366004)(346002)(376002)(39860400002)(451199015)(36756003)(86362001)(66556008)(2906002)(8936002)(66476007)(6916009)(66946007)(30864003)(5660300002)(38350700002)(38100700002)(6486002)(54906003)(52116002)(4326008)(316002)(8676002)(41300700001)(478600001)(83380400001)(186003)(2616005)(6506007)(26005)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5u4eP/ptUi6SQXcaCPPgtJmIeYgeV+wLhj64PX0WuIU0pq5P+c9KF/E3d8aBD8T5vgX5TEnhbHNaS+HEfTD3A7BisAU/hR3+pIKUosmglOAiWGIKmVW+XMqRGclSVCQjdOb3mekYZg5GO1AwuhdX5xkW37LaKmNURXQPsiv03Bqfw5OzrWRRf9RVS8b2JZltapsTCPY/GhWsm8pzanRVJU1wf+cnrORVbXc5OGYdKrX21Ujm4aJsfkPJhuh3jRRnwBbAWaREQyWXetlDWC/670Al2OBOO4FsWFdK6IHTYHr3Quo6ZVkC7zfUC4v/FyiOY5+GysDKclb/PGQTerU0zRPtGkdZxeS3r09KKHNH34xXSLs9K58o/98oQY1IHrcJam7xzmjoKojKN38DQnBV4xk9B1LnQ8lwhZjl+NITO47r8hjP0uHTXjP+uCuyVSUlFx6MAKhRLaVTH5NOYIt+35OxjBshpuwKwyJsXAcp319LIxH3hnaJ+wNzKyF77mDePBdDOw7AfqY/McU2thA6DV4C9tK4rySqi04mGJ9NOK+XGS9cwKCQTcBvZtpkfXlI51ELiu78ZYzv9uhCWE3cqWL3E/uqdRYYy5vt0SA3kSgKyVpJ2fzvPbR8RB87XcPt7iDlVbmtz5V5p9NujD8o4CFv6cW3CrdrYi4u9aUkaUYBstjsVTRIifuYLv4Ko/Qw5mIsmTZyiYURpLTtY4+ONl3SAml72s1p0WkgGYMgy/OG20XID4SiEas+cQTgzEq+z3HUugfqa/krK92oqlq8BpIvPTcdDPe23dsaGysYq3CmoZR5rpSxRW24gl4dsARBIcqa16nKUDWWbfK9VCAfutupXXzD5vLicG9IQujslrQMwV6v6ycsJw0JxD9FWhnQV5TXy0tSgpnM1oGV7WHKxD51xnuwWGn1Fyyrs5HuFzo5yihDuhmzolU0chC5LaYo4udZI7mmTyvQYs28bc9mqeJkUPChYLAahurkkbRijUlJ2DyzI5+LVpFpbMS4o0FCY/mahAWFYqjmhsV/CvLrYS6lCGOgFvwx6LVc217hr0uERQkhBou18jBCLqqpRXBGjJHuDGgnBL+zFqNDXyDFQsido8Gdvc4BF8y3atTg1CyQTH9vKlxtcgoa2ldRW7AOpjG3QJ65uVrw8fYPZSA3xS6wvH1itSCEf4cYBwcmwfNoa4s9JXg3O8LCZM+ZGQCrXUhpR4OsXiZDtWsylTCu9GNTCTQq3bY6DhRCzQxdQPCzTkSg8+k39P4RCxWMsGK77Ppuoa4TqD+46jHJgWmlVSbiems2mrDc3tIFO6xFtUF1AVemoGN4viagPkSymbdPDRqd2E8hzWi7fH9Fv5IEf68aB060MFQHWUdMfjkxaVAkyFr8UmsEz2Y75h5TsVYV8HkffmZsrmAARJcMx/v3B1frs7E8jxZYP3REG/apmTv3Tl/7XXsqH1SD6+kGqq5k+Ohc70wCU5/fZ3QX685Pdb2eUrnlJ3xYohpLLuvFyeRIghlDixkQ8iT5SId/kQ3kMtpvkZaNxzfN7UvcG/0teL2i6Srmwhxn/uxsuxFf8MrD6N5j9zIPDYpD6bWCLdqQgaI6PM3lBNMSZbCctBSo3UkDa/x5ltcliI6UxYC/2eg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 571d2605-ff57-4a82-ee95-08dafdb0254a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:10:20.9335 (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: 3Gl4rNHSJoDbqbom/2RKZOD/ot/xeN9BI9KyWRAdpWuNZtSCHLeF06P8PO9MTgX+98vLrJqHYJbWr7AID42YQl0tcZujDRIJzFRPhGu9THC0xB7rmaxHYYeLOe+klgUF X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB6128 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: Oder Chiou , Linux-ALSA 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 Tue Jan 24 02:10: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: 13113318 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 AB383C05027 for ; Tue, 24 Jan 2023 02:11: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 9EDFBE7B; Tue, 24 Jan 2023 03:10:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9EDFBE7B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526297; bh=vsculmxc1hx+N+BUkp7cdH3YTKpGnSwK8BQpqfswg1I=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=q1YkeseVMJDv5VNXBF8NS4YDY3hAQzB8EX44LWFQfb2uRC+0IWFg1C8ggsR+6gGfX MImo/wWmibqaB55qO1kIHybcjLBGCgVQF8R0XPDbkmAnNMPFnxdq5BWhFncmnVFRHn CNomzuKtao0ZMV1um28wTcLGfJghFTpFo7gniloM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 50E02F8027D; Tue, 24 Jan 2023 03:10:47 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A1174F8053D; Tue, 24 Jan 2023 03:10:46 +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 9B04BF801D5 for ; Tue, 24 Jan 2023 03:10:41 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9B04BF801D5 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=oSn/SkhV ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLd9j5tChL+8QKxjXio8ImowK1v9gtKlGEK56HVszfzP4+a+yf99pGk4PK0qlvm7vueQAVykygkxPSQh5BW021Ak3NdKHl7Z4oLVhBCIOLr26FU6akZgkVt+bBqfPQMKtUYsj9qoFylibzi4ARzNiITWuLIuB59a4y91qUKoV/9imoIZPMXgFa2Yn5srEgoIwdSRYKTgilS0Bryr7Y1N/yNDHwmp2XLIfQtXoGYHZxYAB3cgwomdhcrNyqUKZMxie3RwKOIUVb8hF1IxNEczcgz49XnYU7n0ff+L43MxJ6ZKFS/1I0RfPGtgK3pvMPnnVsKszXoIdNX8DBJGRU2QVQ== 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=TCVeDESaSLeZWt2RuShRw3ab5cpendZenqm+y+PMBegwhFhq6T4WhegAQyM/LFX57JZJfJ0zsDHD1Y55kLkSUmC6fgqYiNORuBFa8IJ8QzK5305y1GSFBeqgKx8Eu064i4XxOuKNQKvlPwOmCR3vqU1YkPrlT02Z2M1nZ/Zg/ftPv2vOEz2j4GkH0Vj1EjNJwC+QjlOKlzJHA7S4AWrNla0ZWJ5bGlWfxceiJ4R0A1JJTAQFii0mpI8ULxyxFhG29ic2lbf+GBotOzIjSjUytK1lxNHL03ezzlYvcsUmyjGoE8o0M0pGIqbAApdYTHeijr5v8JryyyoLA1EICmbEkw== 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=oSn/SkhVqzCI/WXjkqEObOW9+mgoU51Z59axAuz8jS4IHmwh8Oyo5k1luf7x/iRbd4Z5LXG2J1S2FUZGjaXoxvMN8JLV7T6jeR7GfFKfsrsFQBgg+Mq5iFcjIB6PihHYqjIOL4+Xw+/7nDW6eIf9dUVQuUuLyq06+8zk9FaRS34= 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 OSRPR01MB11421.jpnprd01.prod.outlook.com (2603:1096:604:22c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:10:37 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:10:37 +0000 Message-ID: <87k01cu1gj.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 10/25] ASoC: cirrus: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:10:37 +0000 X-ClientProxiedBy: TYAPR04CA0017.apcprd04.prod.outlook.com (2603:1096:404:15::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_|OSRPR01MB11421:EE_ X-MS-Office365-Filtering-Correlation-Id: dfd00668-66ee-455a-65af-08dafdb02f0e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Aqzam9pV4nnxX+6BOnX4SOAT3XqJEYe/Ht3wDAZVIhE+rBHnUfNRMvxZivkgCOkDUT/DC4YxAKi+QHtZTXZJYnXh61D3xVlUY6ggamZGbQgXTdhQXwE2AIy2kOHMCOwBsB41y+Se6tfLkPIZJWXI1VkqGtVLi8Qbaex7GFZ1l5zen0NOhaLsuxYUol15FP3kif4gR2/6uVsFEusijH6LI3+G17WrDJz+pcd4uSLhqgSxJ6T0OuUons+l3I0eiq+FaupN/FCS2Z/wJfQFpoirDlcUVmK6vNmZP9+sQ0BBJ0sgIkntYU82Ik3oXGCFckaDBD4kV18XLXw6UOcfY8zbvvhIjCu5XZXfCfHJJ/ATBEzukhjNhTV7AfjKuJR8uyoz2Ag8tqoLeiMFGg77iiltThrZnRGGtqdAtMZtot4NZUcbadQJw35MotfA94DM3Sqp6rqO9c/6uoK2P4Plx35nxtURDlZtN07jZDvLM6gaLT7eiqj6C0nLgulyQ8HKfUL7blmWEDZjTW1k6l8lAiRu9e8itE5/YG6ayqJspp2jzZda7WPEhyzEbn0oT6q5Vcjd8m8TiH9DRDWwJSrIpGWHRjnortVXCvC5OmIaB/7B9XW7alUDlUP0MHLbGSatEvNePenDqRrOjz8EbqTi1GZgnmyLPaaEGR+VxsKml+CAGOI1g3DbDTR7IVQzDzG2AdK+s5R3w3zHLjPUWTdkWvI74w== 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)(136003)(346002)(366004)(39860400002)(376002)(451199015)(52116002)(54906003)(316002)(41300700001)(36756003)(8676002)(66476007)(66556008)(6916009)(4326008)(86362001)(66946007)(83380400001)(38350700002)(38100700002)(478600001)(6486002)(2616005)(186003)(26005)(6512007)(6506007)(2906002)(8936002)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sqGdPFWGjvInqQDHICzWRKKc+kVBs5ZVbxWzgtTkW6rSx/1DivizfMeWxphHop7wm68Hj0dnCYwtO9WYvMBTXvGhXcoIR0zeZKVC3mV11yDXRzTy/YzqQN8gFWmLZ+dEv/7fVDLifwCalbuVgUeNS16eVmlDA9m5T7+cE9ZtzcJDq/RJOfbEqXVzOY3mUPfbqmbtkB1fuqdrniEtq+TVkvMI/m6HJXRL/YXPNNddpXXILrfmchX6oUopNxJJpFkxonsBax4mvYcdkEsmLnn0NzETpCl1ALN5TUZ68rDMYyX14t1tlCkK2RROznFDMJJ25SN8hlT5kHhMwGN5PteT9L5Z+1hQfvdTF0Njz/b7xAwPJuzTz+CyQIIWU2QXLheSHpok9VDlqS47UXhCYjhNDzXdzgwo6gIaFamV2zoctpL4O7QPVU939rZQ408HJmMMbxk4yyAY0mTNQiWhQYtWOO/HR31wFvAnxvA6YdEh0rq/v8VKszRERN2ou5TZEkiRNKtj0d6q6Jq/0DpF+CMoD2seBIpqc+7vJI4Fy6lMY65SJg8EmZmieJxeld/7UgZIDEiS4UPvL1/CX0k7CsuEe/kOKqSTIe5HDJG1gnTNvlisz4bm9TJ+8fnDH65Xl/fTWTpCjT/Ln773fANfQlGCf6H8BfIcZEoxsRypbRJK0ludzP95Mg2o/WXo/Ayy4PWMR7Zt4CxP5AFwYGI02ru7NvE1UsSkQkox/Wh7CLiyw+iw5E4jsH4UrT1CfQjju6wAd1/BN2A8SGwj0SHfnIuThNll4ty30JopaL6sQ9zFRju2fM0jfStxSdzePg+dphJmdZ7XkIlK8tgot6Hkqv3R0clvU6FthL/+KPyoYenFJIsoSnPuTzh49d+LNdv4yU3Bw4rqblFLeJxogMT3XZFA+oHmUfoZDggY1B+3sL3XO0h2Lb3jIa1uKAXLdAsj9/bUkYQAUxa/Pns6FRQ5wyIibTepwBVQYg2tnyXkwXppXNXsVsly/tYISdMBaer253HkJe3LxqVSsnQH4uR0Hi4mPNoXTiKT8fVBMAuOPcH44XMh26YmVD9GKKm5NI1PgIjExP7qKqpUo/Tf4cvmMoxel1ju/k0xNcC7505OYf7IpNZ4Q63WKbulZol47smZRftER9cB06lKh2KI2Vavvz2SBbvTNVLktG7fFF12ZMvY/qMMCyRBTg+8MZTw2JUizv0uGoNzgLDe2kxEyErQK8TwU1sOgWs6uQWdw+kswWcDNIJDr31C0/ZXzR7XBojf28rbinTi1WM4j2X9ygag9lmZBSVTM9ghAZ34WdLmdrMuYT61gWEpreO96HkiZpEDCpmdnBuUiTOyJasiXUQT7os/HPcgq640jHlSHcF0kbkyaDD+1OPTWtsUOdHyJP1cK83W2e8G/G/29W0RsW2GSqCk9qxRR4SHNFvqw6daIf3Mc18TwrxfFql6bHyXtb94ufQL/Be6CDYrwbc59EKuONOfhj0ACK6zOX1qDutlwBghw0irKrVmwqXUXNILNkglULwGbjdaqk5P2m9OQ3TgWDSriDNT0JJrXASXIWLqP5NBD+uwFq8kfOHvONM/ySfDC9ohJK6awsHnmKPN03X2Le+vqMP9p7tstZtXhD1tI5kmbOM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfd00668-66ee-455a-65af-08dafdb02f0e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:10:37.2827 (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: EG/Ok7x5J0MoVBcKJHSIq5Rg7fkpGhokYUCvyPd+Y+7ak59t3n0+ioJfqLXzIbGhxawBWmEMfnyRDElSydPpbOBuRg8ck8h5fwneY29womgts8hCZVhxQR+fkpa0MfJ1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11421 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: Linux-ALSA , Charles Keepax 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 Tue Jan 24 02:11: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: 13113319 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 38640C25B50 for ; Tue, 24 Jan 2023 02:12:16 +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 C7FD7E82; Tue, 24 Jan 2023 03:11:23 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C7FD7E82 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526333; bh=uLwrBroZGudU/DKs+m6vh/yUYrxbeEoAeBSkDh039lA=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=MQXmlb81ZkTl4CsbtT9Fjviclegy0q8Hi5ZL6vxapHNcl8BKSu50GtK86uCYNorfN oj5PQAbTfFUy3j3cnuZrBQuAa5nt9FSouz3Eagc1kFnl18WYeEXS2OoXuCR9PoI6LW 9sU6+/Wl6iS3OXwzp5IQQTsYi1zZiZsL2NdQ9v1U= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7CBB8F802DF; Tue, 24 Jan 2023 03:11:23 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 708A1F803DC; Tue, 24 Jan 2023 03:11:22 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2124.outbound.protection.outlook.com [40.107.114.124]) (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 72003F80163 for ; Tue, 24 Jan 2023 03:11:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 72003F80163 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=oCFI+D61 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VFAZtyW5TnFTg/l+YaV3EYy59TNPtbR4GEEumMr7gVQrIClJ2mxeBf0Zc9IIqx3a0s8t70oEma0tSMb6o1wGfUfyvr7SWVnwNEdxl2s2Wuzh/anNtv05AZIbnAkRzDC/YJ4Ba3IhTzXigbstSy0mFkwINqU1ftbz9pYsuSI45PFz7OM7pC6Zk6CSaDCHp5Z0bVzbw8ef1ZF6fStPebKpODyBysSrur55jRLyjOYT2vjKIQX6QiUFBOayAvsLn0kHW4SplZ+H97jBZz1nyfVo0wHg8loeNJdrmnCkYq+GybgU0qkOpaawgYvziLgGGS9xZK76N3UnJL+/UQPhdw52Og== 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=CCvdRZR15icOCjTNu7fvTpCQURX9BssmDVFbOuUkkp6hM3O8Mje6PQeAomnjepawxaPSrHjSb3FoSw/Q4HCZqG4zhrdVgOYbUj6AXYh/kUtllKFYYOK/sOXW4YVx67X68WFkZREhR1NulBNsFDH38d8oKui/lKs0IOitlztvcLQrAG2uNWlxItii3z0zRAZzMDoRbG9sGHZ+6PnQFhACmP5/KADseLqGeCgxGxnCO6FyGKrl5nyYcj1XGaaTquY7O1B4VKrDQrjdzYRpsdvhJY8fZIk7ymzvMF6ZrpIb7IdWMYsberEDG9SvvU65mgG4kjFizwFN6f24P6ns6q6nZw== 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=oCFI+D61NoYygd9lMQDj7VYhc9xQ6/mmsybABQjkNu6qkkMQ8rhLB/wrUx/l+sySOFRBpNCidDi/nE0V+1XFurSdE9xMZxmFTHUAngh8ZnUelsrXyCGi1n7517COdks10iqeaUS6/5TmgNg27uy6qnh4PgQ6VAuo/Z07UvnPmr0= 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 OSRPR01MB11421.jpnprd01.prod.outlook.com (2603:1096:604:22c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:11: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:11:13 +0000 Message-ID: <87ilgwu1fi.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 11/25] ASoC: spear: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:11:13 +0000 X-ClientProxiedBy: TYBP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::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_|OSRPR01MB11421:EE_ X-MS-Office365-Filtering-Correlation-Id: 36ff3fad-c914-4769-1381-08dafdb044c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6SPtyLX8pLaQgT+pBc683To1wsY13L/FLHXaVq8haK3DKDN0YvDVWwZGbOm1r8qNrjtZuwq9iLH195YlZFxY74q5xxmN3svaCr37oATOpMa1Omff+fGe5VEe0xG9Ek83KGbJ+cLlqAqcnCATNRMShOoDVl5bnfGjbjK5BaPGfiSTGQOkvqx6JdYupGrOU9Z9dzmsR+3cJ+pnNBOC0vhQ06CbuUVi4aVRqaAzt2142PN+SfIqAiJ+0uNukN1AF+v9NPpZZL2MPP42gbIYA0Mo7c2nVO/NQ2bbFw2TFEaMdaaWhOcBwniWnEapFnhGKNY8llJiuaxiwHKzn8SFCOoMaafZVyFwsAo3CNc/Fich1Y8voLjV/4NZyamxL7cA4MEa0AVr1nz5cT7xU6rtN/K1uNMeBTpX2BpuLJVmVWPA61AERdL8zY51cgezVa2Nc2j558dcTq5W2oOqtBJnxy7lxD2p9RVuivdBtyvtCZ6mTbDF8PCXLuPfYmgqVA5QWNjcr8VcJEG5dVpKma5dHw9QpXITSPIj9Ut1pfiBFsh7/nnKFqVRm3j3H+ffm57KEKBB3BNTbsS9t2K1QsqhPkbBJPD5gNDI/oT5GuD7FOeVQ8FgxKQACkx1UBW3u1PgjD6ML/URSNPWvxSSImme3+8Bdm53Ho4dTnfTxYBOI6QQuxNi9Icn5QGkW5408icAzi83QO8D/JvFMWyqBQtxgfg/sQ== 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)(136003)(346002)(366004)(39860400002)(376002)(451199015)(52116002)(54906003)(316002)(41300700001)(36756003)(8676002)(66476007)(66556008)(6916009)(4326008)(86362001)(66946007)(83380400001)(38350700002)(38100700002)(478600001)(6486002)(2616005)(186003)(26005)(6512007)(6506007)(4744005)(2906002)(8936002)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qtYaM5GyHCQw9SXvZ8d4sgTgBWy5EsmKNlo9Nlr9WUU5VFN9tF+K2msD3mL1b/vSb0++kxP8qMSEXQI4G3GjsjqdfAfimj8hKUzhhj88VW3HKvg1Hh2ye/vN7nlnAzvzfGAeGJ4z9BJKvFJOYDzgIgW2peDxhonThr99QCN32ldXTctHMI6HtN+W+O15RCMax5EgS4OdKSaVxbvyfPWwPQdjDW+tgEEtzzp9r/kcbVy/qlExsyU8Qb/DYxh8yiSOsaCvsXlo+oNOw3wFTn8FFr94NeE25+BgLHqbo96YgO76qrtkC8I2ns11JKfJsLF5Xw0z/mXBxT4he7VZYjVx9w0Sbc4ic4qUOpZnxVKd/mSO8/qCe0pXeCLbdPIGoKkVgcTfMvjByO/WiZkCx1nhuGmcwezdw/RUq0Yz7k2Jg338KUF9ZhyYbVdV/aj1dQDm7DxUlm0jTB2BjK71/rtqDgf6Sm2xT/lSGpgRU9KQc+yL5Rgrw7p+FlLYBowNucBJW1YOAAe/FfGFx2K/x3QSghx9T1jxVwjSxmFyo13rCtpCih461QqQwlV8jpVxsSBxSSNowHGIJ9aRFwYKHG0oLgpKvz3AJZn1SXx26T3TEXGDYd8gD+ZIaW1PV6mkGG/q1EnrJ3rNJnpZRkOU3nt0cYRxmugXoRFawP673P7PPIOwIU8oIM41D/BPP4J0FC67/ePvMVORVAkHNkUsz9CDnowe3go6AEz0CvjQAFjnXPiNPuRLw7Wn/48sOqAcznAHVFoBkzY3HtMJovkZsJQSDOjxOkrSkyu+f0SZfwN3df5ou13l6QY+TNsLv2gVCdZnHmiaJP4hIVDbY7fTa0OVZ8r6seRclHyU/vGm9h5ycI+odnx7VHQi8TgJBPNGNYb3AwkFQoI+vSCeoeCDfnlzj5rUI6DSZebzUeaeKHIpEvHZYHvfpe/X+CIrEmATC90E/ExInYcvznDExRHUkpIBipDdWafo4qnKmE2BcqoFlEEzeJAgAsPAXyiQ2LWtDs1t7o/m+WaeuJT4UeXeSrPMl7JR8ufTzn0y6E4JBG5mqEr4J9xqcbvIWuTsN/E+aLNRofzf97NvzFjinp3dvz0BrUpX2yytlvACEyr17InaijQWq5+ofnTNIH6RPePBl9jMlLu05A3NI19wpwG7Cp5LKFiUBjs335qfbfaaxSfyUfIlxtq26EPVHfz/mtrm5OvPP8aHvHPenJD/9QhyKwtdjwsDIP7H1wsRG+l5qRzEqIhYjdTJWmkuMN7Dqz1ebjIqTPXLfXjeLSel+Hlw9OdwXYioVBciOHyfYA4NQsJ/ubH0xUB9Rk06SqLjdndLFy4Epdo9U9nGrZmXRXj3l5AG3ziOx6N7bm7pa5tGBJbGNze+sTAa0sk4xXzriWZpA3WUeSONCuF/FFOOQ63wiUSricufsy+mRkCiDgKyuuFSK8EsAXL+/ydNNSGcQy9jVKivBTrIm5uHTvrs/5hfzXX5BJQWHuR7pGgTrEkaO9NOdTk48BjTwJ7XZQSlSGlKzProMz0jinCFLNn5tdyCKwLNO+18zwHhRUaHiHhQeHNzYiDrmzWHP/67FJnO5ZVmLOcD+QXo0gEbEmapagmNgozBY4jfn3Y78PFL3+DE+m6Rj+A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36ff3fad-c914-4769-1381-08dafdb044c2 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:11:13.6924 (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: hswYRIjEO8Fj5duOcZ58wFRIdbnmlaLqyA/uNhsftQhCKqh1qSr4ZcgoujVyi0kmC5HgWhQtFS1W1kHyOsQV6Z+PwI4xogJX2U2MoR0zCdlbQsmgS0JICfsu7jm4SMZq X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11421 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: Linux-ALSA , Charles Keepax 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 Tue Jan 24 02:11:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113320 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 81DA0C25B50 for ; Tue, 24 Jan 2023 02:12:44 +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 99F1BE10; Tue, 24 Jan 2023 03:11:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 99F1BE10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526361; bh=rC6vpG1Ta9mnRrdRF74hBeGJBtsTTlZH2sKayhKRNb0=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=NNhzfKGqUx3/2TknNrfHdSbCu9rxO+Nu4tBquRasBQIs5F3lMGf76NzCOI3qmRcl/ K9TDUEFjvheowKWEVnMge3LFXCjzq82db+EvIQcXdd7jJbAy9rybiTcel0R5/UG+Sa JI3UvVR3gn7IGYrXWzc7UFWEUU4BseI4xxRZN2Zk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 50D82F80163; Tue, 24 Jan 2023 03:11:51 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1D141F8030F; Tue, 24 Jan 2023 03:11:49 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2094.outbound.protection.outlook.com [40.107.114.94]) (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 5F454F80163 for ; Tue, 24 Jan 2023 03:11:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5F454F80163 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=eb3Xceyz ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hPSJEWkewtFo3PVY2BTQwLBzIsa/yKEXqHE/xpGCimythtJgxzlqIa+Q8SSEXmKFbv1cHPKpNgzexLtKgUvZJtdopDJlW3jLbMA+16XKlOyvZfHjBXfdaMbwi16tKFPbO5PlS2ui88hFrTo5OerjsQl9nDtp9+qLxb3MTWWigNUGmLvk9+rYbeCsjf4Znnos34FQEm2Yzre2eOAPUWzBrPIIcQWE9jG0hT0Ke/Kx/l0XHO4HwaeTqSa49BrmTZI0l1nCkZwX2Xewf2X+8R7nhmoOtE0n2a9+PKf8CdPyXDHtzw0Bpz+qMfm5WXPw5iDxpt9USGcrQrcIkNd/97M1Sw== 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=SHxusahPl7Ofo1pqlDDfjz0+fbicRL0xjY5hKQ69LPsBr91CZ8ulXn2zA2jpPwW5wkJs2dKhb2Jcen8oRR4yoTKutJuS4aj9sE+Vq/3Lrx3gPtQ5zu9/VhlR21kpBh+10G49bIa5PxOpfVZhG0si+rI/nQQ6EFjlUSHgw8xQ0n5UT4Bg0ihb+fXjOKOhw652w+hQrWKxrCJkhVZLmbOaNuStQfsPa9ZQIaKJ8rWZ+hmsOK7RfJiJVAEM0s0lI4Tu7J8j50A6IX7rZhthr3m4U7kE2ERytYhhP24YxrupkYLMDSfQBjil7LE5hnWvxYAuxE73E4J6F0FdkxvMoFqClg== 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=eb3XceyzKnHNjMq2JlGtLUQkoKotqgzqfuIp7w9E2opFMc2JbjUpOC5W1iiPC/okgOaG4L1P1w//pXqP8o6RqWQhqgbX0DlzIZUojkYWMlHHSYZDVBeZD4Yam/l9mOMIWZyqn4iemZAvylqq9okKDxUoR5HKPjjzbZaNvNPVlk8= 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 OSRPR01MB11421.jpnprd01.prod.outlook.com (2603:1096:604:22c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:11:37 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:11:36 +0000 Message-ID: <87h6wgu1ew.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 12/25] ASoC: sdw-mockup: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:11:36 +0000 X-ClientProxiedBy: TYCPR01CA0059.jpnprd01.prod.outlook.com (2603:1096:405:2::23) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OSRPR01MB11421:EE_ X-MS-Office365-Filtering-Correlation-Id: 421392c5-4e90-45b4-4dd1-08dafdb05289 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yx61iOWXwc6VrEuq0lWCXcvcBc2yi2Rkjq1vIQYWufLUtg6i8seVrESRUumT6O7gU9ugHfxOGMq2Jkij+nYzPeSpJWarWmaeZZUTlXwVuRzvIDj6BXkBXw+C09LYU0vZ7UH72hpnqQKyNl85mN0kKabYZ3UDzMOnrnp3mL4nC+yg/zglXbq95DrcnMVoRWjuaYP4vwV7KIHjOgxqvoy0tcDa2kTSkKhtgIy1f7rqJaKtpAF1cBd7gRr97S3ipXsonzsce6YcATHruKXCyGoAmY1elOomxk1E+WPwCVqxhsq2zieRQiG+ARw9gEehyO1WKd3OPD1N189/6dxjJuJ5SPrdyJYTkUXYgKoe5B8BfdquNdo0Q5LUbF2T5P+x0n43UeYORpn57mbWNVFDgqWK0zeIFDj2B+vGrDSe6Djt1bOd4/GDO8DiknkFJLHdJihsih0oyWjS3jsk0PaUPj8FOFOKcjKfD+x50prssmmMEQRSKa8G0betQ4NjfX2C7aVKCt9iPQ+8PdO7sRR03RrwpSxLle/pyDu/YTEQEmZahOdVTSs/MXhjACd0PFk6Wk/3pUbHptQkd/AC4WYFdtT3rCVxeS0pjTsJ4KvCOalZHav0wqeAy/JTHcmP3xuESK1nOoShgNyE4CXndCRNZRKptJYmCDXfaMrUEDGY+TDwLhM94O94x0Tr5VbE19xIM7DYRHSVyZvnxJYvBQDWV/KX+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)(396003)(136003)(346002)(366004)(39860400002)(376002)(451199015)(52116002)(54906003)(316002)(41300700001)(36756003)(8676002)(66476007)(66556008)(6916009)(4326008)(86362001)(66946007)(83380400001)(38350700002)(38100700002)(478600001)(6486002)(2616005)(186003)(26005)(6512007)(6506007)(4744005)(2906002)(8936002)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V8MGpw7SqbBfDDDov4Yx47YIqrLR6KekDGevHekirdPW2+eckcR5rcTMl1XlkqyXIAyVTC7AjB3568hKzglsP65J5KkJkm251vBdGsevSlflGhXetWV3KI17Unw/7JAoeYgXQibHJ4kHkCZSWXQtSTO3zrjsImClgWi9s+Vqcf5WXYdM+KOK0xusAFJo6wvWU+raIrjZmc+U9HvsQq2Ac/R36cJQx3dwZNoVE/yvTfswbBop9GCu0Di2RfxYrpBvBjhHRe5rMeGSERJkaPH9ejd23FVQcf+47mSBoQUbtJgFzpMfdCEtPNkT4JsFzrNq6pFtQYtOip3L//14DdRB81c/KJCB+6W111VGNj8btyDbAKqbXeOWuE571q0hvzUG4urcdRiaJpcsXst4mudNKRlmtBXICu7b5kUmLQVFQbct+dMx2BMSv7iADQ55A2sjjxS4oWRGscF6pEKLynAgKIJVaE19ngdmfR0/oJuOuH7eS/rS+dv6XASbLO1ZI7lpRBAxQX6P2Tsnh0kgqCytMfZAs+kJttJZ/hCOr4pu80/ty1VpXuetjPkrBP89l+0q8EnbXt0yuUR+87QMly1wug/NSkPW0DaLN3tyYMHQUayjvRr2fSKmNuhgkhrRzu8XiNIQ9LB2hm+O7PlAdaP7t5k7TW0vFksoR/JO2sLxE/fHbIuReyr6OYsXb1tJQIMYoSf/LgaTvZ32uvm6dOpopy/NuxHVwnN3Nq2QBpNZR0Y7jMZtiSyOLq31+H+AMN0ng+414c+7xWmYJ/PuSJjj3hIxwgkzFqEkUckot3Vl/5q1+nI3gbqdQgtTtViBZ74Qyg1fBRIK9B4cRGfUw62udYLfz6hX8bAdR+we4cRi95J0X8he+d6oWWNcgFemchs2HKi4InaidPOJW+gcXTN5c/tPAHxwK4mSFvgPV8f8TshbDQrJfkg6y01xOdzvkmgzbTJvIc9uk126vYAdaVAHHCQlfcj959UIuhUQ1vkXLy4JZrHWJRZuHo+VidumzF3sQef23hKMa/Xpd++fCsw7C2TZUGHWirasBBCPgcDwkhZt1Lw4TdVlSbCVXQs1k9670U0OOw4ku3IeNS1Yp1W63Pl6rABHVrwAPLeMKx4O/ZxMRpLLq3iBdIMbhrq8SSqKtdBX2Sfd4EXJbJxRPI69fynLfrAmmEynn+V8xCxlzmuJLBVGD/+s9Gi5cwW665UVJN6FRf81dfOMe+LPzwfdtsuMj8X0mQxCrab5yn61UI49bHuBOUQlU2X23QP3xrwYXbQH3WLvzBqIVxvBHSe/se6pIsJndv/Izps74jT9pyTcvgI7cxt5eY98HcGG0IypmXejUvYveAeToefbei9kuaAZlmtT8+jvzjo35evsdmTC+1r1wNEksT/ZIjdMODJLSlLwOjaSVOl/jsT2fS8pEOR8qUdVyxnwj+imbi7+utiQBeOB0xSnuQTJtuY4FGhFcpm8MyC7VMAp0oaK4sK/rP/FBMJ3gDlBQ+5a/WznC/g4HI+x820YtMgR0dn8kgRsLQcWl+f7s/EURyXGK829Zxzq53gQZ7AasEf9emZwMW/EY4qRebD2N4bIDQLHnDGI8pWoCDclwny/3agJKqtSHmyDIlibRP0jGXRCcfJQtQE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 421392c5-4e90-45b4-4dd1-08dafdb05289 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:11:36.8085 (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: RTHaFrhPI9YgeLMZ98A24H8yS9j5PcUeP8AmcJp8p54eVpPIOfLEzGI+6vpr/hEvNH6La8EvmUQLpSt/wEH3/JuvtnEGnmz06TwjeejOL27/ZbGpiBH/z/Zi3h8+5kqa X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSRPR01MB11421 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: Linux-ALSA , Charles Keepax 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 Tue Jan 24 02:12: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: 13113321 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 E0359C25B50 for ; Tue, 24 Jan 2023 02:13:10 +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 504DFE7A; Tue, 24 Jan 2023 03:12:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 504DFE7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526388; bh=Bg2LPm52+XPGpxmgJh3ByPosVHOefwffyTmRc6M6ISw=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=rdoX+52pwzEgHXLwwVYYaPB4VZG/q4H/5li2Szz98NLQMvvIAUH1sJHV7Awluiqnt MtaomPnO6yv2Uhris0U0ns+mVjW/6+BeKjVndBimcarrqB09miwWPjdKZI7J5VlzX0 JBIFlhWmNguYpsGGsx6r1WpiPxQmn8vr7FCcCV2k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EAD96F8030F; Tue, 24 Jan 2023 03:12:17 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4F78FF8030F; Tue, 24 Jan 2023 03:12:16 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2120.outbound.protection.outlook.com [40.107.113.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 7089DF801D5 for ; Tue, 24 Jan 2023 03:12:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7089DF801D5 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=FLAEOsgw ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RhDthhe/gDM0ft4jfsA5et2liYDmaYo8QwsYF0uur2xgdmit0qSy00yGz9vgw7/fEz3XGyUJS/j5L2Wfuj9FuGVIy+pJJlBRVMyUEfxVlbj+lvGZCVxYya8YwitidZ79DIhBrahg/BbaDhhGSIeO34Ct7f9dS+G5LjiHnwTiZs22ZVVSVz2wxyZeoz1cVEwIBo6BxQbMKxC2Bu2MelCEi02LMoQ4hwuRz+GPoGm1CEqZ4wqudP1bUDyIUnVvP2c3g57fDUtZKbDPBVuYMgWZlAPaxTkzhI2wsgO/D+5ATgI/Jf94yJyKDopXPmexdEDokYErpqdoCUckqwgAuLWiWQ== 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=AgfQfQ3VyICd0BK7eXz9BLFK8Q38eyI0vn0L9zetZEWNqvk3xL6wT5WmfZkUVvUjYFIGic98PR/qCBM6kK0t5DrXS9ovR9UZB8UuV2tjQWPw9aLawioy2toaPwYUxQUpOyviIbJrfB4V2F8iJzD9kT3DqsIiNHHbqIbo33Htk+np1V59CnOd7qG0ePll50aooGZAzG4e6+cj04EfgFs5hC+gpo9ig28ffmkxTgz0K0HHQ1DeLwJUKTAqAfIxdbB1D5Egt9VPoLxg5F4unMZ3O1yl5LCF8TZtKsYM0zn18k1goZxTPtcDHoWspOKIDLM/zxrV8/IX6QFBkw47pLCkpA== 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=FLAEOsgwbghOkCvtl472DDQwhcRTHhvKHPzY6LzMCf+vRsVqOlUcZECMvcJbPkPU89qmSAZEggymQMNoEnHdUQqsBT7kE/A94PoMjcJxujDVrYHGhbriRxUV7UFaLw/5F204KxlGI0CC1Y0aUGJPQbRPSvLPtryU5iu4wuAbcl8= 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 OS7PR01MB11964.jpnprd01.prod.outlook.com (2603:1096:604:23e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:12: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:12:09 +0000 Message-ID: <87fsc0u1dz.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 13/25] ASoC: intel: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:12:09 +0000 X-ClientProxiedBy: TY2PR0101CA0010.apcprd01.prod.exchangelabs.com (2603:1096:404:92::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_|OS7PR01MB11964:EE_ X-MS-Office365-Filtering-Correlation-Id: b647b133-f989-4199-57fd-08dafdb06617 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EqmeJqBZ7RCe1qw5klJgyQIKF9lEc0vK7rl6WN3ssdCfM5PxCUYvrtTULTd85a9wvGMZCsppvyUUme0KCWVHf2MRjivN5ToNKzhsermbIa9nRdbfW8/yCNgGFDrWcalYCLSPJkplb9Baxmfcsir8UZYDbHjGKDKBAiNCJ3RAWL+Nn/EzhiZq64zcPktjok5MAnSB5h7YwSCaN9q2inVHWXz7ulK3LB4grPW2mv64j4MkV5t1bTzgMDe+ctaRh5ZCziSM6PXpM3RIg5w39WFQuwmA2N9tvI6MSzXd9hsFAvkhkmFe+loQiCN+jCLyDRGhxmxzp/1mbssFjMOc29UUGcaZ98/YkJlS9Qfcvi24sCHhve3OLNLdYcqQ1o+UrJvYt+S+DgwQ78DnTGwsV7tsyyvrZgiGWzh1UA2/BGB9GRXTL4AvvY3XauNO8TAsqLSFayW6OkgFVXRYdB3qgNGh8TA8Spb2gTjkImD7aley3Uejna+w3vxDof7Lb+HwSCXLCHHpDXqB5dnwyNz5zYE+eM4YtJIoQU9Ih2Xvw3dPzTh3FsO6YvwzY6NowqgqMtvCTf/magwABiDzgs2xMCdMdfODIAvVHdM3gni+7SNeKNd8iLN0Tz62M0S92QzOU5RAsPuxjGuxNv3OUic8IwaPLin1nHvy86lSioBlspp7Z+sNFSdM2SiNENWne3+cafF2/TYXRyPS4qRgi2mYj6gzUw== 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)(376002)(346002)(396003)(366004)(136003)(451199015)(36756003)(2906002)(6512007)(7416002)(5660300002)(478600001)(186003)(6486002)(26005)(2616005)(8936002)(54906003)(66946007)(316002)(4326008)(66556008)(66476007)(8676002)(6916009)(83380400001)(6506007)(52116002)(86362001)(38100700002)(38350700002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dHd1L/PlNFEOVJYwThKKnrSYImMaSnmES+vnjapxqkv6PDU8HBNH74hOFF/uY7oR/cdsXrUIvUWAVzecZ0jWRVKXnuNposUUV2Ag3lzWiaXyP8OY6uiWFgLZu6d7EXMh6bjFgi35+qRWE0AJCnyhDlM/Z4t8coLLGMwYHCoZ7wcehr2ugKyPytq96bWyOvyI5q2UoGaN71RKv5wRzcNxYdGl7bDAiKRfvQsVBu9T0WAXOXC9hSMOKpaACHZEpFux1NCbgiorl5ae9WvbLESQac2/PXoT5RTxtxT5qmZ/KV8aJ76NvNwWUjnKdeHy2nZwqzdvPHwq0JOt7zEYhxltO4/HQJKKvOnEFW7ha8IJS4md7whnZWp6/yQGkpFUUS42SrgxjjIcKY1ea5SkVBQcBN2IAXt6FL32uy4SBg5SItY9kZDP/6pvFlUTt7eJLiICYu/1bp3a653XO+ebdEWBkHgFiuYrsdACzKK+A1HhwJgNcNAQy2N8lbZ4ZEut2UCx6AAPfDs4bCcGyH+z9jX0Y56F5nAN1GgQU1bjydYcEA5jGy/aIC9rvnZluzkw/KZRMxEhybSx9qs982q5eRMR/ewXIQ4i36gHrFWlqgxdHwYWNhdVMmwcoW7vZID53jQLEq/ibw809IdSHLUTtndDv01RM1mIUgOhOtDk2T9CtOpJiVwr36M33H8lW4ciGw6ZMqDyapz7oiOGd2lhTb0CI8TWaTkFOqHpgz7wMDPzqGz0jkq94vwjxhembip5KPTluc7reEncLrllAmiIaSQJdQrOgMg7ZwjnH/7PcrDWb3rvS4kvsz4ymMrxeUGc3iOh3F8U7cXIJiMsTGqW0r1HamPbA5jdF8nJBIag/BAth5RxZqbAM/3NTEI4ttoRMUwQn+YsY8QRzomUWvaDBuRrZ2oEVoAluN8Vt358dnBNxOk7u6HxUZRGeNC/V9oTR9NpS2P63dwpGt52eQCDr8PlimicY7oJs6a4Bwi9pR2La9R3H3EOl/roZfY2EZIzzpWSEw6URVNgiBgVX4R5AJXCJLtUnpTXf99k3dal2DNlqw8vSM23ACghHQ7ImXgGarVinVImhZHFz0PIhrWWYXE0YrUKqlgnzd0YKJRYXYoX+/4egykLXfW94A4iZ5fBk+fkGxoPhiMKt2xZKR4+oQ4ziwfwrASrkOI7p/aE3B30l0eZ698neob8bJQaQmJa5RTLosmH0y7dB1nv3aq/R/BPgS+ITgW3c64ohF6xeBnHyDXpSjSHsWx6RRKSJE8XpH4frNwp0yeSNGnz1Rfrgepgz12XNJ4zaoVWGSWG+S3UibldM/vrdGhH3ghpXnDjYVj2QtVD2bvYsQSh3VSGARBzv4stB9dKugRJCF6Gj9FVAU7kz0rGzPt579QTAmcWM5leq4P2T90C/mFnXI8Oi3dFoILaYyBtkR4EY5o4yc1/sMo2Bv4ablvQolwaP5zxse/cvZA1Gpr+NOZp38QHZTD/sCdqfuCV9i9s6WqX09N0I88hjlnSNa1Pit0J9QDjjqkddud8skptWuu3OWMPauNvpiyUkVoZPhvdC3bz0N+9sGDz+S1MkH4hLLSz9FeynJsD0oWFQS9vdb0giPgaH/baPf5jY3C2ZTzDU9evWnAsU74= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b647b133-f989-4199-57fd-08dafdb06617 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:12:09.6473 (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: oa6fN7vfjkI6iq0NbJ6wfbgLf+ZVnVG2pJR10uZjYAWtbVh2Fiuhj42Je47/+dTKJ/F/yh5wDylCOner3sgXac4PFj0TROu1NsHxRmHyEQW1MvGS/Uel11fpQTljPF/U X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11964 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: =?unknown-8bit?q?Cezary_Rojewski_=3Ccezary=2Erojewski=40intel=2Ecom=3E?= =?unknown-8bit?q?=2C_Charles_Keepax_=3Cckeepax=40opensource=2Ecirrus=2Ecom?= =?unknown-8bit?q?=3E=2C_Linux-ALSA_=3Calsa-devel=40alsa-project=2Eorg=3E=2C?= =?unknown-8bit?q?_Takashi_Iwai_=3Ctiwai=40suse=2Ede=3E=2C_Bard_Liao_=3Cyung?= =?unknown-8bit?q?-chuan=2Eliao=40linux=2Eintel=2Ecom=3E=2C_Pierre-Louis_Bos?= =?unknown-8bit?q?sart_=3Cpierre-louis=2Ebossart=40linux=2Eintel=2Ecom=3E=2C?= =?unknown-8bit?q?_Ranjani_Sridharan_=3Cranjani=2Esridharan=40linux=2Eintel?= =?unknown-8bit?q?=2Ecom=3E=2C_=22Amadeusz_S=C3=85=82awi=C3=85=84ski=22_=3Ca?= =?unknown-8bit?q?madeuszx=2Eslawinski=40linux=2Eintel=2Ecom=3E=2C_=22P=C3?= =?unknown-8bit?q?=A9ter_Ujfalusi=22_=3Cpeter=2Eujfalusi=40linux=2Eintel=2Ec?= =?unknown-8bit?q?om=3E=2C_Colin_Ian_King_=3Ccolin=2Ei=2Eking=40gmail=2Ecom?= =?unknown-8bit?q?=3E?= 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 Tue Jan 24 02:12: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: 13113327 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 CE6C8C25B50 for ; Tue, 24 Jan 2023 02:13: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 69435E84; Tue, 24 Jan 2023 03:12:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 69435E84 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526426; bh=/hHPLJY8uaAcv7lb8pbWFo+3jbtzhB0GV+gBiTn0OiQ=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=XrlWzowvTetn1Qbm49ExPogQs8qV5l+jT9SeFH+kqalAt2hIvsG+wBjQMA47i2aao kgwYj1c/koLbScpvPvWfGKH1a5ZBD7FevUGaKeGHxcPSrfWaKoIzjmQzYU0o6MHO8w 6sn4Ou90YvFKy0o2QYePII+tUTPyDwywTo1Qwt4c= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1F358F8027D; Tue, 24 Jan 2023 03:12:56 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4638BF801D5; Tue, 24 Jan 2023 03:12:54 +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 190F5F801D5 for ; Tue, 24 Jan 2023 03:12:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 190F5F801D5 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=kP2zeiIJ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j1QDK62/q70voPZ35hFdIA19H3jy5IKIvXsPETL0qEQ5YOpfqfEBdRfJXKVKn/rD9mA448blx/LMIRjcu/qV4XMqCwVtJZmOIP3p7QUTBA6HYvski1x8J8QFxaB5XB0Zi0USeyWHKbphav/wTacklGmRHx9wsGAXP+pyKl95FES1V5fWrJlJAW3jBCDPFhZU5hg63g6mAHt96Xu9ytl/mBIphKK0KdS4MRLtKRJmvL9SgpqFHQsADQXkM/5MlZExwGjazcACl7vw+k8YO7n6I88y8INxHFkkiwYaoPQmfPirLhSjbvylP9KthRVnUAyflG+FivXC2d7bA7kEA5ryHg== 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=HB+f3OSiCR7oFI11dC0ynoVQlfa6up+opoNxqtM0jpsuaTULrqrIT//YwbzrKyZHt3gyXV6vcIl++J/XMBgkMcdOlvjQGc5Qnkp+P89v7Wnj2AZdqpICgBApvtY0llGQCBU0/zfDMfsVHWWh/6rT7X9unKceq1zpCO+dV0kEEjzZ85PS7BfPSTmrnSjuzm8JrChsTOygDXceF5omKHQNzWN55hUUAw2BwqUHK8glWMXuVmjhIjpR2J/oOpS3w6p0SHMQ5rKJjJDZ2KKbsgsghS6MsrHfobiG8J9OCudW93CaFLmR1iPxSt3znTkEPEosrR0JJOZr6Unz18FVVykqIA== 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=kP2zeiIJ5p0Ne1mT3sQKafti/Pc6ui+drdFeoiyJUT1rDDVT7iDd4Ibwi2z2v4HI2eULqa3Y/oCZq8xADFmElSh52lgxLXsKQCk/YvSedFx/j+94xplY8KyX4zDd9qwos5KcG4ifRbrq/Hy7+eqmwGCKU7Al9K2chIcWDCXFVGU= 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 OS7PR01MB11964.jpnprd01.prod.outlook.com (2603:1096:604:23e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:12:46 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:12:46 +0000 Message-ID: <87edrku1cy.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 14/25] ASoC: mediatek: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:12:45 +0000 X-ClientProxiedBy: TYCPR01CA0183.jpnprd01.prod.outlook.com (2603:1096:400:2b0::19) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS7PR01MB11964:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f4d2812-9d8a-4cd1-e5e3-08dafdb07bb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N/hpDMLYeneW4dKcEMJ9O8dw/QdvL6Igp9qX7eM7uHlXopfzECOkLRv+WfPgfF49Q/hrxZIVhnXZc706c+WnT3C1Fft7jiwbvQVn+9tOCzw2+rbxzIiCknJ/DFgVPIJCtRii4NAAPjJ+o+tSD/xiKVijEmRcyIXVwielEsRj2WwCHKQy+nQzz7bWtAt65x3zGbgAvjbCwogpdkmtlyq2rNjYHtvX5AooaOcLT9alVXWmlqtaEcFTbyX5Vhq9Vqn7LqLhkqxb438dARz176nA4ybfZ7cVLXcTYekMinAxjcFENp+wKjRTYMGpIgtpOenEHq9BmfT7Mq+nK8i8aFfTYlqwWQqECvQLe4EG/8TR3BAbqgSZrZbFd3bxSCJ8pm9sJyKrPoOA1y+O375n+38NCREP0oBymmkFaiaBTD0BY3v8w0n8SjFea8X5f6JuaZjJkKZwPCnCkKFAH98jhko0p2QgQ3Rzry5M4VETAQxlCJIypQOiNSctUYJ1hnpx/BgLk1w+Jh6MpPAxdI0TUENsH5uXB4bPv3Av/QGrwPqyp9M5XImsOV6VtOCAZtaBsbECQOASs76evqf6X0F4FXw94aLjWXKVX3fJGlTnsmhGJS9dbH16SeMpiiZIdoQVoLRQRcbV7WgbgLeQDtXDqodFMX8Z5pVQfQKcn0ov1rPlr4hyQiaZ0rYmqeUhoKNwkirb6yV5ylNepZ/EagmC5TCKeg== 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)(376002)(346002)(396003)(366004)(136003)(451199015)(36756003)(2906002)(6512007)(7416002)(5660300002)(478600001)(186003)(6486002)(26005)(2616005)(8936002)(54906003)(66946007)(316002)(4326008)(66556008)(66476007)(8676002)(6916009)(83380400001)(6506007)(52116002)(86362001)(38100700002)(38350700002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gDlUUOSW9gJaWLa5kTiI5CxhPoxFx00HgHhpk7/73XgPsep57DKQlZp/+Hc7/hnaxgA9eqhRTRUzVv6Q7dWYLYM/0OdTq9YQrnakuwyd7X1/ztuNBKazX/L03w6mnCow7NszhpIGQqqVCTWIeliGaR/8gWMc086pDGe3Fgx+NkbjpNLy2Molsabm6Zw5bcZaEOBsQTJkLuNsqNRwzdLX1wPWQLLhnw5NztdjAqS8QOH7lH5WDzl0KCkQj4goAZT8COwujJOXCbcUNfE5YxSc4ilfM8MSe2YBBEPo7JZueXhh+x/wVEqbaoUm1FAOrOJoImtJNIuha9v40CkPOSP0CvzR1oYhikHCWfZfQnncpHubcf/DelHt9cy58wLkwtBQUmozh98ZUoubcJRZIlxe3pQMMrsqZQ11mMXvDoIxGa2Alt3CXrmauBxft+OZTMQooh07FXlPEbkBIJO+wHo0lF0qD2e9kWg8dX5Ewfj6YXO7d6jygsYMeaZDPHh/k6wLQbusP1AOu/igckWiGsRUgSH/Pc/RAv7ut9nDeDwW8l1vYAmGf71afAMSZCMCKAro93fhhVemxQXWJ43P6VyZK2b4xrAcMy6qMRdBjDAa2HXtUEV+ywwKbNZQew4QifS6fnL2ysaRu5iQaZa4sN7938mecNtLYo32eySgVI1vuUcoK9Knn7dPUWqVIuHrPk9OA3Mw7V+xthFo4SCsEd0KwY7FeckzK8BGZGaE5QAa4QSVY3bX5AAEcWVdeQZtDG8eGaNFqONGGXQxwRrOUAl5l/9UwRGy70EiOvzaihSEWs/rIiRfe1GaJpszIb+QsiFUsoDEKAofO4DYURZyXh5j29RH6c1tjzjMkBEa9n3VvCsz72PIn5tePC7X/OTRqj7pJEiBO8ogSQ+bDV+bchll556KX1LzCid9fb7BE+hAM+/je6FP+PF0kf7VV/Gd88TVs/QfMIDkWBWYSmVgnl3K8uLh7b7dtr06JS2TELANeAXseIXRvSlXhRKLYsqPaMR2W3hn3GrGU7iU7gPuYuLLtwlMlF6LumBqZb9zgdds4e25nAHlyKEyPP25VL2VLc3Uzw+nDYOP9nhideWMV6fM8hNtaHVEYJo6VrJ9rnTuhtwl4bzJQsdqhnemAYuUa/18H+39VCKIQBkKUqFSApwooSF/zPGOVUkCXNldVjxp3Amau8rWJIrELYhSlKmUyBoxHZwKObp0IZaPipzMrAXwYa1jGow9r/y6wIrKL6fXGZaotSF/jLq/A8A3Ve6CdLO8GPrP/qkrTCzyho5ky9p1aSZzok3uc1licRJQW1kRSktGd9Jk17Eg/kAnkfiOgtM3x5tKHmzkume590PqVkR0atiutfhOAAj/Vt465yC7Vid90l6dAUOORUJhWClbXAojdJQvoDfxePIagSZyj8VK6PDOgAbGYusSUjM8MSPU8dm3U5h6s66T4YBwkx8wtwR/hbPrr9r2JS2SuABuERPneGZNIKfgmRgUypBymOywIEDpd0F6QKk1RYVjru0Vsp3xIyu2YtW+bYfxQKVMzbsuJK7sKFZck9+1LJ2kexyBQbf15J5QrTb05Io/foO+hicDxkenKjvWi7pAqpEjKriT4h7Yk1vSjfQ/kAlgZ2VBMPo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f4d2812-9d8a-4cd1-e5e3-08dafdb07bb8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:12:45.9070 (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: XEVSX2x0eomLp9b3fgGolG8c6RblouJVqRqFHe1SfvUOgrV2BOH1GSrLjDUfTBQKKk4qS1HBKoqA+rcfXxCxk7H4KkM8IHkQohMoAkvIpXq66w2RVwT0+riRXDQnCifK X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11964 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: Linux-ALSA , Chunxu Li , Charles Keepax , Minghao Chi , linux-mediatek@lists.infradead.org, Jiaxin Yu , Matthias Brugger , linux-arm-kernel@lists.infradead.org, AngeloGioacchino Del Regno 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: AngeloGioacchino Del Regno --- 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 Tue Jan 24 02:13: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: 13113328 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 3C5EBC05027 for ; Tue, 24 Jan 2023 02:14:14 +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 0564DE88; Tue, 24 Jan 2023 03:13:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0564DE88 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526452; bh=Ei6/sxm2y7WzrDWSDRD/NVqrvqLpCMMsCv1YcDzL2Hs=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=OHsnRyZL1HoZhAGTisqXq2j/3518D5/EaIaogC/8Bh6GX0hbttT9Rct6o6DSaupRG vJX0FFKIuN950CszW1a4675BGuNH0Q9NcVoG+1QUMWSyfG61spMuxhlICXiCnPwoeq 79u4qEtCojkAXGm23mbtWWQNGQQBTJz9qOaf/780= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B5927F8030F; Tue, 24 Jan 2023 03:13:21 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 03A2FF803DC; Tue, 24 Jan 2023 03:13:21 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2096.outbound.protection.outlook.com [40.107.113.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 AA18BF8025D for ; Tue, 24 Jan 2023 03:13:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AA18BF8025D 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=ZCNjedEn ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D62z9bekzSviaQdcgUtt0Cje0ToC8p9pHlguBXArhhFdT6n6FtOVpE8hk1TF5BIgDEDXOEEI2ltrz2O0mS/4Lx8GOxDOBGBHNCw3MJ5lW+l/wrxW4hHaBe7Lgf6xSt2vOK8COYo1fixDZYxncmbl2X1SVbr/C/TrhJ9rw2ADfEMM/I1SbfECNhnOYgTGJ/uQ+e1tvLW0nmPz6WkmWrCnhaeCnRNpH6m2a9lBIqE4TRUEx/aWeepJ7gVD98Kgm3knmIuQzSX0mnSr1o3vHJWAT5PoQIBR4vhm1NIEJMXML+EvLsLu3XxQ+OpRiMTaFz89xMpN1bdsyDzkoo2oh9eVhg== 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=DR0XWnuA8FwWW1P+SBacc1u3wafkJA5xsxTpf6zmEA61WdtejupRt9oDU45U0UwHG+4E8Q1CA0IRo2Di2VB7GJUy5N+Tp8TVzpEajYx9VQGZo3TgV8VPREnhklGwA1glCiqSgfmNQdAzKaE03nX1p6UlvlVuCyAnYQwbf8gneam70MIh8qkt1YIpSzT5ARykO5MCOF0z62XFWWiPkyaKcZPtip/t6x9qYJwNE4+1+SMJx2N/1bIyXcqHjQtzNpHma4pdxGSNLhHoZhDSkF3jHEPKPcRuh0fS3JUNpewbvEH+3o+SUvxqAtQJSueElYowYaL/hHEj5PDh2nw8bJzSUA== 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=ZCNjedEnSbzMMEh13lFy1uMLM22N/PzxNRfT0R7DE9zFi0dwndu3CdscNoDhImGh1xDeSL7Was28GxoBOu7dMeyS5ezboiGIc6X6du0NwZsAya5F/hhMCyJMOkwwryEUUWk3letakSRv1tkZVEHkY4CfAzGUEIvv4+pXg35EFWw= 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 TYCPR01MB11127.jpnprd01.prod.outlook.com (2603:1096:400:362::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:13: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:13:13 +0000 Message-ID: <87cz74u1c7.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 15/25] ASoC: meson: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:13:13 +0000 X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::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_|TYCPR01MB11127:EE_ X-MS-Office365-Filtering-Correlation-Id: 4135f367-b573-448d-6c39-08dafdb08c3d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SrMiyDvWpw9bMymVu9Jg0mvtvGZ3U3A96UOLnVvr0wEtsYZxNLc/S16TDMXU5U9ziZBjLpBr6AweEzDfT1+oSgjJFisUORSKVv5x4/JqedrhwgNfDyjGBxeBtwPqZKBlso+I8OPKlH59mqjHPrpAUQBqmrE41FER71Vp3N9c/BcQwfxZOIKawM4kMWL0KSywQs8/7EIY+IdsSZH+NLYjuogLhIEmMD0mX4ZOp17PX/mwfSB6HR+fx5zQMVLzVlGh7pwW9RC3cOHGwJiIEP9k8k9THJS0Yfi5beKL/7227A+Mabi18JzSN2YsPvB0SgBNDKPwxx/uxQW9aiHixHPlscR2vuHSTGrVLjzYDg8Xdsen+ne+QUE9H18/TrsCiDgk18wfMpb8oMunPpBQgMST2inJRb/dY+j2XfiZitOUL6jJ9RECx21SSCyTzVOTtCDwWPLAiikRsMLHhq0KHTTyp0H8t8bW5M/9aeF5DszgqvCD8dMPkr8dKn8t2nJOJLNHq2dGqfhbdKRljDAWxvcfoGSWtLgzYc+yjkVrVYRGnAtnwMu/xXP5F4YBKKM/zGsEsTOu+1LBrPZahxtXgHf2015y0C1rWip3yTi3J3tBZYtnRBvsnq/5Hv1k8+toAqjHCJ8MkNLmCAqHLNO8Jw3Uqa+NXC7vn5cL81dRw8APMANizs7KYaAqP4d4e56l6PUsHZ3oMOdIAxQbJCH93PJhBg== 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)(346002)(376002)(39860400002)(136003)(396003)(366004)(451199015)(8676002)(54906003)(316002)(86362001)(2906002)(36756003)(4326008)(5660300002)(66476007)(66946007)(66556008)(6916009)(41300700001)(478600001)(6506007)(83380400001)(6486002)(8936002)(38350700002)(52116002)(6512007)(38100700002)(2616005)(186003)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q83T1PT9C2M7zEDMgL5NWlEMcnc1yCVTr6gVv8dzuTcQ/E/GIUDK7j9b3SX/v33lqV6cCSFANEZAnhSqioRtH2w9a6yvMrp0t+sPsItFVNpvWFZYgv6/bzgQYfFzVLoNWfsGhBBxHktGogmYSoAi5ykt4y/A5T5bZ0N0WFLBaVrd8Fy+yWnHmVCG/3/hIkYBNgsVHmSC/9ADVWqXRNUcWE1Vd9fe6Zt1omYX/SGY/hguzqgNcFaWIxh+iXaTT1okrSTcAbN2BdqLTRQVbWfbDHSJ57Xf9X+/MLoIYrPxX4yeDJ7MXsgn+r/Wcb/Icq+Qt/cTUvNhhBP78bAMS64QOXPQSoUondH1u08U4fV3CaIYFUdYNB/12HvHFClv78rEdfNM74MNQrs6DyHfKLKCc6Qf994Ra3rQEhH3RUQQoeqBmbNnIH83a8nR6jM/6nHv2flMOq+ojVzu9OsNUB181xrbGgSC0XvN3ugcY6TmA2Q25qZk6sPQLgnB52Xwa9lK6aRmFe9X8wfjr2xBCCGeMpphhQSw2RvRyudA0DNAFYxlm9xsUN5GNE22rDBHqA2Utd4G6uMhxPpLZKP/SeoBV9h7DkF6agokvfHjdTWTGau9m471FTkFNRXyPNVrMQxjc17OEqYb080q0/GopcTTnS2GlauVQ5ScHu+Cwae/98hrhkPpXSIBDAZKb8mz6+++E7ljzv7jKmRAHI5ISLmrldGDom6qaTa+Zif+pXl/nwOg+xrUyXBQwGdP+XidTd0gA3n8tsEpD2KTVXVkyZDwWG5NY7z3cmcRCJF0bKL3MWWiLaHRy0PC9JRBCY+B66IAz00fxb6qq3yrqAfmk5PxT1tzNmRtPdGSo+ciWOBI93XVx7iFX0t+DaPnQfuMHZL6bsyPGjtF7fMriGCVD8gPlJaoAHH+kST8+SGYbPV3oaBngYIbfY3lo+Gc1zgIxicWhfieyYQOC6REHAt1+ygSi3mCalshyQciVe973vN4RSk9lNzA4hZcAFcdQEiyODkcBlgLkuIIP+Fu7fA51KRJ9BQ8KRzEFhDruywzUC+m/8wucCHZZc6P14ryNk3B+Tk3cCFeH7cvqG9nZ9UWCNVIl7TWlSzcHjJCnGQtNYysRuIftUq+wKY4CodDV2eZe3CRllifErsGv56VI5UzHoH4/g8aMZZjrFWSdLm1wVSa+hmII2xXxUuHE5Zvk+DXIlTXhAmCGCOCx5E+OubpHk9xoPzjnb/YnIlWNdaGH4bSxitw1JJVUKAAu8YB+0Y0S+s6m/dBZjefDbxs0COq4jx/Z5LEO/45GKANa4UCgm2G8oS//h9YUGH3kDf60J+pF5bvpLVemjPtm49aid2oE5GUIbtwKegJ56wlnTf2/kFnN7c1DcGFpvJlIE8F865Wd3LaxSI1vf641QQ0bozXi3PMYmQhNbiIC8HyoU/ig+LpfWaaSet7c61uTDjogleSChdfx3fGMP0VRB2nH2keiJgnABwoi4sWndP3Jg5Nk4zdeH7+baPd/ysBktZ0s47eIwNyl3a4UMzIWu8eWXeVg3U1i4aSooFDl1tj/yB4UrLe2NqBqShmAScGWOTmQnKKj/JR6E/0ICy5tyJuDR8SU7Ml0fHdHVNXAvuGOJ91XY9lhGU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4135f367-b573-448d-6c39-08dafdb08c3d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:13:13.6659 (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: cRPp7stQVQCpAox1uEk1R0dSvyLD2p13n+ZdBHUt/LGoXWWcIH6d12NmDCLiRlBalARefWk7rkIwKBBW6a/VMrVCO7070BGPrVMLNRl9Y1J5qCu6QNWSmzU/3lwa1jrf X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11127 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: Neil Armstrong , alsa-devel@alsa-project.org, Martin Blumenstingl , Kevin Hilman , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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: Jerome Brunet --- 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 Tue Jan 24 02:13: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: 13113329 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 15D41C05027 for ; Tue, 24 Jan 2023 02:14: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 418F2E94; Tue, 24 Jan 2023 03:13:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 418F2E94 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526477; bh=TQMlP2nPq/QDUPLRENOjCyTngOAgYkDlRcgvB7YXxlE=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=C8jukq8sifCA/wWKo+YH2CVLkyzTHwkdHbrb1d1Ed37DV1dSYOSZISntJnG+pM9sz 5eVFZf8SHtmqxVcK08pS5QftvoQiV3q+Ie/jBW7jGuBielzdulgRxWM/B28tFNPc2D 5s7hDtRAn9MvBNXBmxyMtAsqd2WlVUJPkWW13FaU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BBBF2F80515; Tue, 24 Jan 2023 03:13:46 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6045EF80533; Tue, 24 Jan 2023 03:13:45 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2108.outbound.protection.outlook.com [40.107.113.108]) (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 3FF22F804D2 for ; Tue, 24 Jan 2023 03:13:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3FF22F804D2 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=K7t3N2BF ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZrIUFrVO6mD+hdINRSwr9pTSOg5mqGM2fNKo6WWAdlVjy7+U3bID8/QGzBywoD2J8vc+SYX6YK6dagOnqg7hpcrqlmmakWzI6/RkbmlCOLXDwExd1xNeYF2yHwqa1dMeI4fpUroyIWoVoxQ9LkmulwkTOvHfqxSVPjvaRBLmVOhwFjzdicokMBRTlT7hb49+9bjb38EO42U7msI3zqveUaz8d6lPJU7EQ48vk3p/TRUYNieDNve7aUjb6iQHxhXfiAnTLvOKzxrBFOa1C42vMHqQi1x2EeXlVuxBORXO2VcIbILb+wETlVRQxyZwxXPXEZE2IUx56d16xEAba5KlFQ== 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=LQyH6Qj/j64tfQmQUvRBKK8B9Ld4IZNtibo8ZSWNcAj+d9MnACOONaFZFV4sYWvQ7QwoouQ9zw4QrwljRqa/bW5SUO6PlHDnuI0N0xjkjs8dRqfH7yysyuXO42K0cMqT7bebdpyKbDN5pC1vEbCkl/71iQFCwAG9L2WnWyqgvS2YyXDIsvyQ/jO51jilcV9w+1JYAiNU57lP/waZuk5oqyfa0Me//hMYRFF+r67AZ2dPEtubB1fjCmyesiTFDgx5UTaxTFhw03pgMQwu9S1LqX2WKa+I1yWAG0JzByH7UF/TfVjoIgrEJEoTqfIo/l83TZ5b+oO1lU7zgjQRZGsODw== 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=K7t3N2BFL2JeXhuGr8N75bMPwEdEAOB3ylgVLmI7ojM9noRCcg5X0OrjlNZHpmWWbcELTVnQGNLWlxNIyUA8X2MgiU8buYWrK8Z1McAhg3uMobchiOSqQT+EvoDYsglvOqH2vKlfXjDamCRuMgKzLkHLOz4B670fbltMIdZraP0= 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 TYCPR01MB11127.jpnprd01.prod.outlook.com (2603:1096:400:362::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:13:37 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:13:37 +0000 Message-ID: <87bkmou1bi.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 16/25] ASoC: rockchip: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:13:37 +0000 X-ClientProxiedBy: TYCPR01CA0127.jpnprd01.prod.outlook.com (2603:1096:400:26d::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_|TYCPR01MB11127:EE_ X-MS-Office365-Filtering-Correlation-Id: 727b9ad6-284b-4bb9-8038-08dafdb09a8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zmod0TEBz4AOauoVHkocOzCq3pJaEewAUkQAWtg7IjbJAvQ9FJWCIbgdwHC/pdmJbUxjfVAL1PAmoutEul8yoEANeQxeVT3pPhzNxIIp8OArE8Eildd4VWQsGFvhvKhtkLzv/J1PYzhFHs+9SBdTr+jzf3SONf9F5JQcg4SfMvcgAsEvbwV0k89dgYrQO5P0LNvxfa0gs5lnFEnbLsVL6NyW06W4CuVX05htiqeZjfy50Xj9AZLUbn6OUVdoQr/8v6I+mKkVFzt+i2yLA4JR/DaloUQ0Xrz0ETRReqrYgF0IpWSdY9PGmUQ6LT9Uyp8e6rRPErFDEKSlJzWOhnRrDb+ULLDoseFHFl9/Vy5DmyTJf3G53Zo1gigfuetZ/PNrlW2e47/WFqhCdZ21Jxiukri8aZHtxSUD01iRbnC/XhxNI1EMv2e1G4zJOqlpULy04ypmTIJHMKKJtJxoGcO1cFUJa2NlIE25IUX5WKAgwSqkYFr3sAna9HF6kPbvx+2orjbut+497gjoHpTjGOX7LiNL862u0PLnKAn5BaqiZDfWr2wjqDrqDLWju+wOfSkUwkHiqkwt/YeVXggfA3cDFPDQL4z4jOUODzh64WwiX0EUMGIvbVv5EVTPiSCUC+r/s/JTKE2Ycm5n6Edn3NuglC/pAqEVDmvzeAuGIGjhx4owVkIlBi2T1f1UVzXSPC4pyHvZgvvUFhB5+p9JvoLklw== 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)(346002)(376002)(39860400002)(136003)(396003)(366004)(451199015)(8676002)(54906003)(316002)(86362001)(2906002)(36756003)(4326008)(5660300002)(66476007)(66946007)(66556008)(6916009)(41300700001)(478600001)(6506007)(83380400001)(6486002)(8936002)(38350700002)(52116002)(6512007)(38100700002)(2616005)(186003)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 09sZIv/nH9klEkQAyIFctc8Ed3UuQ2ZWaFU8YEFsvJpUjCJ5f4EwAJM5eHm/ONscF1G5G3W06EhFW3pe3TiWjCzyJvEsBuHvfJP1qjY2dtctZq0xgsQB9JRe9M/DdHDy5Bb8EVrj9k1FJ652Irnh35P6XxCNfH8S4Kr9KpYP70MUnpY76DU4lwFun7NJ0FxHtMgFV+w7NZC4i82mtPfgHAUFJXLmArLpaTkedoAzBaHK1I+qUfXdGUB9hdAf0SAz6ywJeiGmatZlZ+giP8fS40otgeBuTovHj0jz51pw3bgGqXEKZU1WB22DpaPgi0FfM7QwF4yObOx1/wO7Y9pBLMYzd7PbWrtjzgqTzv6rlCCdNCZK7+8fxzksWTBgxHOTu1mEj/ENBV9W1sNlJsuaNoY5i76II5wQ7YLFzMEp1EWNx3cTEqv7cghmEEgAY58OLr+AEbfzon0Rpnc7hswaPkJRT/iDykpCCkss1JQ/Tfc4c4968y9iPG9z5/toLyniea3rkdwZ68Sphwo0HImRvsPi0KJEfJnIeRK3qBaShQDhJ9nVCcRG7abGNISwGhaOjU4jKzQvSiJzwC0AwQv0rL/v9+u7JerJ85n3LjRSO4AJBF3VpCxu/ph91jEnDo8mht46DXR9HTcV4eqsxeOeEspNBgKXtBYDAC2BFbzQPNhNGhvZQKOKTIvA5M3XUkhHp4w3UU4624ga3e1D4wyjqaoWC1sMwZSQ1Xfd+m8WJD+vj0GZJrltUKaTMLJSQ6c7PdvbM6nsFxj7wK0UVI9ZacBs+O6RnwTo+tdSK1OrBBKEMdTkFXcHzl7tawa/u6LR9YaZdOtLGt4+7kTF/VzitRelu+FsHiA9bjLP7vmowU9ss/a+9YglFWzccFyS4rTEJP1IMjDZsNs/WPB859RwI5/OQGzlCdbpMHdPCMOa4X7SM7WvJqD8/lIAsmYyMR8f0/a97oKzL9r9ixqQ0JBDz19YLES0n6JTqWFmxGX3owgB868q8i2vGJEsAVBnMiq6G2kVEeg3+w54Dx5X8F+TYuyEzA/VZuatUUch9cjda/LCB4Fhtl6EeauZVCKUn34XEMs8KdLn4m5QOevp2vu7IxlV2xrhr5f+O+1WoBa8Bky+TKCxBfSibSw43xXpH14v6K9YdjddW0mXQo7MITb45dwGQiY+36pRjKHSXZE28fO4+Q5cXqUU+iR7VAJa/IUrOF8KSb4/UiqfqG2fRDu33ZtH7sS65LXqj4FlpjoPC7XUvAILD4cc72WU4+bOlzqVsfglGteTgj4dKPiUU9/miXqLM1SwhLxjS0gQV0mBe68AimWgquJfDncrcPbFN8v7IzLalp5ihJxf8ty/74NuTJy801v3+7MiHy8VFNnntRIeF/JwFUqFvynHA8t5fVfWS84JWp/TIIGn0/XLE6BK8IP2fFseyzQLufeZkhE19RU/8Frvp4uW499SepIdI8KpGv1gSNmTU5eodxlKc38ebSHx7Rh6Kl0dqbZiV7Q4dFN93S1h8Vb0BGsasbA+hhkg1/J2QkswGOXHqqaGvvh6MMMkgdZxUutkWRSC/rlSG1UkaAwsF8V5RZDpme+Y2ZwxxEFVoZ2h1kO4oBKw6h6QyLjnEJJSz8q2gl+F2iFznt4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 727b9ad6-284b-4bb9-8038-08dafdb09a8c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:13:37.6879 (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: kwH3tRnUY7T1D8yYp6PVNGrL0tgd0PojzLb3A4BrgCkcJr1IZnsOp0lhYvvIueU1pkiQHWLytDgVYFf+c1a3ik4AA9iYdf7Wpo6qbvp5R20lXUY9K4M2THqLp/1h56X1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11127 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: Nicolas Frattaroli , linux-rockchip@lists.infradead.org, Linux-ALSA , Heiko Stuebner , linux-arm-kernel@lists.infradead.org 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 Tue Jan 24 02:14:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113330 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 398B0C05027 for ; Tue, 24 Jan 2023 02:15:01 +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 A1913E7E; Tue, 24 Jan 2023 03:14:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A1913E7E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526498; bh=T0z3Mce7vgQU4ka0NDRhRgidtcpoOLLnFlssbGJ0FOQ=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=LYWVmYQNYY8AcHzvNheUDMzYIpDJgegMSFqWt25rVDRL5mWtXzcnIGxpmxdtGCy/2 jR6fwvLcdn5rnsG8+5UcCCkRyqCKK8egTPtuFTXfjW1R2YWVwV7IIavcAvE2U9Tryo LfpTnc8//G9kw3NpVVwrYn7hsIX+VvZfiE2Y6trY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 58D2DF802DF; Tue, 24 Jan 2023 03:14:08 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 26B29F804D2; Tue, 24 Jan 2023 03:14:07 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2110.outbound.protection.outlook.com [40.107.113.110]) (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 722A4F8027D; Tue, 24 Jan 2023 03:14:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 722A4F8027D 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=Okq0VfNs ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ENFPMkzFJNEIHDGt2MtOESPq2wh8pi2P1Z/jkQSkEZzDqTKlpNTojCvybH8BuybsPnHhzYXPAc2X3jnuAXxSe2zAjkg8bLAlzc5JZoXTjn4jCSLdWyjv8w/HdAFrPzVptinFT4yBEuSiBWDOb1tYrynv/1hM8n0ci9Wb51sHJoQTh3XCaaXA2O8oGEiWNu0QdOixjKpotwucHijvvgGtqpcaPfc8oFoLLc/LEtVkAJ4k4yokoBU1Svy2S5uf+j6jO0ljqqVqx11j2fO5+a5lUB6iFobcf0gIapl435CaVqJDXmTFHqxloyyu2O82MaeVgjvzitcdYGIioSeBJ1DWsw== 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=JzJ+kyZ4M2ARixIbrNHb/SJPqOSrZziTVksBife3zIGud0TTgQkLbPGNWQVAWMRbmY9sZZl4fGBfZ7vG/wPZDq7/CrrMP3wvtnxZDZhl2HH3r9EIQeG5smxIOvDvH8sGV0Fxu/rq0WdMt6QFzUhXAkRm4ZI9YyNcijySKDEUoINFUbuOMlnakopgEDhDvB4Gb+El5v4ibp5XbedGgPkxn/xAeh6sYSpm6o8ounYWIFP64EISuWrySDVtq31NfzwcXPNTZfrWIpU19ZsAPwN0Ag83XdmYYcp5gMNbyyYR/OlIgkL0bU+RCShkUoC6ma3b3JaG6bx8ihaX4jB3PoBZ0A== 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=Okq0VfNsEZC6edL3OU/BN5A7kJnz7MPwZuIsvmnc86T1yu2m68WfchS6Bhhas2Vkn0HJ+P3/vNtd8idy6/7CBZb3XI6XOL8ug111SvEsHWk06HUPU2XuvO5pCfQTk2jiQpb54POXKMnO6qwj7RUteMeyTEOfiGBpETAcTO4GcOQ= 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 TYCPR01MB11127.jpnprd01.prod.outlook.com (2603:1096:400:362::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:14:00 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:14:00 +0000 Message-ID: <87a628u1aw.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 17/25] ASoC: sof: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:14:00 +0000 X-ClientProxiedBy: TYCP286CA0101.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::14) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11127:EE_ X-MS-Office365-Filtering-Correlation-Id: 1365185e-29b2-4311-bf2e-08dafdb0a807 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R+OwsXUDHva8Y/dQLzDFgMqj4hscbvxz2G7q5cLGCLYiI8vsTSfoNaeU3XI1ovuXo0nftO8hB5hN5vYPjuU4SR6EkL/yxNsl06jdXfOAli2IvnKP5pVh6v17Jvri6vok6XQ45mE40atSk9cW8/SQ6bhX6UVdnyLP1TGZoztARwAaYBtuYxWE7xCo5B+H0KddL/3XUzA2LNrXfd6Rgu2cwuPgNAP5FD0ThVkaJcjUfBFNna0SxG5Dqf9PsJhGjQVCvDABm36KVCi7DyWcQJvbXNJWlZ/zfTqbHEE83K5Rean+XPjGaDWu+v6YVk97UsyChBbBtfCCstsXeo7f5c1Ny4stn09rwgrjRz+QEtUfYftcwzGb8xnuhdXa0teCZbGoC3l5INSqct/RYDlic6xjk+Z4DZjic3lNmQqbc7Niw5tSKSdZgxP6gK0to82ieGibHcShVDARYVwoTdr8FpDBMt8M/AcSTZ5iBOUjdEdmC1LgIS+96Bmb6y8C8WdcYxHHEUbXFmHBU5gS2tdCWefFKHLs7l9FXJ5b7+bDmv89wGDzoFYlthPA8vuu6S/AK6Jt2jl+VVexunyTSQpe/5xdupbNhWLwlh6CmOwy7CX4nyuJC8kj9qxCYnTHuKCMOV2Z8PnvKr6BPeayTTTcPSoAzhZ9PWzNJQ0pMnK+phBGhPOJtOUDmx1/TjE3RHrit3ja1mdIvN+TziSvIU4C7vX0Gg== 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)(346002)(376002)(39860400002)(136003)(396003)(366004)(451199015)(8676002)(54906003)(316002)(86362001)(2906002)(36756003)(4326008)(5660300002)(66476007)(66946007)(66556008)(6916009)(41300700001)(478600001)(6506007)(83380400001)(6486002)(7416002)(8936002)(38350700002)(52116002)(6512007)(38100700002)(2616005)(186003)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ifemb1a3Z6FXEw4CO2SUVBs4Eyc33dZq+4venuIn+oJVOFXiZxDdb/CToBdF2D4CR6Bwd3y9iAoDN015NCQENRcuBo4ZQgdAeq8P6Gy8F6iaaznQpptL7hlYCzCsL4ttd7ZZuISQrbELd4yGIhpN3swQOsXe/PJ25f0vR4FgAMq8SgbwLIf0zusaBK7fn/4VFcrbfY6cFaNqM92JB9hc4bdZWXNThwzyZjPVgXSI+AAuyFgSL+PSB9kY5SdQKa1WrNPBw/XOBrVjMnxSMjrIsBCsDA7mqKbSyxOZmXq7jVqzjT35/MR1Llsu+PU2lfXO54re8bu280/7YQtpBXOdCQMSQmGLSxe1WUCZyszyiRNiH13Bsg9V1z3v8WIwtpRVStK2MVmGbhN75z7UMZ6kT6Gb7c9zU8XdQMM1c7gPeZPW5g2EeZsmSFOPpWG3f6k4+3Sxx7Yrbo4kjzx3JTZlAOWwupFXuXD2Z/m6OaVLG5WJB9ZcgQmGIiuAW4zyIvWnew5+Dy3WLOkgMpbsjPSSTskay2ekecPNPt3U+K7DKQQcpZKbN5K+l4S92h67JUHOYsEtGhWmW/Hbb0ImXFWLVZy3+NUd9xqLQ2UI+eMp0t33zG6EW2vm1UY2Y+WKb7hP5rmVUazRBZ35cxX2kaZT/rGytVBBYUPUslh7y2fu9KBMOr4Vb5iGDyITsOqMYMTCPCp510uyj4dw0xfNc3mvTjxUsv9Eh0OEhL5l89iuDJcz8VDAkCqT/XkpMOpO/iragP9Z2l28PSjGwr5lyKfo3XTeQvYUFlzrmdvORHPBhQii3E4jvSr6COzn6NyxNB9r0PiwXUbWB+z1abBc9bCTguSa+9R55rIQQLlIM49GFPqNzt9qWffD0d4c0GT5gJrK4dFVlj3FWAy+4vPfD0RNviPcfIFx4Bi7Hvz75mstYLDtWvyXYDtGwzDYoD9SIFpZSQ7goSmP7OZ9DWKL+hNH/IxDfaYDvpD6wwsWIN/Z3eoYWc++RRKSvBTGv6bQXE/1DzuUeTcmSIBUzFKi+EZT51oh7g1MAkIRXOx5eo1NjSSrKFw7tjQVEkNd/EHnDVgwqGG/w5lS6Y6PZaRI7vv/csp1hLkCc85vBJRblYOXViIyyyEAQKj0fTOyVB1M0o+kz55m7cxKHcnjPc5DA/Ok4eWEWEFqu7C5Z0ShHR4NW3D6zsL3oFGO2fAPsmx6Dq2e5X1iHby3sGmD9rGK7YSmEqfGg8eO6uOQvHXePD0b7IEcSkC/8vCnJX4kBgUQi7+bTZ6qgNCJoT9AAOeNQ4x51giVxif+LtMzPdaOHZSNm+amHeZ9WMmfv4qKd5WSYPUvnR72iP6O8YkXDwdppXHXUifaRtTX/qVvov3Nyjtus5dBHVMrT4r9YBdXK4jAfbrhCENWbDHSZdmncrKbpZshLMzNxFaOd2P+oS/G65rwJ7186xz2Q398CbeMiVl+3R+jEqxkx7N5bO9QgKZfLqCDyPmGOThEVJodUecfV/vpX53nTifKZuqotwQAzJYieAlmtLbnmQdvgn+LHIB6j07+dYU6DURmP6MkOBUjuUgtwyMYrPfxNkr1pUtKC4WJd3fBcEIxjTtOr73l0gUDDMvL7t5Ci9V5xj6kJ6inDnLvt8c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1365185e-29b2-4311-bf2e-08dafdb0a807 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:14:00.2903 (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: +DvkQRgyfrAeL/qjtlKaYY5rusVpkjY4vXStR4XOvESADGZjAAKaKCLPwWuiHUzvgZTws2ywg9+ub8fos5vPWY28hzi9+a09sU8dPN5XmsPLvQMOqw8FEE5nO4JOUPwx X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11127 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: Daniel Baluta , Linux-ALSA , Kai Vehmanen , Liam Girdwood , Peter Ujfalusi , Ranjani Sridharan , Pierre-Louis Bossart , Bard Liao , sound-open-firmware@alsa-project.org 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 Tue Jan 24 02:14:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113331 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 ABA00C25B50 for ; Tue, 24 Jan 2023 02:15:24 +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 8C574E92; Tue, 24 Jan 2023 03:14:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8C574E92 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526522; bh=yQepghdZrcvCm7h4uwL/PRBbPFACmaaDrTIVfJGtGow=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=JbrEKFYiFPuRpgKvkWG+Oe3TroxA3K5RAOEvMviQl716ge4R5uYrFDPll04COOnB/ mLs/9UmxgOw/qc+tr2Gj+gJrIDBdgmbC6hEKbR8Pe59VQjDGXz9m5F78NpiX0h0X2z qIe7B27qoIJe+fB6MHBKKIVieshEvcHFzf/SZt7k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 476C1F8030F; Tue, 24 Jan 2023 03:14:32 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B104EF8030F; Tue, 24 Jan 2023 03:14:30 +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 49AB8F801D5 for ; Tue, 24 Jan 2023 03:14:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 49AB8F801D5 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=PSovhrmj ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GGMFveCi8FIhtCHjbkqr76N4GBnecLxD1eLH2NvefO+DBfAHbjUjI6FIW3RzLkg/LmE7WdjwdMuwjg+Zwd71cqx3JOGBxseBCovR14xDjufXVF7Xh99EjXm9yXGWYRteXKbYHwuftVWmAkec5qsfMsP/A9wWE4rt2qN4Fk3Hsy7by6Q7Xt8OWm0kAa5mkGq5Q8iit2G9lNtiI0j/vWOyvAwgRp+Tm3pY+KdlaPgM+uC4CxKxBskYHCeoKfsEBOX9LXd4nT3D68dvSSAZ5PENhXJqQsj7WVrWdWnhI1adlqysJS+v80mrRyW6oN0SlGvR80rg/Z37lK/YIx7lrQATnw== 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=Syx73CVxQMekMyj3wGljzuJAnMzZDKKPL/hc0ZexnBXmmZgXdXv7wEhO3MzBZyBiNo1R/QEPxYgAtgrd0eJtTna2vUam/bTuYopihzM1nqpMsOoVySnwMyDiQYGkPYK9KErI91OQL2FmpVAx/IWkZ2172k1ExhAYh1U3r4MxkA5GgXAypIit4S3NdbJSL+4N3llxxvVVLiiXPqy9sQr0lqVVZuZ7TF/jintOzFe6gFWPE1rlzbwN6kVwvhVeH3qwP+WrGg2oid3McmEEXNWNETUCseXK0zg5BjyfLViDmc9TI7LU3F04YZ8rgTY+k5XY/uy/fcWhf4nBfZiztNGYbw== 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=PSovhrmjYUdWxj8+/99kcZYH4Ltly0SrlKErSrO3T63Xu8fUzjD6RofkOj79PDxiCFLw66SZrZXbn8jkuopUmYsoRO8cBHEQ7anURbOkUeE57m0ooopn+UgrPilFEJzXP3YWspmJawV4d6NiSmSjsOO90Z9EV8H6nR/et9WTRtY= 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 TYCPR01MB11127.jpnprd01.prod.outlook.com (2603:1096:400:362::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:14: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:14:23 +0000 Message-ID: <878rhsu1a8.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 18/25] ASoC: tegra: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:14:23 +0000 X-ClientProxiedBy: TYAPR01CA0124.jpnprd01.prod.outlook.com (2603:1096:404:2d::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_|TYCPR01MB11127:EE_ X-MS-Office365-Filtering-Correlation-Id: 57cefb59-acf1-437a-c141-08dafdb0b5fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GZJeWKvgTnS/Kul/gSTxiwC6YEz4FrJhIHQaTuA+52hs1VyRDCaTsP+dYbPJV0fAEXv9Ra/JAsFdtly8twhFnmsfwvD97U11w0UMvEG74TNZcaLjpf+KFb9wMRS9nLEDrsUt0/1FOUKWzSuHmXFK0beyxLiidQkVkr0VxnyNA8o2UfT1QgJySAYLXfrVesmxmydzSKTZ+zLAb0eo34QmehmU3uz6np1ujRlBxYpf6oP4apwPGeChdrSamanVLJNmmI6c7Be0kCTyovpdIKp2dQAXzo+qtsiO3pMKTXXOyJlTKn6wegGFrzLtWANtVleRMw8B+JeeTrw9LT3Zte1PH6z2Cau5MypkErY2eUtMzKn1+JAmz+w/Iv3KvoM3iVfAfF7Zrb/G2TYZxEiQSPVraCEIrwqzTwK/8lbUbPZcFA55hQqR3da3tOGlVW6nYLBXcVBl5Honw4ug8hdcKMO6mNgazPIG2eUr8wzK4ttzZq7DAAnH9kr5XIbpmEX2hMqF4/R6HrNNizGx8JcVStXXZ01b37Mp1uNeb/CcOnQfirtSgdFAvFtbNi+ji7zqQyIIzOQVUpTPF7xCW8Ctzkg3vFzLpZeIVGQBZvrrZD341rAvGVaaeJ4jEUDSHuNHgqxvZN6IKPhcAn5VICeD2Qo4Ya0jWkAhLLGLJdW5vsNBzt/uYHv41/yNFe/IYt7Reil7EqQzUShkoNVsJZ91/pbTkA== 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)(346002)(376002)(39860400002)(136003)(396003)(366004)(451199015)(8676002)(54906003)(316002)(86362001)(2906002)(36756003)(4326008)(5660300002)(66476007)(66946007)(66556008)(6916009)(41300700001)(478600001)(6506007)(83380400001)(6486002)(8936002)(38350700002)(52116002)(6512007)(38100700002)(2616005)(186003)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +mlPpD53nWfSbKUqmPh1TLa7PHhlJ6CJ8pkhaFt1ihzHi7FcgwI/PS0Tz94gA1xnlrY+7dPSUYY4unnzBGnVReJDKGNFDaFWwfk/zugXam88WXeRZ+RpKiweKkL/b0Eck/HW0X28FxYU3e0zqAd2tDwuPamavz81DZ3esy/PpuDmROZgqoxPfXp+QyjsYQb8EDWjVIfSxAhCbmGwJr3JGQ1AgVPT9I+Cx+NdWQ4ScFRpz599eV3xGCBC7bSzrK+pG4adgTPWErDM8ajY+3vXBfXcMGMnica7leFhEnU2clvF+9jRLjJwTKASiiKpYAVcETZXgPjGdwA86gCgwVYvOtNTEY7YyjUS5zgytcFFi726E0NxwJ3v5CFz04X1zRbxFBSzWdmoBCIn0FdEUAnGLiHohxHv6Xcdaf5J8EaP+jIfHYgE2gVDxLrzT9sYRkIgHLw1U90378klI8/Tek6EwcqXF+dqh+qsu249RLamnrJjWfYDYaNPWZ3+Z2kkTR52XDpjYboxsgclhNSTQt5pgXHYRJ1ugeGGLuxIua1sKuCPdrMMd7N8ICna2odKPZELbML5WIK0JWZSc+mMFs33KVZ1DAgm8EIJ09xmNFl6pUDqtfDTIueW5xfW0FrlbKlfYoFUppRizC9cvSAbvK/tDoYehO34QHMP/xjAV1nkQtKKEZSyeM0IrGtCj5p2SkYxF0Jv1vJLQAIwZ+pNccBRL0gbj4nn1TV2kp2xKp2LbMELetl9DpAR2jPBTuPQKgO3yTXtH98tDT6mNKBc9ENqFZu7pzxJCLj0LcbkYckxUqZSp6ZuTPRWvIaqetjKOtCEHDuyo798tSMGoMKIZZz3mGgIYhUhplJTHLv7Hwl3SkvMU1PNf2BOXHJOfvZA+mKnDcKzJW1pB/air7AapvKE1Xvy9zae3zEwjIfgYpZxnfqr2ZBpmWJKofJ+WdNsfZyTiJr0MYeO8wmtC83XAAMuWFX9yxEgVt5SDUJ93VeK1SxT5QwX9oF7Z8SlxCDkIAc42+2ifQvoyDXdihF3wTo81YPHocAxUeJEPr+vcUCvnY8dNbJSObpCTNrwLjYGnaJPtZDT6RHjUVBL4I6OcOcuM7xvH0wCeaxZZPxhaBz2WY4nVZHz76auH1k0n1ntDRcj15k7ajQX2Cl16VW79V9if8pzP/LVUQZhyIAuHQbSvUZ+4LHhZnLFqt7hFhYjXGt+V4VTNhujFj5zF2ViBmRD0egNgEoj2Wtf5bfez51UGdE/g3/GiYqrNPhlrMu5niJgVx9Rupk8wBio4BL6LFJEgLgMO4NqSUYziiqKbSMB4VyXN6IOYYIMMqmOg7uwA1+4CGlCHeTn0popuJgEsH1eHg0vExT6sPUtgCi+Heokcmy0wjPDSonQeF7rVCR67PODesRnJaRDOwnrKGHD4Qp9MoOWbisz2C+KPbkt0T6rdVDIgNtEh92YHTSRMnEL8/peg1HqDiuBptTAeHJTyi4Sd8F0EfigAG7c1g3jADoEpyd/wv1Z86r2uo0718YrlAt5mW33d6iJL2mLLcA08W/VgMYHzCI/nmuIyDSasnD/aYXlMQH7fiFebVCHYLqbippWkBXm7hIjjvWbZB7G3Xj7oChk4PyXJ7fTJR8Ai5xEYjg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57cefb59-acf1-437a-c141-08dafdb0b5fb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:14:23.7155 (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: 5iLFFa3OuN/LILIgw9L4PdAa8ZIk5d9QBxE+efW0deStSSbo4dZgP552HAxX1uRDJth+jsNW+J1WzPuW5tWS1lLxGvMbc10u3N6TrTbqco+UStkjENtFbZfeL6evr1FG X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11127 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 , Jonathan Hunter , Thierry Reding , linux-tegra@vger.kernel.org, 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 Tue Jan 24 02:15:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113332 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 324B7C05027 for ; Tue, 24 Jan 2023 02:16:29 +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 9C69CE86; Tue, 24 Jan 2023 03:15:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9C69CE86 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526586; bh=hZ4qmIsNr1IYsGbCqfC71T9AvkAFMeaLktbP8HlCfzk=; h=From:To:In-Reply-To:References:Subject:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=cmmaDQvRoUzd79PXNBBq2N9foFWX9swJUHzewd1eULtLuVXSHe8H6rHQiGeejwRBc RocQkYInRRIbWEh7tQCNAlI+A9ZY9W/+i9/ZrWb64V2GTVA6Q1Bluqppd6/7Di9zdo xZicwoag0E558y8N3SMWFiRmKhD4RBuAiWMCxJas= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 53EBFF8025D; Tue, 24 Jan 2023 03:15:36 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9699EF8027D; Tue, 24 Jan 2023 03:15:35 +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 02D5EF80163 for ; Tue, 24 Jan 2023 03:15:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 02D5EF80163 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=fYp5VZpo ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KTY8oHeuH14Lofi6cc9Zln7uMX0v2ER+eH9XWcHG6idoWOBfuQ20/QzOv3bVaWc7mbQYSSxsc6B/0UAzHRplw9Fup+0oB/sUDQRCrKcnxGi2wFLOYOeEjrJaNipb15GciMsIcL16wJmRP8GYsJoA8qCVxcWB2k6+bkpVnbH6opRJ67PGCGX1T05y/HyqJLVH5F/A8JFynAzFNZws4wzhsq+STu+6okU4lAP3dyEegAmdtO0rdGS6xToOnExBrYpAtHraTl0fGK3lYU3MTLrt3/jSRPEmNDkjixLKUcsfPEeKC3Fvxw0HFhHjcXAaADq74OodNLkvnEWCNOx6DPv8hg== 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=IwcZK+egA2r2Vp+cR+eIj7fM2zCDyjGFiMNfDKu6JG/GAZLicFn6L8CaJCiSI6tW9CdR+zvzmjScDkLM12qyQO7rEsTyjy66lEmGEnEiFcvf4DFHjjeepTZ0KOlPLx+U/cUFnWrF64tXGg4bPxQXUiPtNjiyyOB4+gI9sORzO5bvMU9u2XjktrJ7vgLRg5CAcahGDd1H3mAKsBbVGcoYenw4DtY3fv4JdanHAFzv+c/vWcxLqPQWVFjHZJ5FRxj5ekk30B6uk/IMghGS8uNNxwUFsr6Rz67Y0J9SeOhBiJVk7g/7LLwpKSLnmOoJdmqUaeD6saDXqklVmfsrVjUNjw== 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=fYp5VZpoGnzItAFkcyyTjQCYllzEwJKOAeOl2gQSa9FYmHjUWbih2XCfP9EXhJmRoWyVe9zkop29an6rwpSeNahKRtjzrDtwgnZdVhzCTgAXQ8dHw8p0jAMXP12Rrht1xnEEP8dwUVVxaq3E7V6kMa+BRZ+olcXTJqNodSzNLAA= 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 TYBPR01MB5391.jpnprd01.prod.outlook.com (2603:1096:404:8021::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:15: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:15:27 +0000 Message-ID: <877cxcu18p.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown In-Reply-To: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2 19/25] ASoC: ti: use helper function User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 Date: Tue, 24 Jan 2023 02:15:25 +0000 X-ClientProxiedBy: ME3PR01CA0053.ausprd01.prod.outlook.com (2603:10c6:220:f7::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_|TYBPR01MB5391:EE_ X-MS-Office365-Filtering-Correlation-Id: e83202b0-5d90-4902-6dbb-08dafdb0dbd7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5cFIYEnbRVAJ/TW4xvRKlAywG71pEp/7XjLa2EW2+5cNBUmzlcV8+1t0oLVXE9rdQq7PUwtwGUBPXERkCO7H7L7uWfhWyDuJZJBYe8XVzufZeKMb0FJs9Rt1DurbthzoBjiDpc5bF/3JvLX2i8NQEDzkSoJqIaeMfU1vcegF+uFKq3ca2IUrRk2iQfNH42SYMxtQg1nLUvdK0arNKdYF+fHcN7D8fOT8t4vH2qXQiVC/M9gh+bVnPutYNDJkKcLIGq6qs4WWDWyTqKJz48/x2LXaiqnRhejEm2QOlK2VqOz51qcjYoRxXXfUU0ygYsJiUMYErxrRiP3c+YUU3S9dz5Hp+9o+ygSkd0ZKZsQwl+0SjWWY/LgHzA4AMD6kCn+WYv3u9R8pd2q0OCeSyefODyhRVSIKhug29HrQvsyxnBwp8EYkpNIkKUjARccF7deH5XKib66RHSS78XAc9+/ffbBlsXYTU2GnLhbs8A+1VMNCZhfwZDBMfOiLtPdTPc4vMdISA7mwosQhC5mMsVn53UvdzKASmdS7Wz8y2B4Q3M6IVdfPy+rW/1XbaBs7KtOLFhSn/0RixIQy1BjMI0FteCydPdBg+dCY715LWatxU8pXFNPBx5xqtkBUCbDlPqqT2Ly3L6Ub/Y9R80j44C9JwJFsWYXtEX4emZBCsFnKzktjpuoveXue5SP62xr8nJvggl3/ZR0Z2tDJn01/51anTg== 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)(346002)(39860400002)(366004)(136003)(396003)(376002)(451199015)(36756003)(86362001)(2906002)(38350700002)(38100700002)(5660300002)(8936002)(83380400001)(4326008)(41300700001)(66476007)(6486002)(478600001)(52116002)(6512007)(6916009)(8676002)(186003)(26005)(6506007)(2616005)(316002)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yADhYTueNWT0mNAe+7y7slpwyurMl5cvG5pZuhf7BYuO8kOILuls/tt0nnmuKE01HS2zIbs8EdHtuza9JHMr3HLN+VMDJ4Srq5XfeqDwI6tiXTzFleXXz6MaCt/2Zx8OqJeYuieb9VUlESr88y3AUP7yntjh39teXATNFJRa4Oam7oyFD3D7upUDRl2HcVL6tXprZoTA4pcat7jtdj94IK31R7cnEYeh4P/ruXjD+LOGYKhQP2xs0rrhRQKSxDhw06go7V+HOa1Q4UZewQG2ItlCx7yBwusBmSDMHJVzVj6Ca8uzA98VZx1Se/otiERXtzrfit0q3iZcKUlBp3E/c+1DK6f3IZxX4E0UTaFpxFuGTfcXQK/f/WHRFRS6vnTct2UuEWNAIBekKfD+4KUEnFVmfNzCZ7Xut6U8LlH6Du0LnbkP5UxDu33yuBU7cy4LH+IQ5DNUsk1zW5Gnf8W4rrOepFnbXmhl4Xfe8jdoQhcoW3jQ+0RJnonCl+P0V/KE5i5WKcjI/gyFkn6dr9xpCh4EvT5QxlQwL58zUBLZ9h+8H2xwvhA6iFTOoD1KZTrxKvMMnt692Q/ax49N9TXb0tWpl+00hYd03H1OJCDOgOfvnjlmWJsRJCfgimt1GcR8UUY++X2FViBYvxagCzQKnwdIyTKn7AFWO4jJY25CJth+7f9i6wuwJ2unaxSJ+/f3Q950fPaFzB1LkwmduBE5UCdlAM11BVKVPVW8vHtf3RwZbZ6t7Z5FMDv1/MrEqGAOIC8IgDsjnao+7Cbm7AsN7YR2OrxehNG7HnMsN9uro8qlmuZvZqhnTLMDrHoExorL3JVAqItw5esJ+3pNoBGrHxdFNOZb0NdiW645eg0ib6tIIjMiki7egcvqDOwf8NKMLhRw3hUM1CuQm8v02TZEhRbzTJ3BPimIPDR+qNNyL13mHY1lmML7El9pg+vDaFJFRdAfRAa0B0N8AwqFmT7GEWgYieWlhbvZDSlbZPLzwLeUAw2GQGZALzOG33Ux25jEBIquxsG30IMAkmgmQHHSo3kF+Jtws/ALONV42WfxXrFj6FNbFSF0f+DZCAz0grhlmY92vxV0DlhPPo8vO8ldTquiE+TU4tWiFOPmekTIT9bKvgAVrud8HFBhFKDWaFjaaPypfXb66ohTSVAQCyyLvnqqsOIP06s3X69QO/Hc+nLWZkxM0JChGGBPA15iKUy2b9JS2giziaf1bCQ/4KqEcMre3pNJn+qKCRM97JiiIkBbnHG+1smeZprm0qs1s3DwiLZKPUAekZuoiZ6VLRvSCOA5+NrydDfopteQEeT6huYOrCCJxG8LNbggwMuf8nRQDq17gkXseoLDh+wqNrswxGbuP+grslY9TH7C1lXtHGTBBPeOTx8G0/TcJUBS5n869gQne34Tz0CAsn7crG2gUr27PvZhhDwb+2FIlGO5YqDAGH8cRiAVjGiHJyhXbUF5XdWWGOkgw+EcanTTOl+u6aZ2U5EfaiIRGMO0wvC4JV50irImF4fKNcmQaGvf93lP4bfasPCirr6N+3udjMMkLaeVYj96Xd3tlqh2Mf8Tnmdsuz0vBi/r6RO3B+kGj2CF0iekAOe6nd34WhRDgV82UZ+9HG8iySjkz39P5Gk0wz0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e83202b0-5d90-4902-6dbb-08dafdb0dbd7 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:15:27.2946 (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: nBIX0x1JdWcZZ/DfUDy4NhqskWsqkrADTFYu1AYr7Sok/jWAwaEMq/hjUD0F9EUv+lzFClxJZKGsJiRbYMQFp7URW7jNTY5IhoBqAaBhnZTfzV5jofvb40Wg0pJrd5x5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYBPR01MB5391 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: alsa-devel@alsa-project.org, Peter Ujfalusi 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 Tue Jan 24 02:15:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113333 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 88E1AC05027 for ; Tue, 24 Jan 2023 02:16: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 09A9CE8F; Tue, 24 Jan 2023 03:16:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 09A9CE8F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526612; bh=NgI+iqiNiU+Ubc6bXhDmiBoCwFO9hDTzrUjWABDyKAU=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=XDARqjqU9Ouv8wgTgEClcbXpSJVErbEvMb7Yc+vozI/G14GfudSNiehaboRWF7M5q aSzNbyUnzgalNR4kRY3XrBlCstnlB5oxfe/9MHtkAQ3sjetOEslOU5LO7YylVNYe23 +PW2FVBdpl0N8hO+s12DP5C8guXy77BPdY4nM7rM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 0D0F5F8030F; Tue, 24 Jan 2023 03:15:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 72FA8F803DC; Tue, 24 Jan 2023 03:15:46 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2110.outbound.protection.outlook.com [40.107.114.110]) (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 62E22F801D5 for ; Tue, 24 Jan 2023 03:15:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 62E22F801D5 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=T2hjwQEH ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EGE40ZLFL5kRhCIWLQ4xVUqMhjjWDhRCFxM0JIpZgaDOJkXPFb/vWXLN6T5Sxol5lLvLj1Xn0qrooKbWLVbrc5teweCIaY4jiAjW5Wc+VxRBICCvkbZ+Zenc8FmnjfLIVjQsseeBs5wvY71OdgJZvb+bLpZuoc3IInWH9Vg2RVDPal6EAOP29+whAgnDo+MzYK/GYrVPYhchvx+SYdxYzbKCFqKrOGxY4/a+zobb8jAqRCnbsouWRRdoIVLijH/Fc6TRgSG0kmLXcaRCerhGtqhXIGBgw8Urk3MDi7Mc+tDUIZItSb7GcyWpJ0MHuz+OHEZDvNhFtWWWtu3zfLX+FQ== 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=h52yfGmX289l85qsipnJHVZlnNYu7OlW2JlZeBfgM6M=; b=mzmiIaettevyH2iMk4Yx/Hv2myDnHKvGejlr31SaJe6A3pn23rs8ZxogEj21VS4z+BW7NhfnXlDK+DgbQvmr+N/dzWYI7Z3J+b2XcFlMPoM2OLBitKB2Ls6KzWln4DPCBVMLlKlCxa2Ju0IuFpXIE++B5yeYm/ytisVzoUhAsTXBZfL4EXL/8YTMiRwgG4c/Ues99F80lpc0m5ub4IHPNVOYXpiP/inD/MopTZqbSFGvkqbsksRhBmz3LAVUI3zyjRqCq+azMr6tPKcLQghQDJC0z7/E2NbwdyhL28/eNqNxpZnwzdhF6lIgG/DidDiwiylMCwGEvNqrpjUqukgiCg== 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=h52yfGmX289l85qsipnJHVZlnNYu7OlW2JlZeBfgM6M=; b=T2hjwQEH20/Lrc2/yg1EaTZ0mv3muRkllZYKJpoDfCNs5YqKdB9MT3ppNLxSesSVv87yDy3WbojnNeu57BZg+VSCEmVvyC6BAH4xM0RgDU/bWavdNABotFmQU9Yu0PsxdYGiji0NWjMV3bKP3LhhSjJOGUmfLC0wuYHSgL5Vv8I= 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 OS3PR01MB8812.jpnprd01.prod.outlook.com (2603:1096:604:17d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:15:39 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:15:38 +0000 Message-ID: <875ycwu186.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:15:38 +0000 X-ClientProxiedBy: TYCP301CA0016.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::17) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8812:EE_ X-MS-Office365-Filtering-Correlation-Id: 95a8f81d-862e-4f57-7bdd-08dafdb0e274 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lE828BK/T4pToYwJEotKwxwMD0etdmlZipjbR9AOuxRwXxfaFol1MfalEKpS54zAKKqpQtm2CZRHhqKx2c3ziig70868LJJZsHxwBW4m98btX1ziiUIC0HVM/56Bs0iJ5+pmMvcwcLIXmHNUAz+XufI8VhZ8STIdibcgw8oNbaBEStJDxbnEaX6L5MVJqGrApL5X1kyH5/UVEsO+nPRRdudn75JYG2SFcHX4d6riYWahfIFDkEpWISblejfDbLipAe1/YK/b2So3eL3wIdGJXkq96C5srzkNg0sb+nwZbHOsmVk4eKOhAam6E4rkqm54Or4VjG89E2J/NyhbiYO+MK2kAKPWzd9TC19hC7X58bpvHSLunGpq6Qd1ufDvkF2/e9uu/cPLGE9QEs8yEeWOmdUapymAB0EmGDlQzjAKLWvqoq6BfL4Bk9FKf0FJHVDOgAfJ9SxqHcO43/iyRhdiZcFQJTDjjAWtJIM4F1rTqs2nvElsoNbZ/7th70+pQnMO8uRouk6pdUhS760b6YwxjW5Bwl2QONZl4s0JtXXx3BMuBRHJ/MpMUpHmZYuEH7Dt7uonVi7SA0Z3b+iDC6GaNCkwwICe6yI/23rl90Ib12iXYVEeLIt2FDefgpf3GDyEKYS+7lI6wGBdzZhn//ZUMaAq+fWCPm7rxutvkxcDwluP4PLxb+5kMqiGiLSANqbeG2IGC2W1ZJOI3xVlC+PlDg== 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)(39860400002)(366004)(376002)(136003)(346002)(451199015)(38350700002)(38100700002)(83380400001)(41300700001)(86362001)(2906002)(8936002)(5660300002)(4326008)(26005)(6512007)(6916009)(6506007)(8676002)(186003)(66556008)(66476007)(316002)(2616005)(66946007)(478600001)(52116002)(6486002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GItCdOXYy9/zXMeN/3ghFsqjtV7mtz/1wV0l4TZ2VCmQ+3WjTdHYEp5iCxkCLqW3i7wzWhG1GV4oYeu/cyfrtiLUjh7KvTBS3IWZefiQKxXteLDRIDNarPDm3Kqzhx5q9hm8oowf2VY7K4MKl/HLvVoOotUo5M2d+nEwe7REc5/m9HRfka2qqLm31HaRmeW5uh/4yprFq76EW1xwfZkyF0jvkyfmzsmtP9n3npMU+tqos5bHHrVhRwM6HC80qwCCgBHtqpoez6R4C/78QHpW6o+wDqNsVjzRiNCLnLtsDDHgKAfZf7/UJo5HAtfdTS++XyxUDCeC2jfg4f0zsWAkjr9NQjgXf4kEzC/bNeQLLiDjO8yrzCQ629pSS5/0vVCfMsz+QKMl5xmQbgdpb3zb7U/LsxLaXzS7lQRANXCt7SOYpscW0NfnKn+oQCPEB+VksJvZgnU+7Q6nEOx264kpJpglaPMAHDPh6fZC5+jaTtRfg/qs3kUiLhXlnI4KGiVBtI2l5IhqYDfjU04R90QBms9vBe59scehwoTKbWcJYgFeI8qXjCUKWHsVpkdGe2kNJFWY5cCwYITz8Ajy1yZlnTNa1j65NkoJIO1EgurXuzOaGZMOU+9+usfVeyLI4T0iu49ZCpy4yzp9ogmvyGakJDBJ3M7n3dczgzq8rhIBA92AyzdlEM1tF9abDXmfzfcZ70dIPMr+YU8i5na9WElTybD4QsPD3UiseAVJoqckSUVWFtm6UuIqGA+AS8MId4iDAmpUQmUs8JRzVCyFtKACr0TvrsZ1v6elIMDu9pDW+Vudzu58gJ0YtVgf5BPsxnleLOHc1tqIbNcRfJdP7JJ7Xa+bh6QmXvi/r6EcGuGAjgkigIfF++SQ1FDNTtteJGlBZeed6TFTd50xdXnQ6kGvZnNuZTn210iwhSpNukqa+MSXmHU5i1lxvU+22Svb/y/MjwtX5OFD4TTHLky2Sg0rFulzKJmIRxiL9pqQCf8EDHA8tBYegkO+qNofTWIRuuKk26KPvVa+DzqNkgmnO+Oykjove2sw3ZWi9ZcFDoM6WjdHaQCpU7Sbcq68pl+xS2xqAP464rctO+nCmUzVyLDriwhSgOtfpEHLFGwiihB2Z+d40k07k41RaZcJUpWSO8K5LBmq2rZkWgBfDLuJK1HHT3IZB1PF02pyJMM8Zb6zAC68whCxQKmM96g4KF3xIP5Y+t2fjKYGTtcvA+iwmIg9//lHUaKGswNy+4EKJNAZI4u/YgbhhqP1bzu6aBpxBeb7hJwvXydX5EAMW9qdCxAhGeaT/nxfWEzGyywcuX9gJ4wYWJCt/OqSQmfGY2nZQJW7lvEw+GAZ3RCmFtwlTM0TNvZv8r7ZeFDdO8u2xr3BKL2YCYguSfD6Exk/6olEjkPQO+5ij/IRuhgbDHlWKIejDshveZjYI8aBOhaFNrEuvTx8mKIi8d4yyhw1KJ1ugSa443wac3/jnul3AD0Fkvr5U8ZTrywTct3JbxZG9MxmG399Tw6vbBvD0xvgF8dMWPAq7zzONbtFZlofddwKrLW5cQiD5ous2Adi5XiPI/0c6NUO8NlOERJED5eV+YyL8fBhU+ySh5hMO6kXIWmEgotVBTtGgFlsO1jgOE1Wm1rdBus= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95a8f81d-862e-4f57-7bdd-08dafdb0e274 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:15:38.2796 (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: 1zgwpj9/eXVs14JH/Y+i6XtE2LAXlW0hnsym8t/MTeXmWpPtfvQUaVd/3dMZpPRqRQpUsE4BEvFBjyC8MrQk4Bwy//yCHT8eWpRQXdVTWfH0yR4z+yPaUBdqzIziJXAl X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8812 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: Linux-ALSA 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 Tue Jan 24 02:15: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: 13113334 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 2430CC05027 for ; Tue, 24 Jan 2023 02:17:20 +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 CD45FE98; Tue, 24 Jan 2023 03:16:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CD45FE98 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526637; bh=K5+vsxcXyCenEqEs4g7LZmiHRlvK1brdSaJcFKmIDrM=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=mHYVSf7KhyP3Zo4BYWipD0j/6z/uDJeSie0zaH9NJkwf8FPCkkLW0erZs2lP4G0Le kfVKPw/MKjxAmoHN2X7+d/LlmbzcAmhVKlo6Zb50mKqG2jAGUDhXL4rTLhKNHPa3Dy iE+PjvFvliy9nxNk2iVpTZPZmje+i6L553rNsY3Y= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9FD45F80533; Tue, 24 Jan 2023 03:16:00 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7B1C6F8053D; Tue, 24 Jan 2023 03:15:59 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2126.outbound.protection.outlook.com [40.107.113.126]) (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 4E850F80515 for ; Tue, 24 Jan 2023 03:15:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4E850F80515 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=PimZVjfC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IdhRfezU+Ko/0OUblw1nJfYKkjG5Wmn5htu2d9p+ZtDzyJnvK5j+hmaRGe6kxvmhe6MKWr54nBZw/vIkH0aZ0+Eh1hP8cbvlgJvifEIgkH7EGJWSegnriqOzz+cW6l0HugmHnxAQVj6CGKA+SmWeMEDkLeclxLnQz3M69TwyCEuu7fg9eocuGQNiFOyRoLVI78P20YK9AYRBnieu/U2WMQmmQwMevY2u+cUHoSuqsPRn7gSD7PEeSgVTqo0hKmMOY7pcCJ1ysdcpkA1nzvbIhGpRdc5QXHIiwKPcjXGj8XpqWAzjD14gqrmqYpFI+tZ49ChUGamo+0l7WLEszSG6Gw== 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=uGc0opdrznm0DhXnWEbsMnR6kkYw9ItwtlVP/5rn9r0=; b=X8mqd9S5swXEoZjfAYeVWwtLf1FkQi+WyZec5HBmnZfPZLBOd/EIpJHWcLdLE9WiZuHXM/TAS77ABVJHWMRL+XUp/UcKKsZ+6Blh4MHUld27SmOQ4ChAWrkoM+xqosYfqml/Dq+T85LAk3gewrMgFALzhMypgKojjXtgox3Wi/9zrK9/+DQkrhKKyV+EDY2DQKWr4oVcJ1jxOT+VrvwVhOvVhehLH5l0YV6aPWy+URFUmRIAF0kzTJRYNTIuk4d3nVFiD6D4F086pBNwo5dXpXe+SE1BBNtFVc6p5Yf4FPf976VqpU8edk/XIE9Y6seDJVYMI0gHkXJdh7iZa2pY4A== 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=uGc0opdrznm0DhXnWEbsMnR6kkYw9ItwtlVP/5rn9r0=; b=PimZVjfCg/ud/HCpcCAMlbR2oMOsC0gJ5Wh5Ldixo8XdkTm+mNnPYzH7N6INPX0XCLR472kFTOZAw/F8FJWvoUCifXJ6Uy+v78nwNs7jol+bhWs938yCZedmujJTAD4g8tzMaJbOl4lEL6J6Tq3wHEQB3zSEEuKvEX6JLXpKMog= 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 OS3PR01MB8812.jpnprd01.prod.outlook.com (2603:1096:604:17d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:15:51 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:15:51 +0000 Message-ID: <874jsgu17t.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:15:51 +0000 X-ClientProxiedBy: TYAPR01CA0066.jpnprd01.prod.outlook.com (2603:1096:404:2b::30) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8812:EE_ X-MS-Office365-Filtering-Correlation-Id: b574ee2c-e474-4ee5-c33b-08dafdb0ea45 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X8LdPpXTtxDkusAyZKq0BtISMYFfyYkb7+PTx0bxiuSqqx0iFsN2gJSN9/ggKWiTVU3cGKCWBMcHoRu4vA/YIM7BGQ0Mf78A1e5VdDUNYG1zRsIEcNem2EMQjgvHJ9KlWAr9K0XvQxsZHnTfyTcfHt/4/Cml0euSHCRHkyWBmJR47CalTT06WeF2fBLatchxLD8xp6jGdNoK7WQGP2t4jA6K7kol0qpod51pavfmOGxmRZvTfI3XW8MTkYQ97owTjBfce6rNPiFxDWRZFS0B7eTa7z69i0x2HYqelOFUtAh8HCzNzAGobTnkm4o0Q0HJI/pNidX4+s7LewIRjFRyuj3x6x9EXKVztv8EfjvHRMiaQOAdoScHXSfgKjQsdHl5sveE2es6ZO7Zyt3NdPlfFOj75DXITlhhApXFJTF6cRUqlAit1qgKLYZwO5KX7plDaeGdPVZcJ3aEpzCoMtok5clu8H2G74+QyamD7rB1KelQA2TY3WU7ELUlUd9WLnLDym7NDDAnPmshX5fxEb3uj98oSMbaaMm2CKaJwU9xOopaTt4gvaTwii+W1TU7XAYqlOypZXqIFqcH2ar8gtZ4pB0qKYrfr9pkgneiU/jYZd6QpzYkwLrLORpOWvmkqsA1cJxNEGvdmi2vm3MuqDszqBXtGnBu+pzU9+DyF7CNzw+VLzfTYeYOgqpwm1yu8lOJ7/clNcoVWEijoFplGwqh1Q== 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)(39860400002)(366004)(376002)(136003)(346002)(451199015)(38350700002)(38100700002)(83380400001)(41300700001)(86362001)(2906002)(8936002)(5660300002)(4326008)(26005)(6512007)(6916009)(6506007)(8676002)(186003)(66556008)(66476007)(316002)(2616005)(66946007)(478600001)(52116002)(6486002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2zBOuOrSaZrh29i64tqaOyired0WlFiDSI4XctpR/1Ju74+00+MX63w7on0BUsIEAYz754ZBtn70hjKFjn4RbmGY3yo8p7C7VeI4SEYuZon/j41BGFjkbAEZOF48rGaAO2qRh/FgbPUhjQYHpEYNQS1d+eALFdAz8+DrZTFf+O5I1isHMDVcoILuhfwaAynxJCWk1SGc04mWbxyLI1l+gHwEYiPs9R5tP7A4J+hPlYeoX2ToP7/k2ZoxiHL3xlATL2Zvxu8e0JgN4aXCTBV8ayM5h6clZOHnwYNpK8xRoDsGU2NgUimziEdAMjT9KrJL82wHjX7pWC1fe7SDRxUtuZicsuT+t4CfVZzKbVyHnmcD2cLTXxioARpRGtXCTJc+lHr82cLBYgsOrnbdMtvhR18Ty4o4yVIbSxPK1t1Ceszw6/hk9oxlfimk80o35ECaXrVWUNCd4+8KXSR7ZJcsDR/vf8TmrUwDfRHgNl2vXzGwiqEm64Yky/55V0CuFjhyUC8uC0ncY9K4aZfRZIpqDwtvUtJV3SFn1dCNRxYk+Q7oefPknOi1onXbuJ0+PZXybCWpfhom1Oy7C8emmTynsXGKUgwuBVVwGjpUomQp615JdbxU0FO8gmVxJHDYIUQT3eIXfD3IT2+8c6Rygr02FRmUqfoce1cMt73uGHqf8DgJx9QtFRy8O4RhNH9fFcUf7/FI69MFpXTfvJABYDu9r86mmUu85GfCKjsEKkOPIQzx20W2gIW5uD3wOL119PRP1dOCU/NkR0rBuKdIlmgOFJnSqtpLnSLw/K860on53ni+TKZkpbH5+GrHKv9422dkJu8146MaBxZP5pqPkr2Wn5tU67Kio2b49IRoxwbjoGzLuHrQqu7so9dVLTWeikQr1e10XRoCi9YKLtDq6aaRvbpxXs+0zRAbHFZ1GfrVFxM1ew+81E3UnpQj5X7I7+OjKq4R8LFuYisUIPZWDj0rcjuQKrATx+LtCv9dpue9LPjaTWGnwWHVh9rOIkw++oZR4ajAB2PBLPO0fLJ9CW9IKZVtrs2xxsmCQ6NXCABMPM+u+DeA1AsMYjHYX1e/5Tl1aStF7r6de3x1GRGS8Nk0bmui5qOoA8MiPq3SU3baLC8o6wiVhFHEcQUvkNhmrtQI4BsnCK72mRpj+lykw1WU8D0O4cQW73+tQs6GK3bD0kNj4sHiOtKG77OfJeZ774wkpPs1hOCPfX8kyf3T4Zj/++sljK1CuW6FXHszFFBTG196eAzgsVf4Ro/WoJ1r0mfBY8LKpdpoHrYSm73s7ZV5jbKqyuNtBADbpjNhBUMeqCCMKu6Z0r3Y4yQHDm0iOpZTRsGw6C9AQ5KwKq7x73QNmFf74dUsy+eGno++OfUXKkwgqAZ+sH7ESeDmjujgtept2sg6c21Z/eTjS8U8a5ExGF7Qbwl4/wmHrkwfws19e64D/3kptbtUp/Nq6CvY3VkK9PIjSfJfHilFY7GQpVEWqIe8XUar9zeQR4/YZkh5gc4nI8X3i4vQt7mpS3bdlIz2HEnKbGUkQoSoZgyneYTTaE51KgllkIVB0u+1xr+nHq/aeXBK7fMbuYTCNyMGL9cRBieoo77dDbIpIo1x9SuL3hihS78zIenVi/Bsst41MjI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b574ee2c-e474-4ee5-c33b-08dafdb0ea45 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:15:51.3652 (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: KyA8DQpxcrtDvXdEE5x+UvENNO2uapozwrtvooa1tPhVu1hu0wCc2vLkNYJnlmqkWFvy5WWE3VK6arB6OvXZnHw3xTov8VEmxgOmC3lHVX5tb1YFn+7nA1ZTVtDDuWMp X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8812 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: Linux-ALSA 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 Tue Jan 24 02:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13113335 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 24CCFC25B50 for ; Tue, 24 Jan 2023 02:17:42 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0E88AE12; Tue, 24 Jan 2023 03:16:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0E88AE12 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526660; bh=V9MyIvBqwhh3wC6FnuWmuMBkgR/X+50sHhrQwyt0920=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=oXzL6sDUFr4kaVW0QhSZ2RdP8Bo1DOUIAbsOGg3u1509Ki0boYPFW4MCoxKnmjUlL hG5PAgDPD1IPRAd1nc0wnIQQCeKmD0p7TK7fQgqQG6tcjnIbylqCU9Ob8d8SeZQ33+ oR5g1ZXyPoOi2EXhZandn95vOnozGS4p6qqLXVg0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BBE99F8027D; Tue, 24 Jan 2023 03:16:49 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 747F6F802DF; Tue, 24 Jan 2023 03:16:48 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2094.outbound.protection.outlook.com [40.107.114.94]) (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 B41A4F8025D for ; Tue, 24 Jan 2023 03:16:46 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B41A4F8025D 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=IluOpBH6 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DbTJrD/wCc7S3/BlUTMTC+WTfJvFavFhA6fh8ZlVF+8LY/TykZv7CybwkJTZ6YFCj6vyFxosXfX4fC7NFFs6CqYdIb9ujDzGY1Qhw1zCv9X6jpDA2C/7gG8PMpQXcjQ3DmjEdquvjEyrHGgmWFCQc9XVHn1pIPAUkCMbILdGr8rMSHuhWo16+8NIQyPdu5VI065JmynIaYZ9cmCYuqX62e/aUXASfP2C6AAJ4si4Lza5ssrDESdfmilpk+cPpgemKI5NLpuA7hDEzcOo+8XGa4sAUSi7vcwx6XQM+KWTnNDZYE2U+G5TIvDpyWXz5giwiMsLtoxecaZuhV8rsh5e+g== 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=3NpJXLWtAquJhLJ1CHPFLqOu6Y6ajmRFdc+Sl3HYRQg=; b=V5twQRNHZuv9TqoPsz8StMWjsWEgoZHM/CDUO6IYosJJ9yr0voNo/PXtE7Mto2/9QbQ8lQndB/vdUoQtGb4zYCjrYLmHdA48a4+50OBtAuQYlN3RZeOyf6RN2jRAWQGDAonmbVEHWF4v3znjQpu2YInrimBMItG03UZjfg4mIwJoTfSH1wYeNQOBSymLuKs+4Bk/j2lQ+5ZXEs78WY7fSZIbKaGTcRSkWIeURSuw06iP+9qJ/ccE24215COBs7tBLDRCimJwXkND2h+NRngyk+rV1jx4fV1q9U806bB3T98KKw+ROj7zdi8gdkzWhKUTiBlZRpknaTSgVNE/IKV5BA== 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=3NpJXLWtAquJhLJ1CHPFLqOu6Y6ajmRFdc+Sl3HYRQg=; b=IluOpBH6x1mAzPj4G/r3ocsvdUFUTtwBwpuKHjXQzzUxrFMJElDq8FZ51d1U08P82ZsbSTvN6RupnDJU4bdZvU1dA5g9tSgTpd1PjH9qPWQKJ1An3/UVs6k23M2Ao+Sx5yvtTC1NrWlYaE0U61AR+OxlhfgQo/B6mY7o2t+Pi28= 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 OS3PR01MB8812.jpnprd01.prod.outlook.com (2603:1096:604:17d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:16:42 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3cd7:a7b5:ea86:9ae%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:16:42 +0000 Message-ID: <873580u16e.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:16:41 +0000 X-ClientProxiedBy: TYAPR01CA0055.jpnprd01.prod.outlook.com (2603:1096:404:2b::19) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8812:EE_ X-MS-Office365-Filtering-Correlation-Id: e599de87-1304-4299-29e3-08dafdb10857 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sBm0AgVUz4NruQ9FqoQVULiXWflhT939ACMmBi7rTbOJVhQuALMG5z5Z/pXmG8ezJ11FudLWfXb8VfmUjS92AidguLFLxElztWN54+M+cl58rs3fZJCQ2P3/CFj5I2OPGV+bciAbtKKzJqykn57qozBLG65W1OabhyD3PRIILstwpSnZcoEYY5ed7+s7J5H5O0JTxRb3M4jM/1jNTIbOowjxrguC71Uwub3KruAH5Tz4PqNMXXbAdzABkn6WgK5Ld/9XgOMXk8IErjBafV/UrZEtKfoUW48jb2KwuiV1AcEFZTHNPV7VWa8RgJ/PbqzJKK06ITZSQswVB2T2mweVag67Ag+7ecWjM1qdokhLSIparwePgWT5kLcbHbdBqX3HzAFq9qjKAQKu40A/vHe3l5hWHdsCESJstSNzb+ljE4IeQZZjKuzqIHyL08kIW3SgmukCr8FhJyTRL1Yx89+6z5S1OhNZLhq0gXaCXgGGKHJAP9GSy4yWiVudbQgAPNtsR3askM8s0sP8lSTae4AWUDW45cmfvYMIPKgfUm+Kv7kzPB4vtiKdABD1AAWPqzk4FJvow3kDjUep8trYtNiH4VCOfX7sVl9eSB1OsgIw5Po2m2i6aab7TIpR63BlFSU6UODewv2c8Xr+bd/hYskpfZneFRx+83bjDlMNd+eZUeFqVReCkb47989+WO36v/Vfs29O7Xi+RTHx3vD7l0mZszFoT6Vf6RY69tX3FKgR0SU= 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)(39860400002)(366004)(376002)(136003)(346002)(451199015)(38350700002)(38100700002)(83380400001)(41300700001)(86362001)(2906002)(8936002)(5660300002)(4326008)(26005)(6512007)(6916009)(6506007)(8676002)(186003)(66556008)(66476007)(316002)(2616005)(66946007)(478600001)(52116002)(966005)(6486002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lTZJjgszyWC/DwwUTraOYfYxqQM7MsWp0ijAv/KIH1AyqR2ij4xk5LWBUXCUVYctOrw5ZsI3Wb/upykiER+Oi1CDQFPACkZatRhKb6WBOU3C8xwZ7bzM6cEpi3tfAN6xm2ECR5ycoor/7Vv2p2z8SrD+LRnIRS3X7UPhW4fa+1BHwsjxoiroga0g0KCHB//ovofLFZSSjyHyFQtVYAGwXmV29Rd5/WBHrew47prir0kBktZIwb/wL0Gt6gSo4lNHCpoyGN3Uk+6o2yBOrQFmzMk76t76Un6nWsmv+WDF6DTwCWwvMTK5ToOnDLSqEaQD/QxUmgSKW+bJm2WZr0WCSvCMiG126WXk1HfFenA3cA1S5hs2GxM7YhV4gMk2fZj2ALUc4g84TK7z2qBZS4PdrJS8Ee5kFYeaeBe37s9mteQ+Q7x5znyMtgbUHL1fXB7/SbhyoIijyewrDiAjQCJ8S446ciMEqUVm50hCTSIKJLHPEbs5JXKdC/lxgNDvxmeAJ7nfR5PduEaPPLBaTPAzORqtn646U7Ya/b+DsHWGDGjuTpo4/4cycNuZrt+bz3n69WDjduVyxyeurO7nBfmuwrPu+kw+KkEGCP5QgfLtjNikepSmw96A/q3Scx2n7zDqM7BKQ4yuUWBtDWws0KJhbwwlVbuQSWymCjkTKg/5s9XMOz5m1hQLDS0qqnIeJ9kdg8wQLrH3aTw81L5bdwHrv1Zt5xNQ40fCmpxLZOfeZhn2fDzRb+JgbfWUfSCPkkDwsej/mlXYAss2mGfXYNbBEcgsS5Ei9AHBvfFu36NVRF09PLPzOxVwJ93th2gsFgGrOziU1kyj0nu9enW6eSyacipXAXp9h7FG0MOW9b9hv0Xr8BfL6tdvXtTSjX3ZTLisTwMAXufTgTBa0cpFG6jC6COGd5gTrsWeTZujFp4Vav2B2/AaCfZfpzTSYp2F9hOmHxnCXQZlekjQypxaJIBDpzk0prcI201l+OCYzn82GX4mZM1cMLMQAKAwcaCMHYjF1jlze/OjAhr0C5Oz/djwuRw+ucdHcGNZV8GANEV1zhFKp34mT9Gb2LR5UlAKmn6SpS7n256NbQvZ3XVSceM5enc+AqiMHCtD7JmgcCQ6e4yxTpxsgXGwVNwbHqFvwrm1QdCOygZO7yz1nQdvBduxbcyGsOKDW953AvvealrxsNsKI8CqSSmjcsh4MB9kDXBzEIvzVwxj8vjobKwzjZtkLbGPYScSSKt9mql1zpcqEi0wja0An+rxw6yG+DUvYTxeZxmwndm6QQ4y/7FxtNSd6DKim4nJFJLAEd5C6lbbuafP8OUt+UcUrc46crpNbE8yzpbsM78gfNn0XY9s+hiCFG7DnyU/ghQr3xxO2HGDiK4tUEv86jqRXTlBTCIr07kUIpvutQJV/R3WJ4/Yi//0A2x7qdi9FCsn2gv7BbeJmHSN4upBJGBWDOLiUMANlRl8wa5XMiueBCndRlLKsJkgXE96v8llGYVeQ7jsOZxakyT5jEB0W5ZGe4EqGUG7sOzgLIEFNjxJip8suHnb8dn6LCaUthEUCWj8Crjvu/BHU8V7O2grZ22MTR8Pl5Q5gEdzo+jeOB3lq+Uvg0Nye9u5dfVmdR0ZXNwE8vV0WPOOVSw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e599de87-1304-4299-29e3-08dafdb10857 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:16:41.9971 (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: vu35KpfAi7LIDDVmmtHvQHaojgpTmBPtcuqd9ehydwRGfz76htvzWVb62JZi7hPcedGwH7wGE72UF8TSBXp2AX36tBoiprf8kA/qw6k4etczZU1ZqOUN63qGkvtDMIRr X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8812 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: Linux-ALSA Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Current ASoC has many helper function. This patch use it. Link: https://lore.kernel.org/all/6f047ec5-4055-761d-c1ea-c2d0b606e53a@linux.intel.com/ Signed-off-by: Kuninori Morimoto --- v1 -> v2 - use pointer for tx_mask/rx_mast to avoid overwrite 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..69f534f0d4bf 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 Tue Jan 24 02:16: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: 13113336 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 ED645C05027 for ; Tue, 24 Jan 2023 02:17: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 A79FC6C0; Tue, 24 Jan 2023 03:17:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A79FC6C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526671; bh=8dGF3GMgNr61Fl7efCpBF4/p9Pxcwb4U3pOGvprWyJk=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=LrMUCpK1XKG6qovUVqFqISG0jUe/Ps3TkgVHzo1JUZfK3SneV+4E1aFRrt1Z2EB3X C8jPsnhNiWua+tg8F4iQcfOjz5qYNBp7WEMzFsvwylqLeE25G7ZEBw7O2jX6GZQzaT 9iK0c2m+ZZHxIosN9fAEeAP3O+UAKZSW9J++jwAM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5AC2AF80515; Tue, 24 Jan 2023 03:17:01 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8276EF80542; Tue, 24 Jan 2023 03:17:00 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2107.outbound.protection.outlook.com [40.107.114.107]) (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 9D28EF8030F for ; Tue, 24 Jan 2023 03:16:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9D28EF8030F 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=J3wFk0PJ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CMlGkGk22jUO46xS4FPkW+mX1kXgSgxOiy4kkr9bc6tgZTsCE8OeNOi9Cz4ohn6wYNBRSvrl7puRkhACEHBBl5CmRehNphJJA2RSj3B1z8dCmHiylMJpJvDo84frv/YExFO3RN6hRk2j8orI85c5U71wxCaYcBe10gR/AzbCaIE80T3POPc8NzlVtSuRNR485bAIhCpKM0lQplFy1xWZ9+OH9CUcTSmXpVMojeUkAY0rXKymDxjgtIovL78I7H6ySoCUUAsyaK8WdwcCFLwVz9ziMUhVvtzvKLueDSCtOQDDPbzEAcESKrw/WedERxFT4odlZ3BenBajLLUHUrFxow== 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=6meeSM2vDTTYQn4gPe8z2vz4atq+tUQQpHtT6CscFVU=; b=Oa6CBZndJPaWVEe0IYjKjBZtqGZnmLd+F0RBrPfj5hi+t+dYCWTjBXQJo6xFdM14RV4Rgv29JfGsDn94dSO30QZz/DVN3JTIk1t6LaW+laT3w7cTo4a/b8+i45ZiZ7ovWeXAhcsXs2bz43Bw1eZw6nWrlUAxDmeE7g98Bnxz/COxS3DfbqZy+OgRiZ0ThI5E2bL8B5UF+9tCkmAOTrXxEyGIbM+oDXCQR2p6KRIzMC1hIPJ6d8gOrWhTZxidt27l5+nseOdIptK4RLFNLfzsCpafLjbGMJxYFG+F7UOXLsQBJwqeEE2DnGONpYgV2jVIESBSHKcOT62TK7rovpZr2w== 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=6meeSM2vDTTYQn4gPe8z2vz4atq+tUQQpHtT6CscFVU=; b=J3wFk0PJcT7Y3DNA55r5gkn3l+Ygl1ie6n8ROpDN8QDlbCVa61Lshw11wvdiQGkXe6JoA0oqQOwFoiMsMY0fJ2EWS3i8g7pNVGyBIVR3bj5N7lAadb7fiwtHsr4qfAtg6fPNdV6FtDhZ/In71vYvUyUSefn/KpWmKlIKCgmuyTs= 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 OS3PR01MB8812.jpnprd01.prod.outlook.com (2603:1096:604:17d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:16: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:16:53 +0000 Message-ID: <871qnku162.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:16:53 +0000 X-ClientProxiedBy: TYCPR01CA0081.jpnprd01.prod.outlook.com (2603:1096:405:3::21) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8812:EE_ X-MS-Office365-Filtering-Correlation-Id: 2be75254-388e-4856-f8a5-08dafdb10f66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4IUjSVC7cJTMBEShH6nrHUDcxWwVtfnUpSz0nrWowzK5+cTRtlAbSw09jBCuRJ8rPM1pazGqZSTZ7m52cZXkH27Kpf679dE6S3An5TMkqKR1xGPQJ/8xqRbcwdOncwQhZ7wjj3MYr8Z53+J+Eo57i+Y1ytYca6LP7ZXVgDZ0Ej36vPhnNbGhLNERbtGLedSULH04ACqqKsrvvq9+d13EvMR6v+Q27908xhbmrbl8spTIXYZb9xD1Y/3NRaa9UcZCNdpeb/eNBdNTr/dc6rKfSFerhcyMx9hmrVOd5SbzpLzM79NrQtfkAp3ipP4I58Tukhn4xoN3MMiwfwJkpShNCk8pIuQns7bkwlxzWD+xGoh6hU3lAKnjRG9N3ODzPkjuF1j5CMr/3ONqMTzAVpX8YOg4aaPftfSeKrGyG/5JnPF50LbM1yCoevYPq/YB44IeAUJ/PbIS4L0kbgrStfcTyeYcVJo6sTHnzJpvK2CwAxiF0bbIP8XMwIO4lGD6STHw7yX5yXOYXR5IhMgbqqrstpxgpCPjVyRxEJWihiooqKiojRTVqXfQBsgkH7JyXi1MMKHpRtHkAI8EJ84XwkareOu0rnrM4k8XN7A6n4ZTHtk3ExinM/16Qn1soK0FUkO/J4QkLYhAHu2J3R+M+OvpcdTg5KIO+Fepp89ppWYgQdIiKeT+VhxBT16eYffT/SVmJMdfwr2LrKXkcaYcTVyklA== 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)(39860400002)(366004)(376002)(136003)(346002)(451199015)(38350700002)(38100700002)(83380400001)(41300700001)(86362001)(2906002)(8936002)(5660300002)(4326008)(26005)(6512007)(6916009)(6506007)(8676002)(186003)(66556008)(66476007)(316002)(2616005)(66946007)(478600001)(52116002)(6486002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uPFKiBq7ZdG1ZWS/4vrI3ymrbUCttkJCpcALI3PrEzRkgZoTMjR7T0w6jGiLjlwDyrZW2678FSiSOG31VXLJUazOt28Vt5CJtBW/5ybQQ0HxmV+rptl/aaWGdq+a8eKhOrdS/+15LsSlwZE4tyl0oDbsL46/xxZxUiyC0Apsfvpmbo+d9G5E2Fxjs5uagLfufH72YgzZW7TQ+N4XF9Fz9HmSzXUdTXv2yVrqjAYrKXOaLE1TQGyOQxZxtGZ7luuEs3Vl7UZdRWzF7TJ56/Mbs4lc/vpGJpgYBBk7iXMgMGHhRRJIqAmYFONSrDgrcPSq1OtU3mQkPaLTmoPRGO2SAVk81UZEe2ddXQVax9JwOMrklXUtqOUTqr0Pxjx4/w/w/4E4gREbH5vLtEFvMzpyqCRBcVP29OwI/Sng6MaCn9a7VrVqZp8Cy8aU6cJQLY5fOa4NYkxjiO3RTQmhwPlh1Xp5jpTKvlH1Th1wUaa0Oy89JwNGLJ+QaftQvywOPtT/p/FmAx0iAxmJwr/uqZct+ipjll3u54svw7iJReTlLL74bPYJGarfbBbTsq/rW5Pq8f8sy3nTJBoytUU0rpywL0KASzE/3WPBdh1HqVzrbO/8E+dlXmyonGz7gR7vjRlnl678/ia00yJQ7XENbQPCsSyx0+XjtesNgFvBDgSOiNcum6reNnfoKAyTaWbb4/Q0ZAXbUU+n7i8pQluux5bNXXCxXv7HYyERh5U8Aon710Md0d5+vvIRf7oIFeuIrcTc/acctovFzhmh+46OO3wsHXCtMjBiFLIOuVJ2MsumRhEm7rQgVOLQX5V74hLtk6O329wUyDSSv4jCm6eUnrtY0KE3Kz/xCT3zAPlhJbdzozx/dc+BbjnGG48bPjsIDuHD4c2GFhiT4TSDFGilBwU+EbpmhX9y5dJoZc3xrWFH4vGCzDBNLFx99AdJvRMZl0sFxRfv7b2ZLFNljHjWWwFQQDshmZ1xnAOhm7tXvndx4R5rI0T5y6oP0lSm5Z2CB94ccxQ1T616mDctHeiUDiosjnGJZ3mEIKzN9N8UzcR5lvhhuAxbuN6OSObZe8SeI2aC0PvmRKAWcbpp3wGA+CB0C8A6ThxyXnSmCfWSpOe+s11ON0S4q2pCZapTITUe5lLuv6Qoz6zu2u3yV/LDKbvST1W+YUKBuYsSBoJF8CuwXEvH0wn4lov3tuwjiAAZNcJ8kRVdpph0cUBAToEWsM1TH97Ljilv3CSQz9nL8QdK9sYEVjPzuTKSUZGC0Xjwb3u4Mo61YNHscvkgxlh+MDtr707ptBf8BHpvvoylf5/fItwAfzgobcIETaQ4ok/dDPH5lhAP9NLfTUrlZTZfDqthm1IGqQBL0imcODlmw9RsQke/UiPsJLR9kGB+CtbOIBAqF988+GfTt6PMZi8Mq0CkYG3dtfhkHxqgrHQeZIjZC50Oeyu+udqaJ3thU8Yyn5KXzzKwtY3VLKi9erMhwGUoqfti0Qi7+FqA9nnEPmwBKrLvBdHsZPVvE+3i1p84KVdtQK48yF7Y7P1pRvbM05pQj/6hf7iMycSGBIqZRie8Lcdl5dg9qIHVQ1256z+wUR/Nab/67Ku2Z6m9DMr9Ot2Lwf+kx18IuCFOImxKcYTtowM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2be75254-388e-4856-f8a5-08dafdb10f66 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:16:53.6729 (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: JPCfAiEv0mZ3KMFKiB5uWmIjfLOWQ6DK4vFh0MZfhhYstubjlQ1yT9pWXs1BrAmKA1syWTwRgvko+V8yru+T02pemuER+6MkUNtxFiUEWBQLx0YS1pAka/i5Hng9zEQp X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8812 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: Linux-ALSA 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 Tue Jan 24 02:17: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: 13113337 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 A259DC05027 for ; Tue, 24 Jan 2023 02:18:07 +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 36DB4E8D; Tue, 24 Jan 2023 03:17:15 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 36DB4E8D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526685; 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=UNs2q7+wFlh0QwiInyhOfWG+XShVDlHw3y9yr9hv9UoOI6rvQHgNhzU0s1W+/Nqch 0/Kp8jJRnZxIMIkt8lfOgyqoFV+ujGvcpQdTXENT+AlNVjZyMpajAtiCccJxN+rDr3 U31uPAFG88WAhNil2fL2eI9WSBW6UR7yi85AIxNU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 03FD9F803DC; Tue, 24 Jan 2023 03:17:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6BADFF804D2; Tue, 24 Jan 2023 03:17:09 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2116.outbound.protection.outlook.com [40.107.114.116]) (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 56CD6F8025D for ; Tue, 24 Jan 2023 03:17:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 56CD6F8025D 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=BNpzc5of ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LWDLIN1FQA3wLEhvU0MSPWGSLdTAbUbpA1kD6vhtf8t/JiMTmgM4VOeTzfD1snfdjtz6Ainsl9m3iKkyGHzlqgnHeBAXthUvv9le0meI8UWxaHtcMfvH6vwljfRJ/qDWe/t0an55RWEpHPkCAO8HjkGStEenTgtWTGB55M1oHV8dI+nMhr9GMGAtW7WjRV7CXFC5vi6m/Q9DxzTUau2T926vIVx5sd8DcI5yGVW0qq5WlDJaqmtT0WFLVmxREcKQYavI3M98ViST73tnxp+SGR/p8s6H9FhIlRff8t1GMp+MLvbRN33TU9Izfpn3QFSzlLlxAqUYJemDGSOe3qCIPA== 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=D1SVw4w91WuY6KRrm0z54TuMRaUO+OQPbgkPkGA9S2l9s8eyVwVY7gWgC6/vBGfWWQ4Rjn7mXDTcDBN2Y6zR6ZvIMqtYNsDCN5NjsJPZFuiGaVrZqRPjfp17V+WYkW/itg67h+mbTvRKtTUoG7PDxDADMEoBvjbvRdGj3eMQtm8fBRDPu+frkoZyAVsFfaOYZGvwYOj9ltIjvHAhd+sMRZT3woy5m7tMPDi5oegk4K2S3hVhkrbibM8Z13ZQVaQscuILsLjCQqIo4vUKU2Tc0fuaOWWcFfQBeYTLVnHgKSPmqh6CTU+kh2tQCkBCMrXEmsmNd9gLH3ubM0YPLniEyw== 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=BNpzc5ofSsFrVTB10O5M7kcApZe4AzxKXFuwSslro8ULnAOzRozv/T7W4T4KUq2V9TYYr4beriDl4IXeeTvLiCnVOm6JI3dI1iv6uy6B4QGoP5p9QAY910xh34qyPAWa+s4KQ9Jxk2eLh/2o8GN+hfgXU1kd4fImV4Ki8ZUHGT4= 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 TYBPR01MB5391.jpnprd01.prod.outlook.com (2603:1096:404:8021::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:17: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:17:03 +0000 Message-ID: <87zga8smld.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:17:03 +0000 X-ClientProxiedBy: TYCP286CA0095.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYBPR01MB5391:EE_ X-MS-Office365-Filtering-Correlation-Id: a2958b40-1d4b-42c2-1155-08dafdb11532 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UfxwAYLKLq6SbU8gtbtwrJ3u7gZtHksaWYviAhihXMBqmUix4Qj3TggQCPlv+6EjFHOQd6er3YKAmpqV3dBs+GRNVDllifAReMmxrg9goObbNjf7vC4xhim08v6oRjkDbMjiH+obrNhJrMrGSMFYyiOdRyKQohB8Kfie9MqAcmo3zsRnq50Zmkf79Ci8Fj6YhFoDUGarbk75M9glN5KqgAK0/NO9AoTBhuphJSRv9h6AdCs6/31fYMEFa6LqkMTYMyvwB2v661tC5IZLRqtDaw7YSoDHJzDqHrw7+i/z3IqB+NhNC9e1qPyJwIK9K6n7RX6WePVcXhjKy7tVSLuIIIA5YgwiPUqsXOzgqgmkOFjDpc5sJT8vn4rrMwr0I4qVrjYOR1n6aA7pkm511DbedJzZHgcgoL2+PbYRaN9Z6QL48xtqYy8wA8oBwOJuBC8P0PzQZsg/E2xsLBvM7CB4UHd6aki9FZ8upzngk7sOzgu1az4PSxColHVeY2G7aDgg4Uf+yUnZ4oBhZZJOZMfJ5UHsrGGp2w3/O8SxodEYUl1AIRH86EhyL7ZeiCv8MDfAhgMs2gAcvXg1ugT4oXxx/K/PnHSnlY0fUnQzVYCZ1JcdLA/22ZNPcUdzVtjvFgXmU+f16GobvBibpDXw51fcKfy4rWVSnn3m358QqdrcAxwVm9sxOlloIlh3gkmMJ070rttYJI3cC+tL3mRF49pIBQ== 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)(346002)(39860400002)(366004)(136003)(396003)(376002)(451199015)(36756003)(86362001)(2906002)(38350700002)(38100700002)(5660300002)(8936002)(83380400001)(4326008)(41300700001)(66476007)(6486002)(478600001)(52116002)(6512007)(6916009)(8676002)(186003)(26005)(6506007)(2616005)(316002)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6s94qUA8vErGs8MaVL9KPy4SyQTnfDrGsn5er//bJEb9LKuJQ5/I9+SzdRntUTWKZEZCFZNsM0riPyJYC531LXwVDeadbLrfUSjjFpxkiTxG/SatB3cSOFyZ5sGKoUlPGf9iBDY0FosOePzOIFaHdZ1P48iNcSlfGY3vVHXheEOnhmRaoNfKS9DzfTZYZbZ+a+owGaDKPjs3eAphdFuPaSgIKCguC6MX23ZbNAagPDSAAvgYG6q5udmWOhmIDOCO86ddijUa87rCOCZDUEL4mlSukfKUUb5RU79AwIYDlvgmHcxEFX1Y5zMLgKPHByvm98Ipal62oVIaLYfcvD14RobJxi05lFsd+wGhIyBTw30QbEszWQwhrAWRtejeSrxgjLYolbdh0xOWB6EzAd85maKXfOMuGTgNqNV6m5ER4IlelRzlpCAQeZx5IbjXIl2fEy/3DosX2gxmTpw0C+Hd2eOjiGsBZZn4EKxTg56tEs65ipz2ifC6uJk0/FOsg0ZyFYTrVVDAaL4SlcGjNMxBMS1esdncG5QhkAAZD1RTdTDF1ZcB9AYUJiqoq6NgOT2qNK0ALvYaA/AR1v/WlNS2D1TmVu+tEzl20UrLSzbzkKWbDoQBilHBWCZzIuXnLxE/u0IcAFwyGx0sTdXO3ULhwE6P1f5Qltm1a7HnzTNzYnReLcJ2tgvN43/QrQGAnj6GRx6oOutIGG/jNy4gsKDd1Tg2p/r1uNo0BfXBsEw3rLqUQE/8SYGQYwcMl/5JwnSFaEdIiydNTraDKBPQ7C0a2Mq3hyIgjMLRhZPDkVlcC9MLCfX4An1LoceucMJ7KIZA4xbMbx4nnN6QE4zEn7+FRemMMYWGR74nm/nuhst9Fnrfcviy6vtyB8gAAvL29VicdbgAjUGvUIMAkr/N/hPF+iDRZEDG1CWVMvJIa+Om6mptRyWESitSh0rPk4Q/0kZFp4RfIglD3kF2ZPZ2VC7pomOd/HlxaK+ZdITH4Idy2cLwrL6o5702rQBB3vEvKU0qftm0uZoxVNtMmSR7hCAgRZajKaJrQBk3ZWk/lN3AxqgXmya91Gbbismvnefp+WcTttmQMF2VBD80XEmAGcb+JKPRF3C4zH6Xvht1OPX9gSTY7vO6kzEfVmqMupIGcuxSwoDXyTdphQxgdNovWeX0eRc6xEEuJQbZESSb0I3kyENi6frUelFT3B+loKsNDci9+8R8HbukaBumUcZrkNkWp64GDZJ24JToaZP0u9j79UFdRiM7ak2xl6Z8fBgZm6sqj8VtsGrxyvyh396c5vtZiBcVqTuUavSCMCrP5x6FuMDHyDyzlQHHNPlhaKtPK16dDMVBGgDdn2q82JgoRdE9eXzbwpM2hD6gQGQM97K9Bk1uI2Rrz/3+YYLyV/rMXhKNTK89FEDH0NuLR5ABnJ2qLFKRZCxg2z/0xecUJnt+qlk8YqO4BK53REM8k3LHNmOM+glYfb7cVfLN9eU7cf7+o6wmLfTPeis9stBwOh9cvxBBHcvY/mI69ZGtW9Gw6QYjDdTBKeJZThXS4ur/pknzzrrxYtnfV1H++9X3NZzWVjBnaaD14cCHojzJrm5fixtKDzRnzkhe0ypwk2P8RCsssJQ4MzAjhxzIlGE8r98CJwI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2958b40-1d4b-42c2-1155-08dafdb11532 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:17:03.3769 (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: ygXmsiQ9w2tZbG4Tvn0FRVsA5vwiLPSDX6MGTOuFIFpyZPIalU3DaC0c0vBUFEJUAPUMJ8T2RTKcNbdkympKw/1mJrauympuM6uxKqua2/9hb/RzQnbaZDfDD215Es3c X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYBPR01MB5391 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: Linux-ALSA 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 Tue Jan 24 02:17: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: 13113338 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 C869DC25B50 for ; Tue, 24 Jan 2023 02:18: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 01F7FEA5; Tue, 24 Jan 2023 03:17:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 01F7FEA5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674526710; bh=DqVeTXKXcPs08cYrnDAfKNz0u8s/17iD0wXY44mdbpI=; h=From:Subject:To:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=AsShJdzjvsrnSJ6onoH3b71SSjUiKUqmVA6uareqfO6eVu3zDKu7bgLkf/4CmjLo0 A+DJr9ixy6FT7ifSgADhsqUufiEZRGa9jVvTjmGi8GhiU9xCHPdHXcD+VRbYUIS5cj tuwgDK1pI9jxKh7KW4nnNPPgeTrqZeYHVyszGv0k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 05539F8053D; Tue, 24 Jan 2023 03:17:21 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3F5C8F8055A; Tue, 24 Jan 2023 03:17:19 +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 43B0FF80549 for ; Tue, 24 Jan 2023 03:17:16 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 43B0FF80549 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=f6z7IsvZ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j04R7e+k2BeZBKS2wQTBbh2gx8TnGGoC80XiWr81JDcG5baox56ssp5KgwRK3nZMrUsyV2AXadD9HfXRGvHY2FhCGvEaJMQAjMFOWFO2SzcMg/6VDhGT3X6sx5K87IxBb7ecmR4T9qbH09P83WmPynYq7pZuSjeeZJEp7OIy8WZRBkTnQPihfGA1v/OZBHCUGJFEgMe4Ylem8V7Lt4AV5gt/uKMwlvNR49dPCP3MMOlDUv1w11CvTeaXFmG/EIKi/MaM1SKCBy60QUhVvPdArhVgV12fG5XxfxSaj0nlSTlNy31n8iAFBrwuEGU9ewJj0bNfzsr3PQGtKP6I9JOGPQ== 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=sVMsoh3ErVqYgiv+oQeiaV4zpyJky2+omTZ2rTxvPEo=; b=a9QFTMECXgKxIw+R2ujtBvq2MFc9q7UcZe9T5jfcjRg13CQhzuczR9VdvFMu5QuBXdKzXHYpYxJYHgZCaulrM7vCLhjvwq3R5EIbW3hsZGrdYIFDLcJWupw05UIEhDBvBC1PtjTgAFKYZXxj+fSzG0ZmD/kRSWc/yfH9wiLzOmdWbbPVw6aAIa9vxn2JPz0hS6PMusxvCrAXrb/pksKqkgu0cj/YuKacKtN/BhVvuqytDbIZNHM3pDyWgs4TVKlQKESoBPGWeHuYhfg36Gbs8aNJT5UROQDoQF63BhqVXsGCGkeGaCjuGIAz9uTsHj7uhIwCzxT2cHWDZLWCAGCYCQ== 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=sVMsoh3ErVqYgiv+oQeiaV4zpyJky2+omTZ2rTxvPEo=; b=f6z7IsvZ1VoIgwINZTxozY2pwNqzk/fXHDH3xZWtMQ7q/1g3AZSqbZWZubVD4QXlVxId1EdSt4EDKxFDg/dRK7O7JVKP7ANIEiWjZHdue6ib1K/zUESS/LvR8GF+mmldnGvGtpJR+1ry+A+i0FwFUGq7wWg8JNpn2YXfTX3szXw= 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 TYBPR01MB5391.jpnprd01.prod.outlook.com (2603:1096:404:8021::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 02:17: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%6]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 02:17:13 +0000 Message-ID: <87y1pssml2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> References: <87y1psu1m1.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 24 Jan 2023 02:17:13 +0000 X-ClientProxiedBy: TYAPR01CA0186.jpnprd01.prod.outlook.com (2603:1096:404:ba::30) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYBPR01MB5391:EE_ X-MS-Office365-Filtering-Correlation-Id: cc1b503b-515b-4784-da85-08dafdb11b55 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8/fo08Xlagga5MEjgJexU+kJgbHFhM3ufpkHhB0fLsap1zlFPllKlwwUXvsBvvXcYXKyBHcObWnCgEsCqxHPZKw4y1veac7MtpR2UoReslRmgCCqMNCOmOWnjxMlrVR6Sh16ZMvt18ozvDQIdVq1j+kdM98HhUd1RwIS6uirQO0RY0PLVlayNH/uOHZpgmYeQIpnvOR6xR2h3Vb+9dRGPZQN6IDYo62nqWPjF+GbFMs3w0B+4BoxUuca3kL5rewkVFicezStIOB5kcPzj6v3OBxkZuWmeYG/zMLrVbq/aLSsOVFIz4pwjcQxOl6W26natGKqigm84t7pxkCU8IB0vEOdpQydjzRnoG48+V2AiIJks2ZKQYIZTlOh50cTjbndgzVv3lNWKSMPchn4cPdTazNwjYr4g8fGQadCLIfLP8sEybGrz1rhG9iVJ+XIStUes/d6bexAIt494P5bQTIYsZubvy47XyFa7BSITJ62CBfN0osi3/QEEkXGPzsaJprqYbZ9OUQsOgKtR0UathFWMWpJbmiewVU7qfejgP733PLIQxiGlIrwNGynalZErQNsyW0ZxLRVJ+tXyLgBM3cZyAEV2vHT5D94jw/V6/62RKK+G72PbxCBWRFTI9UemT0/piPmGkbLFDhEH801XwrOD74838BUR+0MNz31r8XPoXYHI5eI+r/QCXTxVx8v5lKGbIupLJOAoMJM7wtk55Xryw== 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)(346002)(39860400002)(366004)(136003)(396003)(376002)(451199015)(36756003)(86362001)(2906002)(38350700002)(38100700002)(5660300002)(8936002)(83380400001)(4326008)(41300700001)(66476007)(6486002)(478600001)(52116002)(6512007)(6916009)(8676002)(186003)(26005)(6506007)(2616005)(316002)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eZLeM4waXVq7v+R+bigqAwSa5wA2FSr6ptaGiL7Eaq4U0KwVda3bQiIKe02RKyat8E4ntQwBSLJAs8FqRsL4xCNwwRcCcDt7eULpiDIjAvaVXm3gACI+2Fm2LadIEhdxdqdygkqYCfqrdskFEZ+OxORYEibMIP6xlLOQ9AzrDX7shjY/TFHsY7I7sMS5FwGZsSZjgBgTdCxGMTKrrOh5LKhr2ZJiW9hGy6J7QrHZV7tAr0JP84+QTMmZnr55sIfnAfraLhrsVAZbW3cAmEG5BC+Fv/uZ30RuV4GXqH5jRX39LrWLdtCg2Gtby1TTHoEGk6C1cbGnZUabZRb392JZdCw686Fzgq81On4/Jxrc8yBE2rOuKdPfIUQe4C+5G/JP/B9iWbycar+Eng5caVmLiLvQ/z85rH9DRcsClCA84xFJq23YQyiYh+6N6Me7ymNk2UBSDeLJt8wYAr0ylJskYJIym6HECC7I3dIvOaVq/v16FaXJt/zt2eTvqCI24BV3uuCEpQEqTez3YjF+B8VxmAU0gGc0Ulys3EY5RRsVfyMGWgUXu5QHYXxmoGnKOkx1If8B5sT0hjV6UHn4FXMmgCXzby87zO4wCP7oZEiGUAP381iyD6gD1idqKZJpYl8lbl+m2wM3XU/cx4Qlv/5cFHCo0fIVz9w6Lrz7kPPCXnUAt92/YnqiTn/vZJzMbzZqKXMYVe0qQ6sSkKByHQxX5uGUPShmc8FEDUExKy4ATE8hYHqY6QyrVyfC61rEXs+lGg6ZfynyjKt2wRZR5xabk3h4ioThAba73GDKHYCEKmVC/tqECyO1UUh+M+fVfmMkArrMy4+GYb4f/6EbTndEOSNzcJ1ciwaq9mI9S2scUwqn1mI3a6djQVxNdvN3WtnkT8+CuXPesKDl1bbLWPw88H10fgH0yxvZ2no5OgNdgiFhYx4GEvsH78y9TlawuSreiIrHEaqk7uwrQ2rDikaom/Y5jKUrZg9sLqnpuRI5MGN/ja9y0oGP9YlHVcplZW4sJe0k97o6SltqfxrYlnYeR2cqvOmMygPAFRIVQRS/KPNPmxMnr8i3fcWo3/8UPdflOKk4bYKkJ0a+7iX8ijt8UHGoxzc7BvJqmSLz00eQRXhfDjq+wT183MJUnJ5HTWtG8b+2j+FSeTpGZIMKjCAJ/AXYTmOw4uQNjXD4FcIDkeLfUCTnno1pSiw4N1ZM8vLZvfZj5HtH2tSCUm+jZBA9VkPtTCMFxA08UY1CHXFpGcuerWcWm/PyWGymnH5UKOyMoriRrI4ocnOsv+GpUj4yOtvhMU114ZrsaDpjiLvU1hdsZPyzcz6nfdYT+ypQBiZHLXL44U5pAAw0NGP1aVYy6uLsD0lh2prHF265zSV7tN1zXSb6dTMZ7/RdzJHR/k4sPOCccRPF9uzKEjCgJMBEk7SGX/9LmfbRpaVsf81s6Gvll6P2hdQls4bEp5KbiIfu6fz9hAaIyR4WOig5kP9Gx2D0i+93Ue1u4LMeO7ANIqVvRDx+8tVSD/O6D7c3JD2gnYdjnbMN6uHQIBO5wm5ojiGIVwEsQT63DvoLhHdafepvsCZq+mrVVQAcLJFm6ncAw77JhTYBXbjYaarNW+MW+zwQNbcktzJnth5Wdj/37XE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc1b503b-515b-4784-da85-08dafdb11b55 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 02:17:13.7246 (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: ZzmVJS+LKjnn76ug9ImRmKjGmEIcN8c0heAyUNRpF8I7tewIZywXj3aObq38ZOxpPR5be4pn3Q7pnQZ6eWlfpANGHPjFCTVCwyk3gkI2/bQh4Pllmdnl5HYHbzWQ78AC X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYBPR01MB5391 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: Linux-ALSA 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 69f534f0d4bf..0119afbd01fc 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; }