From patchwork Tue Aug 8 22:56:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711597 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 C729BC001E0 for ; Tue, 8 Aug 2023 23:01: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 CE131827; Wed, 9 Aug 2023 01:00:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CE131827 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535681; bh=c9QwdzVvAVEKaFh+BX9yc7EyoWe0FmA+Vo18TSqvpOk=; 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=ba6Hemrt4r38VsyOccpu6DeGnqYcGCwB1VL1dG2wHI0eaONA8QuAl3hrssub17dQa aI5on7rEvn0fo2arY7ObB9jFqWUXu3aX1filRL6oMR+0WreKSVmCbptnxyLJ0GzHEq WEw+eoWpj9oIiAdhhipWR+9niCplHYNkHlM+PjcY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3D071F8058C; Wed, 9 Aug 2023 00:57:15 +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 B4A3CF805AE; Wed, 9 Aug 2023 00:57:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 78842F805A1; Wed, 9 Aug 2023 00:57:11 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070a.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70a]) (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 33BB4F805C1 for ; Wed, 9 Aug 2023 00:57:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 33BB4F805C1 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=OSwM8ooQ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JCK+8hrn5HozrVQJ1MZLlzRkht9OStNIDvLTcybTJbB0Zhqb80W8ILT8nnB2H9DwOePfxavY1Z7XfYGKiZQ9bTKVFpI9NDkNvkPNVzl6M0RVerZvNu21IV5mdBsjVzxk7MLiDesYkvB+J+NI7MJl5dWeH3JM6byw8vp1tYJ4sJzVZ22rAejZIAbQzVG4kqM9+gc/1FuGZ523fl4OlKO+jxRR+7QM9tUQ5iezmYuAivTb3tf8G/GjAKpJ/pIrtuPVzlcHRzpm0EN48iy7hqR56w6Gbqnlsdb8l8J4aArrEPDpA6w4QKIcHNx7wXuPEKjn5ln1c8XZCOf2LdzUJnMZtA== 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=yqI7bGgWZSE+Q59gSlBIfS0knXrYQ5s0pO9A2whdfa4=; b=PQ1NFNbxC25sA0l3v4VFPzT5hkpkqRgSPS5/O2ceqB/vZdFXy9IxmwgKm0Qp2+ZNABb6wtUqAt6QRUMTSUSFnwxIRtQ7TZhRYMFiIUXUddnt9/WuXbC+ElhpckFU4dnHpjoVVIEWr3Ab8XM1YEgsfoUgSMCeTD27XXnWrpKoKV8qVvHEPYOYe6iyCFHhvFdwgYz7dxwUVi7EB4nLjdsxji3BeSysa4ZH372jxngRmVL3R+7TYezGjH4lv82TmviEtLjqpop5YsXxaJiuxIDqk8/5ibaAqsng2NxSMpyk0WscabkEDG2B1I2tfP/UIVim1U1A5XfJ9miQ9NqsYDyWOg== 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=yqI7bGgWZSE+Q59gSlBIfS0knXrYQ5s0pO9A2whdfa4=; b=OSwM8ooQTVzAb7MKjPJzQisTdSVGYNOpUdca8RFqVyQdmJobih4aqo0RwVGSsw+vXF/PGO+PR3EK1HHHuFOliktWMNx8qXKHfWW17SUKy9K1Adzvzker7v/8zlZuTEkvKDqVi9bJEF3K4mr3cLpy9TgoslBkJuoghwXtid1bpGk= 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 TYWPR01MB11379.jpnprd01.prod.outlook.com (2603:1096:400:3f7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Tue, 8 Aug 2023 22:56:53 +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.6652.028; Tue, 8 Aug 2023 22:56:53 +0000 Message-ID: <875y5pb0sr.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Ban Tao , Chen-Yu Tsai , Jaroslav Kysela , Jernej Skrabec , Liam Girdwood , Mark Brown , Samuel Holland , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 19/39] ASoC: sunxi: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87wmy5b0wt.wl-kuninori.morimoto.gx@renesas.com> References: <87wmy5b0wt.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 8 Aug 2023 22:56:52 +0000 X-ClientProxiedBy: TYCPR01CA0184.jpnprd01.prod.outlook.com (2603:1096:400:2b0::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: b86ecf09-5d34-4990-9ada-08db9862c1aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y3zARLJmfl06KWOq9s2RL9TVlYluzAGe/dC+YnHUtKG9L3ZVctaGZzmYcoK7VMvWZAychq178OEPu+c9rtpQ+dq/5OI01bkAuMimWXjELLoGfoQrGazWm7UuvtZs0OZmw9hjrban4SAU4crKZcOIR+Tke5ZwqpUCwibYhCkRpYgutcSyJ8zbUXj+iRcqjKWwqDEUWcC1zns2t6OA+/EF1tTDxQb/HMHLNEqzJGobKpyHzbUvOtSTN7zZkGGA+6bgeiGGOxugYLYq7c+7h4KXPb9SbwroXOr9cMm14YMLwIrN5FbelqCiEzjAAOOk7+3NxmfJJTMe4QaHDC2V3RUMKxihi12O3T6PZUtHlAUtwAg5ssrvneOIFEAUVEO4wakCRYQgSvIptsRRF2YNpDb/iN8IbvZpTxAW9lcbFg2TOSjNudNrRh8c+7HkJM3sDY5G5EqyG4e6Ht4nS9HMB7QCedpwbi/Eo3h+ntt9HSKVPAocreMf8gyr55VsMlcSPtDuoY4AFm2QXzt/Sr+O0hnaxdAvBu8ZqDvFPfqhyiZ9v4ktTsaB2bfLBywXboJVolToEfz6Xda6C7sSrR+MrFnxoDFZpngsjRvLBziSLSv6I8w6egp8GwuyWaCVIovCb7FE 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)(39860400002)(396003)(376002)(346002)(136003)(366004)(451199021)(1800799006)(186006)(5660300002)(8676002)(8936002)(7416002)(38100700002)(38350700002)(2906002)(86362001)(2616005)(52116002)(6486002)(110136005)(83380400001)(478600001)(6506007)(26005)(6512007)(36756003)(4326008)(41300700001)(316002)(66476007)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XMISlAiH/8qAmhOec0FKiiiqJBgl0xN5KMJvpxcavp5AARi6+5cmBQPR70RoroLSHXRd8X5DAyNrK9sVJPMI/OWMpcnzs2a5++lg52619sL83wzC8WeNXMFWSPGKotRYWiZufsrYJe1qeP9L5eW2vb3DNIu+aDbJHkWkRGw1y+4sa9jWUbE5ACanjaTczTw85NAsbyV4rDFdprdsFGQxowVmNVo4nMC7d3gBxCadUtcyd2HkpSX9CPYEJaBp+G/eevFA9NgmBGf4khX/sxMK4WTokW8zp/8tJtFi0bmtaKwC9lGzzYsc9EqGyiXRoJdhFvCYz4ycR0KwbcbCaA6EwKZDNHDtDKQ4dvdsFB36/DOSMxaB3Je7lRo0wp2d3Ll9xkbkR+V3DvyHp6+jQlyQPtNMzWJkich9BdhhxCyVBBAW4bWsvoTyJGCS0QuRCjrh3yzAV4yC5FtrIoUaeEPj7VdG69CU2o8yctfOySsucsnCF64FHrlQ5tYao/IBBKdaUTgdz5eJqUfkqEvNor6bYvAd9fSUEWUX0LRbPQC8XpfZWBrG8AibdYSHUj9p8RL/tmKjvCxTfjKRCyNt+/cORz4s10hnUrQTIfLTMs9hEYvbHj/zLKljFUquvS3wQTDjrS5tl8urM/lFzhxjAVPIJCm1ae+m0iQy66fY9w5OSiPe+vQ12NRfOTdOHPv3jKKiEE0RPDC3e5BRMqaCnvRPpPIGyZw5YDEmO9ekrx1k5x3usgg0UJWzDTrgxQBXHrN52kZWgY8KQMGJkcTnLFIlqt+Xw0M0TFD0VwagDce1HcTaM0nT4lVtaq7w6lArbMAnYeyvTJO+o8bmtkZ8jpZSCjAqM8b6ZNm+o+rbq/gwtA4p4mJ/eQs75vNYyOtS4moY2rgdMPl8/IbFl8gDjwhKBMhz1NGfYyLB8TTcdJRJPexxl+DR+WNg3kFt7WY2mTPys5IPIKWoqeJMApAYqs9MGFNKqRFRFQKbNQ6+Cw454lgJml2Nn8jfHKv/pANdXrSQlV4WFjW7VwJaQboD8zE8k+T0r6D1gLVjYF87LMoxoxxMTV8Y+uGhYSxU//Ei7T+axFYlFMC2+DDw8SekMPm+4bFJUpihBApUGOgLQgF/xBtU5N0x1VTMcBGsP4MXpHFXn/5YcV8l0s3iuU1FIgwFU5cEntnham4JSX7tQPVo+Gl/qdxRmWqsTAKWg85t7F7nWAH7GM9f2sf8oiLM9nTomgDASUHl6JC1K0kVBsetoTurVr5odW23HbgeabQWT0aNkdrfJ5yYOAFoxpdZaxMaZZfuTth8G+EIN45/QjHuhx5pwHacMiYTYZ6JAvAaCjosHbXuiDRvL+VSoigBqLYx8uES/ND97ocaOy8iXjVKDUQtHEyu0fOtPAU/RNNQOyTXzFXFn5PT8s7GX+DBf/gYlz6demTV59lFNh7yGHlyfpPIuKmNxMANG9ld72Xr5YtNRUX2HgejiRXBiTqJhGGgG/7NJGzWBUtRbhA4nmA8OH1l0zV1XKSV6XKO4ZzrepWl+Q4xYs8aF6d6IzSG4tKNdBnh/byVEG0YUv5YJDp2PTicba6HtBuoaLBqJJiFW9+SEB2heDYjakwIg8/khtn4I+rs1OzoCAb4YULhKZRMS44= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b86ecf09-5d34-4990-9ada-08db9862c1aa X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 22:56:53.3677 (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: 7bUnwKvVwwdCZ2l6XnONYK6cG7YIbcQpeBGbITz1z9dTM0CniIYn/sMRVM9DtcE8Pch8+4+8sFGiQ7ZWXpWrNjC7u9Jyr4sX+XF08xzWMtokbNXos0rspfOFpLTb6wy2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: 6RYJBYAN4TAN4HICTCOP2ICSXF3SQPGO X-Message-ID-Hash: 6RYJBYAN4TAN4HICTCOP2ICSXF3SQPGO 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 these into one. Signed-off-by: Kuninori Morimoto Reviewed-by: Jernej Skrabec --- sound/soc/sunxi/sun4i-codec.c | 6 +++++- sound/soc/sunxi/sun4i-i2s.c | 18 +++++++++--------- sound/soc/sunxi/sun4i-spdif.c | 2 +- sound/soc/sunxi/sun50i-dmic.c | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 55328850aef5..f0a5fd901101 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -1252,9 +1252,12 @@ static int sun4i_codec_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops dummy_dai_ops = { + .probe = sun4i_codec_dai_probe, +}; + static struct snd_soc_dai_driver dummy_cpu_dai = { .name = "sun4i-codec-cpu-dai", - .probe = sun4i_codec_dai_probe, .playback = { .stream_name = "Playback", .channels_min = 1, @@ -1271,6 +1274,7 @@ static struct snd_soc_dai_driver dummy_cpu_dai = { .formats = SUN4I_CODEC_FORMATS, .sig_bits = 24, }, + .ops = &dummy_dai_ops, }; static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev, diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 669d712bbe9f..5124b6c9ceb4 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -1081,14 +1081,6 @@ static int sun4i_i2s_set_tdm_slot(struct snd_soc_dai *dai, return 0; } -static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = { - .hw_params = sun4i_i2s_hw_params, - .set_fmt = sun4i_i2s_set_fmt, - .set_sysclk = sun4i_i2s_set_sysclk, - .set_tdm_slot = sun4i_i2s_set_tdm_slot, - .trigger = sun4i_i2s_trigger, -}; - static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai) { struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); @@ -1100,12 +1092,20 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = { + .probe = sun4i_i2s_dai_probe, + .hw_params = sun4i_i2s_hw_params, + .set_fmt = sun4i_i2s_set_fmt, + .set_sysclk = sun4i_i2s_set_sysclk, + .set_tdm_slot = sun4i_i2s_set_tdm_slot, + .trigger = sun4i_i2s_trigger, +}; + #define SUN4I_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S20_LE | \ SNDRV_PCM_FMTBIT_S24_LE) static struct snd_soc_dai_driver sun4i_i2s_dai = { - .probe = sun4i_i2s_dai_probe, .capture = { .stream_name = "Capture", .channels_min = 1, diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index ff18d4113aac..28bf6f4dca46 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -508,6 +508,7 @@ static int sun4i_spdif_soc_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops sun4i_spdif_dai_ops = { + .probe = sun4i_spdif_soc_dai_probe, .startup = sun4i_spdif_startup, .trigger = sun4i_spdif_trigger, .hw_params = sun4i_spdif_hw_params, @@ -533,7 +534,6 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { .rates = SUN4I_RATES, .formats = SUN4I_FORMATS, }, - .probe = sun4i_spdif_soc_dai_probe, .ops = &sun4i_spdif_dai_ops, .name = "spdif", }; diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c index c10439b9e0a2..2599683a582d 100644 --- a/sound/soc/sunxi/sun50i-dmic.c +++ b/sound/soc/sunxi/sun50i-dmic.c @@ -236,6 +236,7 @@ static int sun50i_dmic_soc_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops sun50i_dmic_dai_ops = { + .probe = sun50i_dmic_soc_dai_probe, .startup = sun50i_dmic_startup, .trigger = sun50i_dmic_trigger, .hw_params = sun50i_dmic_hw_params, @@ -260,7 +261,6 @@ static struct snd_soc_dai_driver sun50i_dmic_dai = { .formats = SUN50I_DMIC_FORMATS, .sig_bits = 21, }, - .probe = sun50i_dmic_soc_dai_probe, .ops = &sun50i_dmic_dai_ops, .name = "dmic", };