From patchwork Wed Aug 2 00:57: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: 709640 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 002E3C0015E for ; Wed, 2 Aug 2023 01:01: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 CEEC8828; Wed, 2 Aug 2023 03:00:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CEEC8828 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938083; bh=uldxkI2iLdr9p4jBUoqbO8wtx1ZGAeyLCoa+nXHB1b4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hSMSPiya6H9PccH3WChm/Wg+nCTK/erCDBATGPIKuriGMj+OWSc48HaIX9+t7A3jE 3uFi7uE+S8e4kjf8C9x+NGn1uijRPkkFVFKKtQ2l7YPNoVJa03hzlllhMQYztaklTO Zbif9X6D8Wj5P0MVVYb8dGZopy60+xfsfVK+ZeX8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A326DF805A1; Wed, 2 Aug 2023 02:57:16 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 17DA4F805A1; Wed, 2 Aug 2023 02:57:16 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E637EF80638; Wed, 2 Aug 2023 02:57:11 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20704.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::704]) (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 92922F80578 for ; Wed, 2 Aug 2023 02:57:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 92922F80578 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=WA1Bnsc7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P4oL3M+9g17JztYXFPYaz57xmre02fQvFroXD1n0qh309nOyq5CuVKXCk+LrSv3EXw/st51hMlk6vM00vxyS/n5RX2BLfSSEZdDbdpI8HU0OcnZO0magxjGkXmz0SiFM8jDhnlKyI2nYLuhnaR7IFcspmghl466BKJZq1LB0nbA1uz9GMvuOtOl34nlAVuOUGln2KsoQ0+YcysW7JE8LOip6f/0V9MSbEVB0pSl8RnFb7JUBIOgALTx20UNvu/6dG5jADLTFo6wRnRx7cJpotn1BHsi6Pjm+lqzr+tS4ejvR2GdyQaGxG8MmV7qfR944RNAP0OW3jl0KjKsFYYhjQw== 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=Jw2gzRbconf/WYexs5sPIOPf7oDLSXhVjZZ02EV61js=; b=flRlwOca+VI98bDLHYSGc2z+KqSAcHW+u2cmGqN8VLkytjKaDz2A58hXPdk3IFACXPdo4RT5iOE2iGAknKK0wCn0uXQ7Gj2T+6quIIoUzwRB4S6z0QhCMaDQ0/79qn0P4VCo3ce49ixDDmUX81hQEgeF5xblnyjVrmPrrcKX3vooE+lEKzVBoWYgFytMkGg+094JFABy1eD5aEh3C7VOLuvvtHvlDQvhrrZ5iutlXt7Cf8LcMaE4r5CjmVPOD7hLSJOqSEvpEN6MOXux3UA7EbmTy+9V+IjAmrcYkPmxm+4gcLEDlRHlaBM1mtQ/QVCL9gRB5dv+bqto4IBNvozXYQ== 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=Jw2gzRbconf/WYexs5sPIOPf7oDLSXhVjZZ02EV61js=; b=WA1Bnsc7LAPYBpBekEcF6h2v/vKIvp2KxGA7nw4Ym8R+KUUrAr6uJLamJf3w853MGVx7x/+RuqmSHOWMASMkoF3oubblE2QHQCBY7DepywdcL/Eg7SA09UHAPXfbN8gOuOtlRnoB80VqpgXUJCJ4ZHOt7qcqt3VLzCqbht5N9wk= 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 OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:57:04 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:57:04 +0000 Message-ID: <875y5ytg69.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Heiko Stuebner , Jaroslav Kysela , Judy Hsiao , Liam Girdwood , Mark Brown , Nicolas Frattaroli , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH 28/38] ASoC: rockchip: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:57:03 +0000 X-ClientProxiedBy: TY2PR0101CA0017.apcprd01.prod.exchangelabs.com (2603:1096:404:92::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_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: ebe0a371-c27f-4eda-631a-08db92f362e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hZ+8IcssyhoaTMpOzPKrp1kJn+7BHQi0V92DvVXIBOJG7+wIuxkmWfzHabJgBHG4Zf4zGLddBKeaxu9qRd2MQnG6XYFY8zIOJIitWLe+R+Zt39zAuD8YFV60MJRJubgTVcjYDhpyAvgEGX/gtfTHu0HF71zTdNCod/9bkqlXuOJupQqrFzmHXocodxRJFK+QCkRwNBR20+gTF3sSxp7LX7mtCmNsPVbw/NB66rdLroF900o7Hrcy8rmbLINfSpo1aHZJjo4Nz/9n/GzSqxhQHktdHWhlyau6y7WpdiapALAGcANJjWJKUpPeP2jNkzS4O45tqk0I4EtWGF1D20SdNpivbZFC4WnZRSmZF25vUly6KWHmnFmNxKrOsMXEVNcClZT4xD59/mbIzjxO/q2N+EAiA2/FlNcr8sWhjywIYk5IhMzne05itFI3cNC2iFV4pnS5M5Y19XX/Jgk2vit5jyVdjuiBIvkO4QzNqYwROGeHmUmAPRZ/1uZmwkH/HoaPB9Jjh2f71yJaxVXxrtQhOj9qBSK+ffZ0g2Ud0WprpwkM7BgKojIQ4hm6SvNzJPNUNA1/CeWac7R8gUWT0EuBoOp9F6F4k/KlZJKh+k9nOqcQKlUQshSpjOHtUULcdFIr 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:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MPmHMQO7XjrPSecVwMaFqfHgHZexOa5yoYoZWyJX0BewQG/Y76nMnMr5ybirUUywovVCkeBF4aonzRoMPZdNipKwzQghJgTpmFfDBByMnwHQwWTAt32i1g4mJ7EU6/rRv8BcVp+HFR+dGKJe9G7LcoIk2mkRyI+2MBqrUbbj1PikzhIDB5Qwn69fX8FWI2BKzsmzHiZBxs2x6yvw4wY2CNX3rNXbd1KOK66uUGLYescnE7L8KxBKNK98M3Guj3nkoj+o59UemJau317petC3F+FXxd99g5uNsbeTy0Vqt3lIFogi9Mj+6EK/d9ctFzbcO/eM6uXr1KfUyXV4wL6XiNlg+SE7ivWq2s2G6MHdxgqYXPjCxARTARSeE2kAsajSt4ExIqlugdqWCABIMq4PdVzjrCVSTUMn1yMFfNC0EkB3kIKi6UFgocCfWqjqRdYtuoFfwRj/XqY7E4OSliFsU2W6oDlRWo9xzazEDT4JmCiQk2jkInJ9W5RTYMP4AMG+xEVePM5KQBT5zZfvPJsrL3824Ka7WT7vtJ0cBV/9jrKpZreP4QowHHT+pekSRVTSRe4cx+bvEFGkjTiSxfpeY3g1ZDBcry4CKiRxthKCZ80y/NszFyQp6cLRcUyq6odc/fheN2hlSHcPPM+XI4nrJAWq/oTo4M8GSF6N34hH+WnRXRLm0sGmqcjFj6JXJvN7dIjUtJb2HCe5jn892cqoabYlGmI0AqbqNvE06tOkcg0zaqesPkTsMxkXGJFNDwKCp2p2Ulz4CncfKr7/jfJdhyrvvKLdo052RZeXBGh4mxJGIqa0YWJhyzRz30sc3IAkknvbxGikHUtb5cX2Mjl90ZQwymbN1jQytUZoitMUP8N0sB2xkeupk7XiY/iq7Ilk0kZ14N9Qg5V+1GmVmfAGNkn6xdXO6oU14qrTBpi+SLNY14EuvXOcK+hB75F7KOoVQ0MrawONi5LVvVILLLB90dyeUXJaXUxgucdC9iDVOuRWZWZSUEiIvKfnXtvtGgrA/hdI6A8Use/ufDnbAlZzd6I89ee1+uEYkp021xb7UIHW9ra5mc8Y0r/fzuXBqL3b5Cm5B0ZieqsknhuiB+H1wV8dj/0eECQeU7ekwyuUqDvGmNMsuKb0bcNQEz0oNi8DBk90Q9Mwq5LKEMvAZpDbCSL7/8cxNb/+Fmjix8UvZ7lpThen1jHrGH+jDejbriqggZgKpjRHI0VTpnwIFu1dejEBjt07QZbs0GnFdM7A8UkQDitWjoJDt9wXbSxG2WjByv6hsjBUz93dQedmGYPkCa3iRwezR9eDrR2QtLkpZr7QZlxWxMwY7zvxRRsLZclBMa5dyCrGrqL/a2ko0PQvVh8REP5xdRenUpWW1n1+l8L1YAD0jeS9GDcUpBYqZ1o115Dp0DOCJC3SgOXJgB5HhwQUVN4sNnvlleJJfJFasU58Mf6wj6eeFm5Sab1v+8hSKbYEADe0mHF1sk9Y5C5fsPGv615A0zqG4PF32htbL9XCrSEv13Ox7zCfRH9+1xjRE8uoNb42WKms8Jr5/rIFyArmPMGHTPOyV93tOpaa7hlmj4dGd/Ds/CxGQHargoIMhOcUFvK/huq90F5EGy2vmVhSAo/J3+UzpAEwH7c3/wQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebe0a371-c27f-4eda-631a-08db92f362e9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:57:04.4282 (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: uN02+4AED+/uN26KKz72/BYn0oirOGkyHxj1gC+qmoTgLjsh7b9+RlJPE8vwMvvnXvopiEH6RQ5hA2tqvKsg1JrA+BHEl5JJwOEworBzRWRl5OnUdCKmobxYYmfZQ8W4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: EWVIH4RIYSJYD4SQFU3PTPDSO3MK3WZG X-Message-ID-Hash: EWVIH4RIYSJYD4SQFU3PTPDSO3MK3WZG X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/rockchip/rockchip_i2s.c | 2 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- sound/soc/rockchip/rockchip_pdm.c | 2 +- sound/soc/rockchip/rockchip_spdif.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 575a0b9b01e9..834fbb5cf810 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -539,6 +539,7 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = { + .probe = rockchip_i2s_dai_probe, .hw_params = rockchip_i2s_hw_params, .set_bclk_ratio = rockchip_i2s_set_bclk_ratio, .set_sysclk = rockchip_i2s_set_sysclk, @@ -547,7 +548,6 @@ static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = { }; static struct snd_soc_dai_driver rockchip_i2s_dai = { - .probe = rockchip_i2s_dai_probe, .ops = &rockchip_i2s_dai_ops, .symmetric_rate = 1, }; diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 166257c6ae14..d3700f3c98e6 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -1114,6 +1114,7 @@ static int rockchip_i2s_tdm_set_bclk_ratio(struct snd_soc_dai *dai, } static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = { + .probe = rockchip_i2s_tdm_dai_probe, .hw_params = rockchip_i2s_tdm_hw_params, .set_bclk_ratio = rockchip_i2s_tdm_set_bclk_ratio, .set_sysclk = rockchip_i2s_tdm_set_sysclk, @@ -1324,7 +1325,6 @@ static const struct of_device_id rockchip_i2s_tdm_match[] = { }; static const struct snd_soc_dai_driver i2s_tdm_dai = { - .probe = rockchip_i2s_tdm_dai_probe, .ops = &rockchip_i2s_tdm_dai_ops, }; diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 52f9aae60be8..667f2fa65c3e 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -379,6 +379,7 @@ static int rockchip_pdm_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops rockchip_pdm_dai_ops = { + .probe = rockchip_pdm_dai_probe, .set_fmt = rockchip_pdm_set_fmt, .trigger = rockchip_pdm_trigger, .hw_params = rockchip_pdm_hw_params, @@ -391,7 +392,6 @@ static const struct snd_soc_dai_ops rockchip_pdm_dai_ops = { SNDRV_PCM_FMTBIT_S32_LE) static struct snd_soc_dai_driver rockchip_pdm_dai = { - .probe = rockchip_pdm_dai_probe, .capture = { .stream_name = "Capture", .channels_min = 2, diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 0b73fe94e4bb..1a24b78e9e02 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -202,12 +202,12 @@ static int rk_spdif_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops rk_spdif_dai_ops = { + .probe = rk_spdif_dai_probe, .hw_params = rk_spdif_hw_params, .trigger = rk_spdif_trigger, }; static struct snd_soc_dai_driver rk_spdif_dai = { - .probe = rk_spdif_dai_probe, .playback = { .stream_name = "Playback", .channels_min = 2,