From patchwork Tue Aug 8 22:54:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711606 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 24F4FC001DB for ; Tue, 8 Aug 2023 22:56:30 +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 3ECA9836; Wed, 9 Aug 2023 00:55:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3ECA9836 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535387; bh=SNakYymuN4DdtR29CqOtH0Iu486Ro3vOVhA7lnmvzvE=; 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=Z0evkhOMbtfoCX6+v4uf6FXlMxsOEJEYxcIXz942AtHEaQaW0QMGbbeflLI4pGJQH xenopi68+j4Cs8o5ZyCGtV+WO16xNYfiRhd79TowtxtLigH6qUsu1N0HXbkaJwlVM1 yFIldd15ZrOPd/M72fyjGwzziWjP89MFGgMA7Tko= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 937BDF80549; Wed, 9 Aug 2023 00:55:06 +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 150F8F800FE; Wed, 9 Aug 2023 00:55:06 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BDEB9F80134; Wed, 9 Aug 2023 00:55:01 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20703.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::703]) (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 C6707F800FE for ; Wed, 9 Aug 2023 00:54:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C6707F800FE 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=g3xQX1U2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BtXdy9RiuGto51tnWo6Mcom2npQzkJC//lwIFtHbzhqFSgoMU4PeAdxo4GtOqLrKGDNbi2JcltWWFCLcEnnElakPnwGw6ZlM0YhvUj0Qy3WxmIA8f62BujrTy+BTKUkprBoHSAT1l3nSp33Aasx8lFgX/W6lkaATVv9luheLpacNw7LtUhWKt+SUiKkQjOATERR/QlM1ZLU/x2bkruYt1Q3LtDLWHPyPiSrtexbhfs4AHTJCo8ZRcJmSe6b6QQtItZGTfYUDp5r1nb3cSlmDUM/SWssnnpmpK2PTIm+olyg3B1t4tLb4tykO4fCH9kWUV5207K+gPEAaw550a5+tmA== 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=Zjlz7aganOewiybsIwTtVYbLt3D8p/SXFmfq1EhM7Hs=; b=Gcb2cnyJPcMXxFp/MrShbfxt7BiuxK8XZ7nchNQOLFUwA2hPgBQt7VsmlCUz6Ijaw7cLdzDCoI7sdu4Hf/m9HDmKen2oSwfiPeXa7sSex0+uS9s8SWLoqCWb31KyoDnuDpevaaIzqEU/2L0uyuFim/+wIpPH4AD4O0LQBeSSVZwf3yaeH9A9/yv4re4sPOhhvXoPg2Uq7PSN93o/B/9MKjgjm3rORT7sEwcMbR+cmdIFjPLwIYsVpNytBcNghf6ssN/VpzQEpGqaCbNTjhbvbEYJ5iD9E77po0v1YdSzSsgRb/7E7Wl4ynOj6Drmjc5inXzNX8sbVG93DSmDBT1Dhg== 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=Zjlz7aganOewiybsIwTtVYbLt3D8p/SXFmfq1EhM7Hs=; b=g3xQX1U2byoQ6iEkfpnEOlTJKRswpnbl/E13JMLjy6rXJQivZKKFFDcVRnWBzxQ32GF4XpF/Q0YgVPkDODpNjxiAioZVBRwNNlKF2BBPNwPv2fCh8n2G3jRLV7dwx4kv33jtXdmf3SUGPUmVEla9xBx3WQLGU3DeflYTgYLYU8U= 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 TYWPR01MB9524.jpnprd01.prod.outlook.com (2603:1096:400:19b::8) 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:54:50 +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:54:50 +0000 Message-ID: <87v8dpb0w6.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 01/39] ASoC: soc-dai.h: 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:54:50 +0000 X-ClientProxiedBy: TYCPR01CA0106.jpnprd01.prod.outlook.com (2603:1096:405:4::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_|TYWPR01MB9524:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c28602b-e4d6-42d1-5809-08db986278ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kxJZxbF57kL9/d+5naHfG2fnq8evdGOwC7joEeVWZbZhl/8KAY6AR196Scw1IeP1qY83kcRmoVzBovG0wkUkfTcoBKjoBMT4L0sm2REUtU2JlhApJJoE9OakHByBFSx92SppXdPna93io5M+uCQRYe0iOxT0mLnNSih5o6gh2C/7unMxZ22MecTg5GDAocImLp3Wf+TzHDoMvnvBJZ3S0DwnGzTTaI9Whkksdz5jUdwoSRxeZPtZuzTPzDyAyX3/SAX0qKUAIAt4KMfL3MgpbPbQhVBJdSyT2HpRNuSTfB2afJGdHLjpgLYNmpHhuQ0UK9uVWlw0SDrallG2mex/xEGt4kN3umBLvlZhxVjhFCzUV13mgUIMXTwFQx2WCHxthyzT7XxWF4Nvj0PyTQFQ8fdAIXiqVE1DlmRluUN6jq/T+l78ENauqll9vl8F3caTbuVNq42LT//mIC7d2ixFy4tS2lWj+90PKxA21EaxA4qU9RbLerh0w8KLjn7eMBPsatrZ0EMYjWTBy2prVzXtDWT053e0v9H2xTzo2Bwvfaf8mtanGfdpY79tB4grdJGhCdxWC3dOT21+2RRxdDhepxaUR7KoLqualfkRjtX3b7p43LMclYMEDCLZP/XGMKix 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)(376002)(39860400002)(366004)(136003)(346002)(396003)(451199021)(1800799006)(186006)(316002)(66946007)(66556008)(66476007)(4326008)(8676002)(8936002)(41300700001)(2616005)(83380400001)(86362001)(38350700002)(38100700002)(36756003)(52116002)(6512007)(6486002)(6506007)(26005)(478600001)(110136005)(2906002)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Dha4fXQoXqHFAN/1KHQtS/Q7hrUT6cEsqspEFAMobEMdobe/S5oG7wbItSHiuNG72OFUWfjl/0WAsTdo6qYt0gJkf/3UHxYtY03wuaUXq/2/k08HkmeCDD+cc0PChvq433HAgLAtLlLOZZ1NRfiZCH8fWMeq1YCKXjC92hsC9mddZh9ObR4hX8Mutx/tXBPTuPJR2ym78TjV8vHaQ6i/Vu9OCbKE+hMUGvRgHykabQ5LqQeju1eMICHdAcwY9BUJg6hdYowdynloZWgxkh5RNwJCzHQrs7GkvZa1nlbdD5h8fvns5Z1A/jRBFydE+kdT7sku4c8tpKVd4AnTMbRm864+M+LHMYTOXwAqiTW7NflhSiHnl/sPCRiTmXFujdNTkTPN+BGrDL0HC0echSW4hMJl0weasxF2tOTpyCcg1HvFLA1TH0Ha9dKNT8kxH4DxW4DY960+oiRHUjlFZShxgaaekeA8ZpeD4UoBy7N18LfgVO2bdidG/EWPLwbErhiz66SiiHJNFA0WtlnbsXQdMzskfmVHb8GLqavPWv+kvUqmVnlMZlKMttPIIGPBDVkAgWqeQKQLIRktGg761kNuA0ILYRmIBpzumFfN/Qhkc3Hdd6ZS3iyB7Ekvz9oB8HPLi/msDm+ovi/GlIjmu7l+cDm7VFQSR58CZNbtGyRY/nP98hcmBFJ0UjIbHrEAQOih4+qDjen4Bb4bu0MsmW2B03SXq8vzheXsfbTSnEXNeNb4dgAHEoXLkmNIIG/g3jMbxNKJPK0hKp74mvsF3B3BI0vpPP18G3PE1mvJISvU1dxSYh6IgdvRq9wZauPLX+s6VwPycLHiZEDJjApm6fkhYmxurJhxvj2bCZfAfMLyuvGnjR74g6ojG+KPZJNkrVrdbXBlioKRKVXO37+qfOICGuURKqZQZeeuwhSkPG2k1MUz/lea7NwlUgCV203xfGUs7iGueFylHlJlwcbfva7WSM5a3mwaM6m6iYulyg71lAjVEiOb3pmYkEHC4POW+T6KHYzTO27NhQ46cVkMO+0Zz0E1I+maZL8yj3Se/g24Lt+x54YmCD5+Ap3xdxd9REv5/OecPvRVd0l+NzfhoEMWN+wvlzby5JHEyOY9HVQcvSAI+FeWa6xOqegIcdtvqwaDr7boYNZYV7AsDCMEyEXoDWbdUCggYSjeZJAOT9tzTEBpt2ZNGTLlKgikNBPR73/UBOC4FCNNY1L8hfv5le5wxBJcsyyVj2/0CkBuq49uwo/xwQKJw1FEL5DB2vixb1w+l9/ho901WmqfGoChoPO/Qq/14y6apE0eY1ETuUpGz5Oq1H6tXOQvbgcJky88dJNuXzud2nlu80WdRbPuvuRnqgnwNcPzdHQMf9Dx0Kv+DKcd7zgplgM94ltc5BS0dACHRmGQr9vv+GB2DmwwAMbu77zA5z3Do/JZ2W9fIbeSjF1i0RdzXuQsz45ilyCKnfpJNuWE5TCWGEeOZBTMXBbRqRms79RmN+8Uo8MzK0p4rpbkT6yWkzR6bYVeqJ0hZ77rifiu3pKxth1eIgwu6EVQbNQ3Jgv3TI7K/jbsMD/a4PMvMe5JTFnKuaAUwxyAXM+rHJhYssIfBJ1jXo6ZCrC5olSabnC0KEkG2prio+9mEac= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c28602b-e4d6-42d1-5809-08db986278ac 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:54:50.3359 (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: VF0vSg8sJOs3pgwBR6c3rw75nSgZW8Zn/sE9/uteArHdA8QcxX92GLslyCgWbK7Byxt45b3AxJ1POd8pKR/oCATk2wtjkjaps2FbTLgn08+MlXTBODV/7dy4pAeD5Dg3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9524 Message-ID-Hash: BI46CMEMBALQX6HGDOJHW5ZSHMXJMEK4 X-Message-ID-Hash: BI46CMEMBALQX6HGDOJHW5ZSHMXJMEK4 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: snd_soc_dai_driver has .ops for call back functions (A), but it also has other call back functions (B). It is duplicated and confusable. struct snd_soc_dai_driver { ... ^ int (*probe)(...); | int (*remove)(...); (B) int (*compress_new)(...); | int (*pcm_new)(...); v ... (A) const struct snd_soc_dai_ops *ops; ... } This patch merges (B) into (A). Signed-off-by: Kuninori Morimoto --- include/sound/soc-dai.h | 13 ++++++++ sound/soc/generic/audio-graph-card.c | 2 +- sound/soc/soc-core.c | 25 ++++++++++++++++ sound/soc/soc-dai.c | 44 ++++++++++++++++------------ 4 files changed, 64 insertions(+), 20 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index a33d803fe548..85f897fea21a 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -274,6 +274,15 @@ int snd_soc_dai_compr_get_metadata(struct snd_soc_dai *dai, const char *snd_soc_dai_name_get(struct snd_soc_dai *dai); struct snd_soc_dai_ops { + /* DAI driver callbacks */ + int (*probe)(struct snd_soc_dai *dai); + int (*remove)(struct snd_soc_dai *dai); + /* compress dai */ + int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num); + /* Optional Callback used at pcm creation*/ + int (*pcm_new)(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_dai *dai); + /* * DAI clocking configuration, all optional. * Called by soc_card drivers, normally in their hw_params. @@ -355,6 +364,10 @@ struct snd_soc_dai_ops { u64 *auto_selectable_formats; int num_auto_selectable_formats; + /* probe ordering - for components with runtime dependencies */ + int probe_order; + int remove_order; + /* bit field */ unsigned int no_capture_mute:1; }; diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 0b8258b6bd8e..13693ef9c242 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -60,7 +60,7 @@ static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc) struct snd_soc_dai *dai = snd_soc_find_dai_with_mutex(dlc); if (dai && (dai->component->driver->pcm_construct || - dai->driver->pcm_new)) + (dai->driver->ops && dai->driver->ops->pcm_new))) return true; return false; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a5b96c17633a..7dbf37e0ba2f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2510,6 +2510,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, { struct device *dev = component->dev; struct snd_soc_dai *dai; + struct snd_soc_dai_ops *ops; /* REMOVE ME */ lockdep_assert_held(&client_mutex); @@ -2538,6 +2539,30 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, if (!dai->name) return NULL; + /* REMOVE ME */ + if (dai_drv->probe || + dai_drv->remove || + dai_drv->compress_new || + dai_drv->pcm_new || + dai_drv->probe_order || + dai_drv->remove_order) { + + ops = devm_kzalloc(dev, sizeof(struct snd_soc_dai_ops), GFP_KERNEL); + if (!ops) + return NULL; + if (dai_drv->ops) + memcpy(ops, dai_drv->ops, sizeof(struct snd_soc_dai_ops)); + + ops->probe = dai_drv->probe; + ops->remove = dai_drv->remove; + ops->compress_new = dai_drv->compress_new; + ops->pcm_new = dai_drv->pcm_new; + ops->probe_order = dai_drv->probe_order; + ops->remove_order = dai_drv->remove_order; + + dai_drv->ops = ops; + } + dai->component = component; dai->dev = dev; dai->driver = dai_drv; diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 73a97ac6ccb8..3f33f0630ad8 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -460,8 +460,9 @@ int snd_soc_dai_compress_new(struct snd_soc_dai *dai, struct snd_soc_pcm_runtime *rtd, int num) { int ret = -ENOTSUPP; - if (dai->driver->compress_new) - ret = dai->driver->compress_new(rtd, num); + if (dai->driver->ops && + dai->driver->ops->compress_new) + ret = dai->driver->ops->compress_new(rtd, num); return soc_dai_ret(dai, ret); } @@ -545,19 +546,20 @@ int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order) int i; for_each_rtd_dais(rtd, i, dai) { - if (dai->driver->probe_order != order) - continue; - if (dai->probed) continue; - if (dai->driver->probe) { - int ret = dai->driver->probe(dai); + if (dai->driver->ops) { + if (dai->driver->ops->probe_order != order) + continue; - if (ret < 0) - return soc_dai_ret(dai, ret); - } + if (dai->driver->ops->probe) { + int ret = dai->driver->ops->probe(dai); + if (ret < 0) + return soc_dai_ret(dai, ret); + } + } dai->probed = 1; } @@ -570,16 +572,19 @@ int snd_soc_pcm_dai_remove(struct snd_soc_pcm_runtime *rtd, int order) int i, r, ret = 0; for_each_rtd_dais(rtd, i, dai) { - if (dai->driver->remove_order != order) + if (!dai->probed) continue; - if (dai->probed && - dai->driver->remove) { - r = dai->driver->remove(dai); - if (r < 0) - ret = r; /* use last error */ - } + if (dai->driver->ops) { + if (dai->driver->ops->remove_order != order) + continue; + if (dai->driver->ops->remove) { + r = dai->driver->ops->remove(dai); + if (r < 0) + ret = r; /* use last error */ + } + } dai->probed = 0; } @@ -592,8 +597,9 @@ int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd) int i; for_each_rtd_dais(rtd, i, dai) { - if (dai->driver->pcm_new) { - int ret = dai->driver->pcm_new(rtd, dai); + if (dai->driver->ops && + dai->driver->ops->pcm_new) { + int ret = dai->driver->ops->pcm_new(rtd, dai); if (ret < 0) return soc_dai_ret(dai, ret); } From patchwork Tue Aug 8 22:54:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711982 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 9ECADC001DB for ; Tue, 8 Aug 2023 22:56: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 48B1B868; Wed, 9 Aug 2023 00:55:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 48B1B868 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535407; bh=i9xwK3z43h5dEes4w1l8PyxpQp11HCX/Wo6lsJQYnzI=; 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=DTkpC4wN4/0E0KujPMKN3z6Nn2YLl8AWfgNInT0OQEjNzVGpcUeRl8BpodB/UqPYJ JJCpEYnSTDpHosJPBRzvznDD2KUmm1iQ2cl1/mV2Xj6hH8heMCNDGCUpthJ1vyrXuD 7ei19nHZDGXG/k8uCvzJ8MivvVzmqC4LEb2nLpKM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5E2C7F801EB; Wed, 9 Aug 2023 00:55: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 BAB20F801EB; Wed, 9 Aug 2023 00:55:15 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E4B41F80564; Wed, 9 Aug 2023 00:55:12 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071c.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::71c]) (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 62B4EF80552 for ; Wed, 9 Aug 2023 00:55:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 62B4EF80552 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=a9Uq22hS ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hQ4s2M2e3eahjZZNu2ScT4u6PEJm0Ady8ptBsjJWkEXUfGiQh6PJS6qBMZeUu/NxWjSY5iVnrXQkgysXUI26vIeFFWe6v8QeT5WAl3yVm6TW80NL5pdS2lw5KUm0G7O0HTZRcx9F/o+g4ENAXPMsneTYx7QDi3ptZaqxO47NjhHUJp76uauryn8OctADXS3T/Mkdg0C5KdUx3T1YBjSZaeJMKBCfcARMibD/vHSEdsLHy5eS9ubYDeaUF3ZAFf3/pk6rEBW6ko+XXHHIb1w//OArCSlxO3I9Y8oW/9/9m2SBFXateMPBdi1OnPLnD5bqb5XAw4YuvnpOnXj+sazrHw== 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=RdkS+zllRPE8lnPiO4u2KTsg6XraR5NksAuD20oXy94=; b=fqXkKJIEnJE6J/6Kay8vRgzH1GBTr+WvbHbGbEeOnow9R96YvFGC9A5V8VwPyWXWZA9j6HdkJ9w7exAehmXDI3gca3DKzf12LEAUG1WHZpbZ/AeJhE6HOo2lLnLeO9Sh1ITXvlx+sUeqGKtVYrminppBGNnst/oNJNAltBvSo+xdnNOCWYiB8p2dFkXqQShxmFtMdr8GMdw7a1q6Ji0JWrLfohgR78F8lsthTHI3FqZx69+tXKDXgHUpB6BNB7XLFtiQYQB5dkK1gZ2TmkilHK1a0LtkFzQIox++TcaUMan4yxzXG1hTMheRWWJVsZxffRA5FnwFxmezPo6+Ia5b4w== 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=RdkS+zllRPE8lnPiO4u2KTsg6XraR5NksAuD20oXy94=; b=a9Uq22hS2MYG+AYyW+MF0LkAqeuEHo5l0mwmC5/Mtf8GafNd30KibFI1+fnd01JanMRty72bUJziEiF/ntnx6yp62ekHSIe/D/DLkq8JsTi+SlbkvzlWCdVpQN+2n1od2b2KaZsCVMCTQ9zJeuFIbjzYIgVlat2V4tpABiavYW8= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:00 +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:55:00 +0000 Message-ID: <87ttt9b0vw.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jarkko Nikula , Jaroslav Kysela , Liam Girdwood , Mark Brown , Peter Ujfalusi , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 02/39] ASoC: ti: 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:54:59 +0000 X-ClientProxiedBy: TYCPR01CA0123.jpnprd01.prod.outlook.com (2603:1096:400:26d::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 130e7cf6-8cfa-4911-6998-08db98627e98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1pIeeLLMvv8YQ+EPHs52+iud5+K7kDcYv252w+abwQK+/0qE5OE/0DkmSb3SwNVTtzfGbwDGa280tZrPiQPl2IGW4s0sTxBxAaTRr6We3f1Jy2jMBu4J+AD+q/S81iP5naJCYf6dkmGCoLuVBV52koXh0ygZzljKnFP1Yzo1YR++sG6m6eQ3iNVKJsz7H3EgZDDTR9G9+iauofKu206TznnAxhCSfrDzyGEeNAoFzjk/3GGC5SDKQKla7mvChzKk0AdFw/KnU0+4dkaDs2emSwRKzL2i0wvF9bGr6MExIwjVO8ocFM3qBftXrH6Un3D7MQz4bauHFUHGOC3eVdC5bdxPK1P1WEFhqLptj0ULXunx+jSjanVL+UEFexUMxEJ6nkAGBwS8zdwdhPWiJqw20+nff8jrPEkT0SZ/OedyTD/+ayfb46taXi0BDIEHcd8vYPaOD6T1qtilOjRZRKZaTEtFJG88VMg/IBUhF6/X5hxMBhLLH81N4bOU27SzoMfR18VP3bQFgNWOW4kudRGtmxAgF9DnuqshyVcT7oLQhCTVte8pywFpiefH0A126+UHsQFJnSujN3ZtfdUP4L7BIziFr3+T+xFmOJK3i6awvGl4FMJ/nyGV3pVqS8NTWw+y 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wM24+jGnupT0lfdkD7ljk/DZl/cc+WJh+QMLhLMprvpb+sHtcxJnKqrfuJeIgykaBegBGiFV5TEkd2qZlJHqaHrNqrbpGKynI6aknK1byWSApR4nuXetTkE4DbTmjmpw/nBpIk2FhbcFWwcJK0KFZILFvBZbELshu+BO2bZk+kF2ChmZIXv8wb3YMdR+TDawy2Yl7PmAiyqctZMNlfkGZSQ95Yop4zS0bX/q5CbHagFgvr+okwO4c7H3NZe6q9bAs8/fhilx0KTHgl1S8Yqndv9gyK4t+MmhYz3mhJzDRrvVKBCbbg4A/h/DIGNir0WiNqM8U715u1pudd6TCfz6eL2yFH2cnlSjsPwF9HfHc5JqpWZLpuD6iPpeHovfXyDWbxafCWBou06X1fwwNXdQ8K0NfZ6YHPXtkI9qf4yE4W20E7cAdLNU6f9msCGkKqMeyX9PcYFe3Jhic1+YYe0vfyDjaOKtmvjuJ1bdNhE+MEXVsgjawFOheAfFhVGglj/B6It3JrN7L629xJqstrrhIMpASVvTW/a54jug0kW7CIfZGPqpjbxX15GMA3yVHmltOa5Jxdm8/W80iV7l3TeYghZBHViUAXjBZ5pjMvRGOaWq349GIuTxqzhshMUW8KpSacyGw01GNthq9gda9FShgp8d1zUtolobvfBc0zyKpVe8/z0akwY3sqJCKnczZ1rR9unCzF/I7XWdQKxlY9KZQFN/00YzNuXW/herUlXm7nVanQQC/yHA1kWvHxRJrz+aP/QtwGrKJ2anD5Ub7hXkfsNPPcgUpiJSpYci9P0DWSCz0lUYDTQyMJxwrDWKCUNRpD6a8qOnYeHTCpb+IEEuDptWVIEoOBQshqGOIYOsPZzl9E1+l2a33qUjRTGKrCiKjlmaUoSWlHvjmOVMMngwlBpQ16/RkZb69ZSJmqFvQYl9iUaAz52MgSxvWtgKA3qGK9VTUXTb+5tjtf9RHOH+0W3gDQJ5mufLLWgwVQRgi2QkMRUGHkVM1fqmgN7cCk+Rbn2jHgr6qgZflHIDmqNaoVojoudq890vpgK16BPA4qumSiLM5Sfflm2YT7LLp27CfFK6Z1l0PRjqCj7W4sdBjaEoMSgBdle22qW4RuRnbtNYBxK2c+r2XxkVhc/VvplcydBte8s9Ct7d1+Wirs5o90x3cHYvuPyY7k5WvwcXAbXY73YhykjM4WZeTP4s48UID0QZEybuXNMYIMnZsb33c2PUX1Wv9A9bHJGP/AJfmyB6PFvP7rAaUX9L1WNmm8L3ostuLb3+sgUY+tKZi1hRQC+Vdwr5UApj99/4Gdm4r1kimEOG9OuN4xV6wuUH3ePeWw2Z8Sy9Y4t9t4y1NuH1YE6S0l8uk4h4Ff2M9Z045phSO3T4uWD2CEKkd0jjDmTrL1Oa0jxfzsKsEdroyltslyHZS6pErcPxphoQVJsMk7kUWCVEPUm+LJBNBbkJNbtL68oY32E/V/8Q8x9bZPxv7NgoM6Xb2r3+hzdsfRe+Fk9NMifdpoCVtDvs/NrRtlJBkGovOvjs7CPxtpbctpRyb/aZXa/AWPRK+2u8vVTA26HmOxPfQUL6qLEtXtugTDpNy+3tNVOM2MUFRndPE94iYdyeTOxJNoDXBt1HnFBMWpI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 130e7cf6-8cfa-4911-6998-08db98627e98 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:55:00.2202 (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: 6wq5Rwhn0xOdvrp1jIQoKp0/krDhP42km4iq9vtpwjXp0Kvd/N23bG9JwydUOf8OkGV24bBgmsxbbGI2DPr0RmaUfNLGOJiQ3auBUeyCeCgGVv4JYNfWiGVDR22lafH5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: XGD5VL4IX3UALOQTUC5TLOPSIEQ3MSZ2 X-Message-ID-Hash: XGD5VL4IX3UALOQTUC5TLOPSIEQ3MSZ2 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 --- sound/soc/ti/davinci-i2s.c | 22 +++++++++++----------- sound/soc/ti/davinci-mcasp.c | 27 +++++++++++++-------------- sound/soc/ti/omap-dmic.c | 22 +++++++++++----------- sound/soc/ti/omap-mcbsp.c | 28 ++++++++++++++-------------- sound/soc/ti/omap-mcpdm.c | 22 +++++++++++----------- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c index 97dd1634b6be..07c8b2259208 100644 --- a/sound/soc/ti/davinci-i2s.c +++ b/sound/soc/ti/davinci-i2s.c @@ -601,16 +601,6 @@ static void davinci_i2s_shutdown(struct snd_pcm_substream *substream, #define DAVINCI_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S32_LE) -static const struct snd_soc_dai_ops davinci_i2s_dai_ops = { - .shutdown = davinci_i2s_shutdown, - .prepare = davinci_i2s_prepare, - .trigger = davinci_i2s_trigger, - .hw_params = davinci_i2s_hw_params, - .set_fmt = davinci_i2s_set_dai_fmt, - .set_clkdiv = davinci_i2s_dai_set_clkdiv, - -}; - static int davinci_i2s_dai_probe(struct snd_soc_dai *dai) { struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); @@ -622,8 +612,18 @@ static int davinci_i2s_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops davinci_i2s_dai_ops = { + .probe = davinci_i2s_dai_probe, + .shutdown = davinci_i2s_shutdown, + .prepare = davinci_i2s_prepare, + .trigger = davinci_i2s_trigger, + .hw_params = davinci_i2s_hw_params, + .set_fmt = davinci_i2s_set_dai_fmt, + .set_clkdiv = davinci_i2s_dai_set_clkdiv, + +}; + static struct snd_soc_dai_driver davinci_i2s_dai = { - .probe = davinci_i2s_dai_probe, .playback = { .channels_min = 2, .channels_max = 2, diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 172fea764a31..7e7d665a5504 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1616,18 +1616,6 @@ static void davinci_mcasp_shutdown(struct snd_pcm_substream *substream, } } -static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = { - .startup = davinci_mcasp_startup, - .shutdown = davinci_mcasp_shutdown, - .trigger = davinci_mcasp_trigger, - .delay = davinci_mcasp_delay, - .hw_params = davinci_mcasp_hw_params, - .set_fmt = davinci_mcasp_set_dai_fmt, - .set_clkdiv = davinci_mcasp_set_clkdiv, - .set_sysclk = davinci_mcasp_set_sysclk, - .set_tdm_slot = davinci_mcasp_set_tdm_slot, -}; - static int davinci_mcasp_iec958_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -1716,6 +1704,19 @@ static int davinci_mcasp_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = { + .probe = davinci_mcasp_dai_probe, + .startup = davinci_mcasp_startup, + .shutdown = davinci_mcasp_shutdown, + .trigger = davinci_mcasp_trigger, + .delay = davinci_mcasp_delay, + .hw_params = davinci_mcasp_hw_params, + .set_fmt = davinci_mcasp_set_dai_fmt, + .set_clkdiv = davinci_mcasp_set_clkdiv, + .set_sysclk = davinci_mcasp_set_sysclk, + .set_tdm_slot = davinci_mcasp_set_tdm_slot, +}; + #define DAVINCI_MCASP_RATES SNDRV_PCM_RATE_8000_192000 #define DAVINCI_MCASP_PCM_FMTS (SNDRV_PCM_FMTBIT_S8 | \ @@ -1732,7 +1733,6 @@ static int davinci_mcasp_dai_probe(struct snd_soc_dai *dai) static struct snd_soc_dai_driver davinci_mcasp_dai[] = { { .name = "davinci-mcasp.0", - .probe = davinci_mcasp_dai_probe, .playback = { .stream_name = "IIS Playback", .channels_min = 1, @@ -1753,7 +1753,6 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = { }, { .name = "davinci-mcasp.1", - .probe = davinci_mcasp_dai_probe, .playback = { .stream_name = "DIT Playback", .channels_min = 1, diff --git a/sound/soc/ti/omap-dmic.c b/sound/soc/ti/omap-dmic.c index cb60af36dbc3..5b5eccf303ab 100644 --- a/sound/soc/ti/omap-dmic.c +++ b/sound/soc/ti/omap-dmic.c @@ -401,15 +401,6 @@ static int omap_dmic_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, return -EINVAL; } -static const struct snd_soc_dai_ops omap_dmic_dai_ops = { - .startup = omap_dmic_dai_startup, - .shutdown = omap_dmic_dai_shutdown, - .hw_params = omap_dmic_dai_hw_params, - .prepare = omap_dmic_dai_prepare, - .trigger = omap_dmic_dai_trigger, - .set_sysclk = omap_dmic_set_dai_sysclk, -}; - static int omap_dmic_probe(struct snd_soc_dai *dai) { struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai); @@ -438,10 +429,19 @@ static int omap_dmic_remove(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops omap_dmic_dai_ops = { + .probe = omap_dmic_probe, + .remove = omap_dmic_remove, + .startup = omap_dmic_dai_startup, + .shutdown = omap_dmic_dai_shutdown, + .hw_params = omap_dmic_dai_hw_params, + .prepare = omap_dmic_dai_prepare, + .trigger = omap_dmic_dai_trigger, + .set_sysclk = omap_dmic_set_dai_sysclk, +}; + static struct snd_soc_dai_driver omap_dmic_dai = { .name = "omap-dmic", - .probe = omap_dmic_probe, - .remove = omap_dmic_remove, .capture = { .channels_min = 2, .channels_max = 6, diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index f9fe96b61852..fdabed5133e8 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -1254,18 +1254,6 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, return err; } -static const struct snd_soc_dai_ops mcbsp_dai_ops = { - .startup = omap_mcbsp_dai_startup, - .shutdown = omap_mcbsp_dai_shutdown, - .prepare = omap_mcbsp_dai_prepare, - .trigger = omap_mcbsp_dai_trigger, - .delay = omap_mcbsp_dai_delay, - .hw_params = omap_mcbsp_dai_hw_params, - .set_fmt = omap_mcbsp_dai_set_dai_fmt, - .set_clkdiv = omap_mcbsp_dai_set_clkdiv, - .set_sysclk = omap_mcbsp_dai_set_dai_sysclk, -}; - static int omap_mcbsp_probe(struct snd_soc_dai *dai) { struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(dai); @@ -1288,9 +1276,21 @@ static int omap_mcbsp_remove(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops mcbsp_dai_ops = { + .probe = omap_mcbsp_probe, + .remove = omap_mcbsp_remove, + .startup = omap_mcbsp_dai_startup, + .shutdown = omap_mcbsp_dai_shutdown, + .prepare = omap_mcbsp_dai_prepare, + .trigger = omap_mcbsp_dai_trigger, + .delay = omap_mcbsp_dai_delay, + .hw_params = omap_mcbsp_dai_hw_params, + .set_fmt = omap_mcbsp_dai_set_dai_fmt, + .set_clkdiv = omap_mcbsp_dai_set_clkdiv, + .set_sysclk = omap_mcbsp_dai_set_dai_sysclk, +}; + static struct snd_soc_dai_driver omap_mcbsp_dai = { - .probe = omap_mcbsp_probe, - .remove = omap_mcbsp_remove, .playback = { .channels_min = 1, .channels_max = 16, diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c index 35deceb73427..d7d9f708f1fd 100644 --- a/sound/soc/ti/omap-mcpdm.c +++ b/sound/soc/ti/omap-mcpdm.c @@ -404,13 +404,6 @@ static int omap_mcpdm_prepare(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops omap_mcpdm_dai_ops = { - .startup = omap_mcpdm_dai_startup, - .shutdown = omap_mcpdm_dai_shutdown, - .hw_params = omap_mcpdm_dai_hw_params, - .prepare = omap_mcpdm_prepare, -}; - static int omap_mcpdm_probe(struct snd_soc_dai *dai) { struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); @@ -457,6 +450,17 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops omap_mcpdm_dai_ops = { + .probe = omap_mcpdm_probe, + .remove = omap_mcpdm_remove, + .startup = omap_mcpdm_dai_startup, + .shutdown = omap_mcpdm_dai_shutdown, + .hw_params = omap_mcpdm_dai_hw_params, + .prepare = omap_mcpdm_prepare, + .probe_order = SND_SOC_COMP_ORDER_LATE, + .remove_order = SND_SOC_COMP_ORDER_EARLY, +}; + #ifdef CONFIG_PM_SLEEP static int omap_mcpdm_suspend(struct snd_soc_component *component) { @@ -502,10 +506,6 @@ static int omap_mcpdm_resume(struct snd_soc_component *component) #define OMAP_MCPDM_FORMATS SNDRV_PCM_FMTBIT_S32_LE static struct snd_soc_dai_driver omap_mcpdm_dai = { - .probe = omap_mcpdm_probe, - .remove = omap_mcpdm_remove, - .probe_order = SND_SOC_COMP_ORDER_LATE, - .remove_order = SND_SOC_COMP_ORDER_EARLY, .playback = { .channels_min = 1, .channels_max = 5, From patchwork Tue Aug 8 22:55:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711605 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 0F01EC04A94 for ; Tue, 8 Aug 2023 22:56:52 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CF1B7A4D; Wed, 9 Aug 2023 00:55:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CF1B7A4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535408; bh=LI0bIF24+gEctrVEj8GdSI0EPBPCOsaSxOwYherdkJQ=; 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=shnnYQr36baeSxrCRulhfMfo+uIGpTjAsRdxfXGNhtOST9scJg8bYF1slbAt/hH0l dowHNFshBk65xT098c6jAnzVYdbhKaGtgN1xHMnR8nZJY6065z1P37bP+SX3406i0L T2lvZ2cLuAyiHsuz1o8dHfaBIyVnbDzpMbnzUIuk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DECF3F80587; Wed, 9 Aug 2023 00:55:18 +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 4B203F8057A; Wed, 9 Aug 2023 00:55:18 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5AE29F80563; Wed, 9 Aug 2023 00:55:14 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071c.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::71c]) (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 71E4BF801EB for ; Wed, 9 Aug 2023 00:55:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 71E4BF801EB 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=jsWIdkOj ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ry/nu2vSG/xX5vAEcM47567kqnolQMkxlTJLwpUa5H1ePZlln8yxLufZ0vSbLN94WuYGF1btLGPhJnfgJPdprfn2PUh5U0wZl5OwIfGueVB/mmady7xEaWgVHIBWkGyShfgtW746s0mns6VQjVp6XEgE74gcwENRVM6Xw3XwsSB6jneq2GgSX87i2xbhy7B6W5g1VN8opvthP8M1M9MPCa0d9l2qWjpCVgHq0tvaVsjT3k6JFLCyLkI0GOJqbnapFvrY8DG5hneEkfUg3y2UeH5Cum4kwZB1eqrwo+EOHhOmn1DST7nKrDqJN5bbBe2H2xq3GoY3LJSt7fXatUUuFg== 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=TPeiaoIIsUlnzYISvND8Dxao19NtK6Bf90KX570XmGc=; b=K0lPw1H0Lp7+PBYuFIBzCvlnoYzAw4u0dMd1HAMUDFyhc8ggQm/h1i6Rx0xs00LKb9KhDXIztzZnV5BUskF2/UQuwGd/PjCu6A/ya+i4ps5UnpLd1LIbE/05VlC4XGApzZi0rwMbvaPfgwziVEygFYbSv017FvljxiG+mNckP35YcNX5Fq+guYMzZSbRLr6QGR6KofAd4EXsg99oib7FDloOAkZ6PBssUgE7U94Ur6kN/PIzUqV9uvEVoAyfyCFSKAg6qL9a5Tua5eaE8747byixAWG438djKjQnBWALh9PK9RU7f66p/6ZQppiodv5ucvx/F0NFaGYpcfMXSHVuSw== 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=TPeiaoIIsUlnzYISvND8Dxao19NtK6Bf90KX570XmGc=; b=jsWIdkOjKiGWt7pfCgJn2hLTU7uRse/vbOObIxrDzqZ1B1u0o/V76e6KHgvbAO/dLqn3kAmO1LSrv5MYNNxnPo/HnxAw0brgiJoneBONFIfXRvplIfp7U0ZfMHbqZHRqvQmWqN0TbwigK0IF0J/svC3GsX7zjuxWVvuth/dNJdU= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:07 +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:55:07 +0000 Message-ID: <87sf8tb0vp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 03/39] ASoC: adi: 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:55:06 +0000 X-ClientProxiedBy: TYCP286CA0031.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: c784a06d-d2ea-4973-7fb2-08db986282ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PRq2k/ShDcdDE2Npyi5WAnehb4n+kQ44ECBoXTOo/zvJzsBBR3I43Ftr/1i/jMlQteMLzC/xWtuBNodB58MNM69XwGxVX90L69kDkJYf4WzZwPIvleMinz5dQdM762UuhLeNnmhG0Bfuhnhs2LSaJ/w6kYmMMhzjbpF65AuXWD7K6XzoUC6rhenxLzFjDr7XlrLDcj9hZtK4wyWqwN7tNBQia9NdEHDQnS28uUTAhhmifkFb9kDERMT1j8X0UgQQJ2Xx53YkzFgdFnoGiDpMiMW0hihLS01sHwZ7y2Tl1mKBDj1pwrU13W/evk3lLWrFwHuUxaS4510q1Bxth/XEWaYC7UoSpgBygiVACffZsAt8otz0iZsC41PBYmG5FNVoXWReJTsW5p9/0MXcDDYQ2VDMKDKM8IuGagrWWdPNA5YCZOqTYyDx5Iw7mplVVQ6yldZkxlbYrkP0GQKJYOYO67yv/rdVV3tOdjqnZvUQk9ScqIl2LQ5Ytl/stCTfla3g89QckMOHI+Rnd7/d4LAVJTPbLCYSMDiTogGmuHSSsRIxLOPuuN4qal9KVTqgPRaU0kdxXkhlGkzfRePE6GYT803bGompNNOhdzlPvq6XUjdAfrWfLnbVL7y+/MvZNHpu 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(4744005)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ytoFRUXGuYOD0igW3Hw7dWEIydSMuew7nF03Y8OoVAu/3uQyOQBCxXVREvry/0ctQz9RMju0KwBgyCp69GQ4//GnG0LfUaAYlRURaAIa0Prhv4myWI4UBRXz5loDUbfVsIn8OBJQmbOtzgrwfVHgcItHHM9ADEcnQ/QYPlm8xT/WCPJIYuV9VYvqk/YZOpnXDHIhl9xB8ni6hjvtOzv99nAKs+giuIH0M9FZmfNnKOFxm2udv9IFgf0nRnsVWJo0o6aREDvMg6dkVu1Usun52T/YzpyU0xEvJSrgi1F1xYkbimfIM4s1sm4SvQEd8DZn9NcjvkTzBBQARqG4fNBzmTUKVl6Q3rLzosY0acmlkx057pSXM5uMUdGu+9GIm2DAs/bChRXMCbtm5rMd//axpOueXKs8BHqrZq6+jHmJ3nzFISI8tbJwG2ffWoMlwAekzGgGSYWd0hhG2aeWzWWmwhLHlmnV54VN4al4sCucXKviAyqNuXiznZZMNyxwc8LLgSRsgxjcIfbKyPqSzHNPOVcWiT7S9Mkt+6BgP8E811omz1g4YfQFNo6Wd6lVlVHPvVwNUGnilKfqGgKtT7GOPbMDZTDKbsQ0HP5DjM7juzT+ZVAnYFVM6+o6kKWzWwBZMmTBzepbnI8CrSCAnCdlQYZA4Vxh3qy47NIoVyPWu2GNKWqiLOx7L5QkrSIRU/VgREmay9qfxjB5a1mG2KZYfbzGwZMS/LWc2Qa4E8z6FZGvwKJo/udAsLvSr1WRF+lNO3B2laA4qrvKvbEuE16zKi6EvjCfG2DCve5yk3aloZfVKAoJNCk2lBx1DEWk1IQYhvv6OYPss3wkC4Yg0kPYr6xf1FJedhqKYeQ3U57XDCZv/5pFYtkQh7/y6L6lL/XI2603mx+/2ZugUNqbATe4JuoHs0a8Br1iS4Enxzjo2mx3Ysc6TU9TKP98sKKUvrq1dHZdmmX/ywddSnS1pwJjb3vCjckgEKtudeDk1tS1rLyG1Jry52l5UKuFYDWWDovl6EnzaVAProoFnwvyQRzK85AwWAgRJMQLZTWvThyXD//0SSDTwf4PxSemlAkKqELnLsOmpAxW1J02CAMKNEbC5z3Lnba/sru8UNwWWTelHVNAYOqMSQ9jhfZfpvWOMSUZ51K1yXXQIGWnIHsImmcXngd7DRGDtdzEJ0vniJ5CouAH/CHpIVIU4c94RTRCyDSZwZAEtqZLOiJ9w3vY4ya3iXmHVj1682mByEWBrD26t6bwHpY9CCc6iHVVHBeoTmktjrKiya+UePHNY/I0tNYVbWAlp4C7MEPMukgItflE1lupHnyn4IbT3KzF+EBysKsIf+VhRBcAwthHsDHdPvM4tEEG7ttgk9tSSlzSruc2RnprU5MYYwRLuE2POEUQ9/I5haDMJic1ONkGYENgTmirAqfx0IlgguX0lk2U7l31Czc3DAZIZqoscrzkQwxkLgRY4zBI4RPcNbWczDNeh9rDPKue/LETA7CSV9iw9fRQr/zKQ/hszkjvcBr3QG7Pf4ZwPFdSOK1ErIs9CdaivqVLWVUVgrXgsnf4VzC9b/Rd/i892BY9yYW2GjuJOmZpyR05ZFNzFN2Sebo7h9UuIr3ExPac3gSmPJkTsPXI0sIkmKA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c784a06d-d2ea-4973-7fb2-08db986282ac 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:55:07.4539 (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: D2GZ4jO3CWeRN9J/xeNI2SioeWyAHvgWwBba0H1ITA+FVKQeFJbsyDjgrvifrLs9tupIBgZq1hSe67PmXxoQd0tvQbRjz39WzyB39yENZxadweZCTnjeaW5nX//XV5dz X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: LV5RTIVU5Z5YLAWQ44WI2IIGCH4QRJVI X-Message-ID-Hash: LV5RTIVU5Z5YLAWQ44WI2IIGCH4QRJVI 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 --- sound/soc/adi/axi-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c index d5b6f5187f8e..7b2563075743 100644 --- a/sound/soc/adi/axi-i2s.c +++ b/sound/soc/adi/axi-i2s.c @@ -147,6 +147,7 @@ static int axi_i2s_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops axi_i2s_dai_ops = { + .probe = axi_i2s_dai_probe, .startup = axi_i2s_startup, .shutdown = axi_i2s_shutdown, .trigger = axi_i2s_trigger, @@ -154,7 +155,6 @@ static const struct snd_soc_dai_ops axi_i2s_dai_ops = { }; static struct snd_soc_dai_driver axi_i2s_dai = { - .probe = axi_i2s_dai_probe, .ops = &axi_i2s_dai_ops, .symmetric_rate = 1, }; From patchwork Tue Aug 8 22:55:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711981 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 E1663C001DB for ; Tue, 8 Aug 2023 22:57:11 +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 2ED6F83E; Wed, 9 Aug 2023 00:56:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2ED6F83E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535429; bh=n9gd26c/nL3rLdUOiWqp9/HwE0u/pWPZzqW0WmiLEfw=; 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=W0MWhjbyUzjaPubZaia4ph8lGtJgGEwnXXvLa5haca6MuyZ3lVm0RHA8kvortpXYN FvIaDsTzPoVmjiR/J2wMhImtjCGAL/G5sCAcocyyF+AuVdDMDu3qSX6abuqep8gVjp dWiJpXnRNoMmbLHbpnXWm4ZqzXaEZEmW/3JQtPYQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 54AAFF805A1; Wed, 9 Aug 2023 00:55:30 +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 DA0FCF80589; Wed, 9 Aug 2023 00:55:29 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0C3E4F80589; Wed, 9 Aug 2023 00:55:26 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20726.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::726]) (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 454F7F80579 for ; Wed, 9 Aug 2023 00:55:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 454F7F80579 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=ZM1NZ1Rm ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tw89aFcoMAbPtupyVHFyVbSp5VOmsHLYKNipLSqgxraWfYXhGClujVDrG9KDBiYP6pFRdaU7jfq7ngwe3lo/qRWta+CpmI4htyzSTwjVbSBWOoxKx91TXonCoTjCDwGFCmDa4hxc7UsETwbVXoCCKAor3w24zyxNhlv85QaqLqXZH5t5xawNLDlylR8dHheOV3csSnl4NUFP2Wx4RtK5z10feu0tifu3RhA+ylJIm24fAgQg4WcNUJ9LLBzKKzMdb0nSyT3o++Ae5WHhKw78XlScpNvpN/uu5UcDJmdFfZ9B+09FNIg+fkXjRjFyHuMFiggxQSU7bMBdgEIJtUIlTQ== 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=AJylNVR5lMMjdUhxUlnECHIEPKz64CsRzx30Je7H+Pg=; b=b3OfhAZoOlK+IW6LA8rD1a00qMgiIH7NZIir5VpKo8sZdecIue7m3qNiuSrb3ZBwN1ZCpCNF+TGKiXK8ORjcqjD/PUVDxZR8c7CnBmY2qH3YWgLx0D2lQQWbE/Nk0mpbRNn13rsKch509Qimk9SKPZb4ae46VNAZFbNlhGPOFeADLaqMmVzie3ykOGPJEcjEo2Vs4GvVrOgGtAbNjTgvjaPStJ6v4QKIS2xMGj27CmfX+KPfmQd3fSmBUOjE/57gr5cVTp6n9g1QuNM08CfXUgFBQqYSoF+BQN+i1tsM+ySSUPUl87uyKbwNR8VQQ7e5sewnWBg3eq1B3WZYKNFqqw== 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=AJylNVR5lMMjdUhxUlnECHIEPKz64CsRzx30Je7H+Pg=; b=ZM1NZ1RmA4CmJVM9Bht2vOgBRul2YaG7+/I0woFTsqXVPzQZP/4fnmp3jvdIdh1/CBVzOjwJfMVJjnytBLWwSHSKIpSLufVHy9zbaLXIy/o/0ZaoaMO2XV2AB/LoYvVxMyi7ptbzop4yQZGXZpCe4g7j/SV/n4TYqDlJsUp3xzY= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:15 +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:55:15 +0000 Message-ID: <87r0odb0vg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 04/39] ASoC: adi: 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:55:15 +0000 X-ClientProxiedBy: TYWPR01CA0023.jpnprd01.prod.outlook.com (2603:1096:400:aa::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ea6245d-a958-4fd2-51c1-08db986287ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xwHi6/POzONPpotyNz0gnzvna3NpaVtEM0sDKL3s7rrWX7mogDCaf0JqRfcEXKRcSi/4UVW1bYNtPjb5NtMpYh+R0uXf2ezgkXIlCq1jNmrP7bKWzr+PTSKRJ9wmxoC6NdS9rXNmTcZp5SXQW8ukJIGO5pj+IV5uoBSMUX1qCmwXGWidNJh+PS+Q3CxUQRzGt7ltdLYutNCSCwkis/SSYhZagiuRAC/Eprih2xib1yUQ0+3vH7kydZAtLCup+lozsAZt5LITmrMMtJKr/GU1mp2z0M1/gg4JwFxiLYbcNDzfElThs1GmdaOot+r8y5PSGSOaF9hQ21adNMP3Zt8k1uZuklWO2VBx1FL7wftaf8gcHynSBmSLMPt0AxZKj0n9VfHpZKo3DpA5V9CSabSrFdazfksM75iaI9ubebd3vZHGn9CF4nwqgTzmdXEufW9fJC21xhz0BJi85+V+PgZASrNY3ds5c+pbma1O0ISwMIoVAmjUKYa+rY/qozj2p722FEWblgq6Lm0Ur6DZZrdADtJ+o/+kOLhENB46yjde0g00+7B9YH9Qki3lf/Uavx0EpadHCVp3K9SL+gtPKdyztm5wLYUElBaZ8DCnSmyAe6pABxCSH9yT1zDpvSvMJScW 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(4744005)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZUbY8npOECE82sTNkSVeomOyFU3zv5Ts3xm6c+5VAJlbnak90O1IPMVhcABcyDlLT2x8+vbjDnhcmQ+UZ4kRRfAS+tK0lqXLQKSiauawSUB8+o0lBh8eFM54UNSevnQOs98TcAGUpMYyERnEpjCsRI6hvpznf+jbDZSc3ppljUfNkQWwqrkzwMj3nfMptYaByho0clxhXxQu72g/RBoMeErwWaRTWk6Kx7CIm0R2ZZ+q/qsMl6obPFmzFqGvPIrcoXeOJ3LkvWDdZ7k19ihKNMEi4Ue1w0oNDdvzAhy8OrGNHJgbbiclArh+tKBhfV8zErVrbJdzFKHwivdJ2UOl00QLsvmSksIGx55e61eHH4JeeU2pkwCtIyISfRKYXubAm+U179cb8XwnGR0fVwBU0t5qQ4JOKO+Bndt6pxguk5u4zUTqrTxnB/3v5mitE/9lcNkiyCY1JrT5S4boH4KFigfNjW2KuIdLWElNfn+I/l4DeU3ZrMPoR60v7zWFzxVF6l/HcTgSTrWhL+s+AbyS16bc0881NgNz3Dz9rpCIdcNdkOeM/l1dPc/YOFFRNZd16AIy0RWXykhX9YFCIqn9BHDfeebuEDdPdiuXkNEnpgUSIGIKiOlP+7OjQZiInh/NRR/mIT8A7XdP0ewXPymEJWPbTVa3JCtUvhg5n2k71J5S661P8SQcEZlpJD5g6Sce5suutiFDNvWft/gtF2vLFwZ6LMw1PIKqa0f2M9xUwEEkwSFLfUNo2FaJDyovYuv+uEXuTI2NhbUSukp52/gMD9zb5qjeOTcei6wI6hITMIqhj7fUkh5gI24BMp5ZF4IKnteZOo+5ytoP9Bku3iYgMKDMwoU9bF/pyQ5EPUrWXfcbC4V5HjjQJPLyOHig0Y03dsCaslJFdIiI2OnQUJZN5uKBOg2NsP5pNfWIKQOSqXAbYPiklyR4MFbtMrj0hxNnxZ6Rn6H+KSoZ1MIdJN3AxLjudYL7N0oF4EIYJvW3phhpb5Tx5vcd4fiCVMCPUclj2TLikCArd6v07AAyhPcJtfT1erZVH6/qPB4DmbDKDnYbLtazOmOOscHlWDFdNuX8iBoaaQ0oNrjMBv2F1hSWamkEHVD5G6uCxD2BQi1T3F9mjXsfU1jGAT8rso3oDOffTAWg1ex/P0/XST+Ni7GAHj1cka9jaB49FSAMSmgWobTe6wjbMPGgDaIiEHUarNOdXe3XEcb1G3pP+EnBedsWobfXJcQbVNiV9ZtEEIaQaqZKeTWXSXP9GUej+NR73heZejjyk1EzaK+ff68RvFCo0Qt58OJUiPfBWqUscN790WVlC1FzYYp3f+e/dml0aIGqUfRvJ6RF0kefxU/ftu106DVEKgX4+if80t1ws7xBFWxZtVV/NvGYnfv/de7RsZEjRXDNwGL+O+dGfQXshGkDssGI0FN+1ODBnaE78lz954y6gxfFCZlbPRmV7A9uLNeKrfguGEiaLPG24U+Fv/3Sdc+GkTM9IAuiSInFIeiHyuHmcwfRc2mUJoiQle9FOaMkSZNCJ7csO1zU6nMcB0kMf5F7kPZ4WizNhfVGkr7R2v2GPol3NBhsSo5Gh7+Av2voldiPIrbQsjPuvl8fi3sNVgJhTmkRzzHOrEYmwNFoNeA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ea6245d-a958-4fd2-51c1-08db986287ef 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:55:15.8966 (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: t6FngVQ5j01y02eB1y2Ah92q5+XgVwj580MP3Sg4TqkcBKmBQIscy9oesP1Od9hnEl4za0QkabgPhAHZxTkR3at0ZyS+V1I98QCj2nBOy09KVqOYFD1IPKsSrN8oEFBn X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: X2XBAIVFLPHT4OSDWANN47NKXVIWKDHX X-Message-ID-Hash: X2XBAIVFLPHT4OSDWANN47NKXVIWKDHX 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 --- sound/soc/adi/axi-spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/adi/axi-spdif.c b/sound/soc/adi/axi-spdif.c index e4c99bbc9cdd..10545bd99704 100644 --- a/sound/soc/adi/axi-spdif.c +++ b/sound/soc/adi/axi-spdif.c @@ -148,6 +148,7 @@ static void axi_spdif_shutdown(struct snd_pcm_substream *substream, } static const struct snd_soc_dai_ops axi_spdif_dai_ops = { + .probe = axi_spdif_dai_probe, .startup = axi_spdif_startup, .shutdown = axi_spdif_shutdown, .trigger = axi_spdif_trigger, @@ -155,7 +156,6 @@ static const struct snd_soc_dai_ops axi_spdif_dai_ops = { }; static struct snd_soc_dai_driver axi_spdif_dai = { - .probe = axi_spdif_dai_probe, .playback = { .channels_min = 2, .channels_max = 2, From patchwork Tue Aug 8 22:55:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711604 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 CBE3EC001E0 for ; Tue, 8 Aug 2023 22:57:30 +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 D2615DF0; Wed, 9 Aug 2023 00:56:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D2615DF0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535448; bh=LCYK/1/6BWqejFL76Ga3ryvkO/tQWPvH2WASqt7z6ok=; 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=M48WmJbIKGxLTosgNdICJeJCzzgx62YfU9IKPQxrsue9E/qCTS0KQTR3BskDsumsM jmCKV4aGM5CnpcLYrZEhmDAHTD5dzPxgrnMT6K6yfraNeQuoeVZc/naMiQRwg8YfDk 4yGsyiJiUaF2O0PEa11Kp9IMaMe5RDoOktixdONI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 15BF8F805B2; Wed, 9 Aug 2023 00:55:32 +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 45C48F805AC; Wed, 9 Aug 2023 00:55:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 49A96F80589; Wed, 9 Aug 2023 00:55:29 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20726.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::726]) (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 7383BF8057B for ; Wed, 9 Aug 2023 00:55:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7383BF8057B 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=Bk1CFCoa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TSHPcsvWafcmmWDe7ir9RqoxyEvX8dcFXQdKnZfJvu2rGssAR6UG5sCnvEpttF9qhrXFS5+LjNoIj0ZxnjiqruGHrSUm6M6JaW53ou4hlz4um0CVZF9uUzNPKXU7LVSDuW4SUnyWsa2DLqz0CyVvhbnNYgJ/sx31ZZJyVxHtZVVMhDVNABCHeATW+HLG0VDXEQkWigbaQOIDBbns2TzayfBeH9zF10S4zJ5DrMoQdiXBDLTF1042nqpm/zo9H3vPL5Y5hZpPqHtoEJ/N7k3F5OPAZrsqGlkmTXcobLi4naKXXyT0rSdIT7YDw+VC0wIhdx7WqzyDwVm9sQlibXg9JQ== 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=6sFEtWV5t/aOU4BjXQ4Wq3pZd9Ax1rf1wCYPB6YfnkU=; b=O5wozSkIPgNLUpNyB4eYMrmH+8Q6k4SauAAz/cStMJVcA41jdRg4/opppmjpv2lTXD1XSGcBko4y83EJ5r0+j5hO3yZ+kwZTEDA/C8SuxFJMFGMMNmvVzGJeDbFJleACJe5yM97ZUblUwoGg7wnfuJ2jGf5WXNfw86qm1zHDwuiZgrVWwYtdc+rTWQTilYNBHIhmleF/RPp+UBDiK0qHuMdBuLdGNMHgk9GF64OYugxE3XkUCWtM7thCwqAllMKqMUf2qaytgkuBq0NEHBWfeC1p8prNeXGnEk0EIWK8ml0ALQgRv6WKGA+FOuXN5Bs2pPdCLymuhnkLl7/CXZISLA== 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=6sFEtWV5t/aOU4BjXQ4Wq3pZd9Ax1rf1wCYPB6YfnkU=; b=Bk1CFCoa1q9O3AT5d8JlY5PkeKYXJ1o+qC5MucAlT36/yAaEO2Rma5OHDj8XClIV4poO/FESTfRY17iyunOhWiibYjjdvAbFwSfmlUatpaDW8SgJ4YFhRXDydjIg/hoDuNXehJTilODlusEFAhC+Gl4HkxJjYT2WcqGga2fOkXw= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:22 +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:55:22 +0000 Message-ID: <87pm3xb0va.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Syed Saba Kareem , Takashi Iwai , Venkata Prasad Potturu Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 05/39] ASoC: amd: 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:55:21 +0000 X-ClientProxiedBy: TYCP286CA0286.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: f81b7e0e-f9ba-4ab1-b380-08db98628b82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VGiHs5ycnVA8zBNvkopvgUsN32oy3VfEPI2oxZ543O1EpfQzKjqHZKaYZdXPTdQURsHgrqRBGsch23HHUYIgyFKmQ9snxTDHdn1XG0u3MU+YkJzdwGlq8XBAONToWLDIoJKa1y7qDlIm5a1WHDDpL4wBU/xrCW/Lu80TYuJJAsuyPgFv0f95hXn74hO4GXCn9FfLTMskCdEuUxJ8ZYTUvS/0855xNvH3QACClUkhtkjJ6NgeTebLKGxTYTUPi32oy1B0k3Txv4NbxojoM7XQ8hIXqis3QfkUcysduLJaYvzg4PjvIToeyhjhmoklWmUSmrGZViqQ/Y/r7g7LrRTlXPPcNW1PtsAPM6gEv74BPQPALT0qIE1DnnuZmvd5MNumoAnjzugJQb2AljVp7L/jfX4d5n7+fC6RahNIEbM3ln/nKjORIF2BtnkSIm7eotLpEcVEIfM6PJs+WomHoQGSfIEehVK/8s3KwmlgumnHcOuEUrXlzYO8T9bXffZ2aqRtgbO/T6+YFUs5C6NCs5IxM1J5i70+E4RZVAmEXpww18cct+1pirayJyxhST+JpTgL+5JCs27sjDq+xU6gnunAD6l3kPcJsWvkzySxJh31EURB5CQZiYSpsMt7Jp2MBfyz 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dl7fZyoMnnxJI1qi6Qu4NDP6Rupm5TKGQz5YlV1qbiRq1B/1dn4fd8XZCQ0UOK9o6grcNt3zpa1NPlvUBcLtqfmXOlgw1gQJSZCoYVLB9BdwN/ollQid83gHUXQg0lk3PDViZSyRalgooUy1M49pb+GGzREQRWXgFZZgVEEPuvCJXKJsrezU0Bnk1rH3VUneQlKu5mt+4j3+1XLGk3FqZuFoXshVh7C+bkTDsWp1BFtpp1REnQI6Oxiqw+I1zXsECYNmTtKCoC9wQ/t2XLDTygTdnVxpkqzBbsKLTAno+8aAPkZLCXgA2DkD8+5Rg8GyAhsp9VDTssoPF4dKvFqmJzc10LsgkurUuLun+pcuEUUEkPSMSTD/Gmw059EjUmx+0aqwVeQ92LFm05ZidbWNd1vJ6NNm6xWfsnEbv9ax/UsrxF7PYQNzhcMSMR4UJSQGsyk8Fe4QrNMGJsHLmxsE4pBbHwrz9Y1sytZPdWVIDCVD8r7RGq5z/moyz3khKRZ8l6Eqi0qiSrExus9nua04OFic243fZejORdDlZIPcaUp7emVqZn0uh/GgdRZUXio8DzcwByxwXi9D23ro9rGJGJ8EGhtRsE4quURUYGiYSBp73E91nVTVJeSqWB/U4xN0DfY8Y+ig6nMWd06ops3PrI/TAFYIchL26zlsOSmm41asHszVlk2Uj/dfEv7XEOtMDzgJki5s3uWuOHpWx3GYk1ofUDJ3eCObHWIp76Gp97cJHg8bH5DNI6/WZdXCr393CAqAnjNfMn64Y4U8/HtGPiDwSXWXLeWgDyQJA7y9CsTDR+GclhPJTWshXCNelRtwzIMnfpwemz40fehC1CA6ic0n1G+8E6w1nXU8GEGw/KNyOuu39TGm3IRmp5vmRUxvJmHiNkb5BUwQ6xY/yj52/jC6O8E25hrOh82sjJm1hy97UzTeQFtTbXXvUkP1TJWgay8uiT9LDP9KgbtezoYytFkHnPJrkEWFl7qeAI/VQPWXk4Rkgm0k7Dc6Fl6SIKXITmmpX2iKb5iAD0KkFODf86MLHLN8o38maiPg+OPKUg4MXRmk9RE1/xyyPrjTyd3IjTK7F+oeTwKBtGpD7L5u2sAJ5gKpP0hEDTd3aa08ijd8WbLfJ1qoJo7IsDoVqlt6B72NiuJGRmPyxJEEPI3ju9hkNWhHIqwYRmGf1O072sqOsGDdw0tlSLxyj99w9hcRtCbf3Jj/KOWsK8RFSNyshLn/wK17urOuSWPw3X3r/bbIoFymnxUAN2sfRciTim+B3EotXuBKm1xYjZ6parAqq3Zdbs1wcdXRekIKhLQGNIKuo1/Y5Hh3vRbwgAHNu3gw5yx4L5rkBTUWoRczsjMkC2teKRlohevtOEbca1/y7S/DJ02l1t2ZPocD25bKVnHn99YH5dcloBov39uhRmj7lWNL3ImEyBMzQ6sqAjnZ/MmhJuzvIDsqhSg0mZwDHufj5+KdUAn3upMcu7PEq+nJAalvCOH1reFGQl6PfJfDX2Dqa4bxSqm9S72m6e2A4jD5NBNt2Xtvd7u2RhqwB7cmISWJJpTAuLr0isGWLiRuxRbzDk06kg5d5bFgYMYJwOLmm0qeiV62pqDdBNITLRRuK5DclT1yl78MZEmeBC85Huw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f81b7e0e-f9ba-4ab1-b380-08db98628b82 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:55:22.0054 (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: VWybS7+m811/PwvBzGctsc2XWfbEJBZb7BQOpI7LGjnaDEMYRz55Hr/ryBPU8BIZPR3mS+e8ItbCg/CoTfGuomyUfL9tKWn41DhEVSo/L7Bk1E/rRWRB7s24IZTNPi42 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: S5C7THC7PNPMOSOEG3ZSVXEXIZPEQFXK X-Message-ID-Hash: S5C7THC7PNPMOSOEG3ZSVXEXIZPEQFXK 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 --- sound/soc/amd/acp/acp-i2s.c | 24 ++++++++++++------------ sound/soc/amd/acp/acp-rembrandt.c | 3 --- sound/soc/amd/acp/acp-renoir.c | 2 -- sound/soc/amd/acp/amd.h | 1 - 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/sound/soc/amd/acp/acp-i2s.c b/sound/soc/amd/acp/acp-i2s.c index 09dc5f2c0bfc..df350014966a 100644 --- a/sound/soc/amd/acp/acp-i2s.c +++ b/sound/soc/amd/acp/acp-i2s.c @@ -539,17 +539,7 @@ static int acp_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_d return 0; } -const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops = { - .startup = acp_i2s_startup, - .hw_params = acp_i2s_hwparams, - .prepare = acp_i2s_prepare, - .trigger = acp_i2s_trigger, - .set_fmt = acp_i2s_set_fmt, - .set_tdm_slot = acp_i2s_set_tdm_slot, -}; -EXPORT_SYMBOL_NS_GPL(asoc_acp_cpu_dai_ops, SND_SOC_ACP_COMMON); - -int asoc_acp_i2s_probe(struct snd_soc_dai *dai) +static int acp_i2s_probe(struct snd_soc_dai *dai) { struct device *dev = dai->component->dev; struct acp_dev_data *adata = dev_get_drvdata(dev); @@ -569,7 +559,17 @@ int asoc_acp_i2s_probe(struct snd_soc_dai *dai) return 0; } -EXPORT_SYMBOL_NS_GPL(asoc_acp_i2s_probe, SND_SOC_ACP_COMMON); + +const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops = { + .probe = acp_i2s_probe, + .startup = acp_i2s_startup, + .hw_params = acp_i2s_hwparams, + .prepare = acp_i2s_prepare, + .trigger = acp_i2s_trigger, + .set_fmt = acp_i2s_set_fmt, + .set_tdm_slot = acp_i2s_set_tdm_slot, +}; +EXPORT_SYMBOL_NS_GPL(asoc_acp_cpu_dai_ops, SND_SOC_ACP_COMMON); MODULE_LICENSE("Dual BSD/GPL"); MODULE_ALIAS(DRV_NAME); diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c index cc8284f417c0..1bf7b2e68a11 100644 --- a/sound/soc/amd/acp/acp-rembrandt.c +++ b/sound/soc/amd/acp/acp-rembrandt.c @@ -98,7 +98,6 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = { .rate_max = 48000, }, .ops = &asoc_acp_cpu_dai_ops, - .probe = &asoc_acp_i2s_probe, }, { .name = "acp-i2s-bt", @@ -124,7 +123,6 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = { .rate_max = 48000, }, .ops = &asoc_acp_cpu_dai_ops, - .probe = &asoc_acp_i2s_probe, }, { .name = "acp-i2s-hs", @@ -150,7 +148,6 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = { .rate_max = 48000, }, .ops = &asoc_acp_cpu_dai_ops, - .probe = &asoc_acp_i2s_probe, }, { .name = "acp-pdm-dmic", diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c index 1899658ab25d..54235cad9cc9 100644 --- a/sound/soc/amd/acp/acp-renoir.c +++ b/sound/soc/amd/acp/acp-renoir.c @@ -97,7 +97,6 @@ static struct snd_soc_dai_driver acp_renoir_dai[] = { .rate_max = 48000, }, .ops = &asoc_acp_cpu_dai_ops, - .probe = &asoc_acp_i2s_probe, }, { .name = "acp-i2s-bt", @@ -123,7 +122,6 @@ static struct snd_soc_dai_driver acp_renoir_dai[] = { .rate_max = 48000, }, .ops = &asoc_acp_cpu_dai_ops, - .probe = &asoc_acp_i2s_probe, }, { .name = "acp-pdm-dmic", diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 2ebe2099cbb5..d6cfae6ec5f7 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -198,7 +198,6 @@ union acp_i2stdm_mstrclkgen { extern const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops; extern const struct snd_soc_dai_ops acp_dmic_dai_ops; -int asoc_acp_i2s_probe(struct snd_soc_dai *dai); int acp_platform_register(struct device *dev); int acp_platform_unregister(struct device *dev); From patchwork Tue Aug 8 22:55:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711980 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 A6C8DC001DB for ; Tue, 8 Aug 2023 22:57:41 +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 9937CDF8; Wed, 9 Aug 2023 00:56:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9937CDF8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535459; bh=28z5Ea14XAU1j9uQVP8nNduRuG+vLEZ0jHA/c7UJUec=; 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=LS2LJf9/Jvfb/wpg8AMqO8EcDLeiLtq8DX2V34qOnR8p6uQOd5W0yeQdAr/z4IhpD 0qZ0WwQHKhXgOxjA0f34h7hRQwo8ZPV0B0pn2Qm+6SogzjGC71iYJPHSkUvGHgfeWd wh6x+5cw8YED7hvPdDPt1QtgjEwFkUlBg9R2+Bcw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 971A8F80116; Wed, 9 Aug 2023 00:55:40 +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 46BBBF805BA; Wed, 9 Aug 2023 00:55:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9E0AEF805BD; Wed, 9 Aug 2023 00:55:36 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::701]) (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 07621F80116 for ; Wed, 9 Aug 2023 00:55:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 07621F80116 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=DmJJVYk1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KwKEPdbAv7pipXhKxb0VAhMhY+3zgJOEruv2W8XxuPSRDsXC7Lc1lQgUVMm2IwAJLlVIy8/fj4k73JwlkLnniVxlp29oFMLFRfXXe5jUD/PjxBCZXZj3bs/sxdtTdCt5EzvuFHUS9GLKJa4wWrsKt04MlvrBwueaODqEJzr/zGRlItu6UdmmFfkno04YrpLwEOsHvoJMRt2ekeiQ827VGsrF02uqOtzuQgIZ1huguKBKWFvAWA6YxlI0q//1mNJh14ok57X1467lySstqdgF7fRzBZvFz0RhRg0FuSwzQx8VPpIFC1BNtZtCOFsO+84g54Mr60YgxqZuWAwM3l9b7A== 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=4ou8v+txXmQpCStUw/i42a/JYSYDFtUpQLXlCn2QHgI=; b=ecW9R1e621BRu7gVjpGUjbrthq3t7F9JjRK2yzgoFlN/rBuzUpSrjQlAeUnqZih1t91UqgdZsiVw5k6DvjSib/sqcDO64wP4rCURXGDHamGLkWBdKbr1lDw6+Kr76yHoVL00dqgqfZULTnBV44vZZ888j19IKyYWK5jjxtYjMr2icF68JPxNRCbu58dKdDPc+EDcQZWvlXdFZRrd0oesZj9Kw6EPDkz0ycSFlIoDjGBniFqYsEFzNv+EWwl70y0nozev7sQPwdH0x0h1SclOuKB1eubr7TGNTw9A069M0sIwwtNGaP0xWLL3cTM0s/42hthkO+U6NLoZY90ToWVsnA== 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=4ou8v+txXmQpCStUw/i42a/JYSYDFtUpQLXlCn2QHgI=; b=DmJJVYk14sGHe5emBvin8lmKOcHWiilKnHWTon2jbPYQLbsm8dC9CiMmACGhFrnMvpBEhivac8E22mGD4TliahRfktCWJtDyfECgrAyPWuS/laPL+mq5z1szTVKJBTXPLW+uzQkhBOGJTGlVtKeRgrrfM+0NtWWJ7Uh85Ebw6eA= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:28 +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:55:28 +0000 Message-ID: <87o7jhb0v4.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Maxim Kochetkov , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 06/39] ASoC: dwc: 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:55:27 +0000 X-ClientProxiedBy: TYAPR01CA0040.jpnprd01.prod.outlook.com (2603:1096:404:28::28) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: a57db494-a05d-4880-084a-08db98628f35 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r4FiiIYYuL+LpUoMTGB7GIfp2VA8KAKueXJwwe0hUaTbM33kP0LpTNdNrZZ9HlC/+aOykrM7YM8V1TWzAzX6vgaGzrolDSLvdJhYBNWm7tng65RsIrJcFFaWi2ML8xFLR0JmnKlm3BpxS1z2LVfVpxEAUzAV4AGegtWHOjwGoLVPIUjIe/4spM3iwSYLuHELZCjJiGSV1oguI7/4Q+T2uslGLRpu4zS5xSPrPr0bCO5EIch3nnBkPvKqDh2i+zTokRvY+bjgwTFbb6dySNzlHc2dxLk4EAOcUr45XDPJef5gSQb/0YJcOaTIrBKTeayanwJSfoFsXpfBQrZGPHnbzmXfiDam4V1y4xP9TYhswLWVt5IVrpK8yJzCa5RNKffoWUtKfeH7QeBumwlsmkh9KScQLDYBKCDhIDV/Aqh6cOLjwYsIYGQYYkLWq1XmDnw9ulS82ccTaCjuKboTKpsJTTNihEk5n0u1OkoY1CENSVSSqnULdLw59F0J85BKHwrA7cAvWu7UTbO3ocAW5QVAwDFmX1ZOvABDhsRiE5meRemgwG6kuM0pEogCDYszzrBJG33G7zHpIbx15/Lz8oBHBQXPnBkewmY8fXrjvFltvUWUbk7Z5OukKyItXdMYGE90 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UTr/mzm8soLNAn/nzVDHgF3BxQBzsO+z+6g0aTzX46KV2XCDeqxO6sE6TRniry0p4/25PljC8JzjCAsZh+Pg9AK11djPVmyDoHsUIvuLmnOGz6uFO6XRgDz9MWxK1gHEg+FdcFpmgRuma3IgHGqvMNn+Dgdw8zEULlG9b8ln5U29ZhiNSaJw5ksCyRd0IHOgtDtMT5M8F+44Nd4A2CwYd84qYQrn8PvVUDOyWuXuUnU9ojk74/Bp9guFNag0yqUfPtOqYGxiORwhWmnoyVx84vv5SAKhGwm2bKWhqgKVhxVJ+4hhHGOH2wdWEPd3WVvBXFrPkeT6HOe+9v8NrKO4FFH3SUQFmt8NXsKViH6taNzC/Oq9SE9Lnnxzclgt1XBU6V3RliAPsxyBOZbq1nJbUsyXv+hs5KloDpmIq1OJ/mLCXHpylJ7rWObZNc/NYI4/IB3duSKxnmIRnO2X1fSGZ80PejnN8U/rTfMvsbn6KQxDYuWq24f8sUzqwL++0vKh2B99K/IiNOxOxhN1galpCyHE9U/d3COHNAKHA3w3JhY7nFX86OISb4WDHrALnwzG1UyFEc29Ir3TffQGKSrKZoIAlAa5XTIP3TWYErsfV+M9s4j8+CEMOxQbp/NWkLqTK+CQNMtDoH94rrfkkSegI4NvK3u+yanG0Wra1YyJBz5PoTx4ASZ9rwZ7UKviWSZt6GJWAgdoTjE7qpseJySU1GpycDab25moY/qj1xuV7ZBO1hFUpkF1jPCG5kr2AGSGs2oDaNcUDe1VBjDQ7TpiwdfFXFbPbw1VrCGRZ6dyOwtqTepNXQVjjik7h5Go84Y1l+BMMmpDIyOIHFuH9Il8WxiWNDSLnsrRt7MyPWQcbQaC2m84iCI1RF5edmfw/mkPu3quz2EfWvBhAWlrgjspbLAMl/Mo2oC0xBCBUWW02z2CYD2rAGfwVHTadTfmfv8u/AFRVEyzXbPfgN7+jPCc2Ibc2aOV4b10djnhx8ZtsxivxX2MaRQRde+NvGFINgwr1LqYiZKmVwg9jwTvoWMKG4GkEdH0juJSiPS2FPRvmx8buAfC6jhwSlZHFqQJtWH1hmYxCSZgpBKDN5AYxxLYmPasajO3raprTwM4dGurnLEBIRxVZlaOC6OCDwvym2SrENVTWvD2nqFTZZ5KBcvdfmiMtLvdKEZSLsRMKGAAmedoCtFZcCEq32iizSD8FSYZ/ZV3y/rh0axCvbjz7ReykmnmO6NxT4V/2VTAJQw6/+cjaz6k1kCVEyiMefcTdhh60kK+JFQ2RJQZrks4CSPnXSAQD719jDTKGGjoxCWGQiqKc1rdCKRh7c4oYask+SrxCLY55ivoK0xBp9JszRIMCWIXh2GFbJ4205cgAJ2ciEC8A2+GxhcaEz/Upi64QHNgF7y7kprfGcFV4m/oVDXzSycOoKHQiJzYTiLYGvXGcFPGLctP9v8bRyITY9hmrBh3xSlH3rKqlnhfxes/d9AVJHbnLhKC1faCaX9MmNP7PWMHv+sLdm/NYZK8jpdyLP5Wz3bR+uHlsVc9tfDxjR4E5VW/yQu6nZvB9RezeWN5rmffKAb8JcX3RwNu6cg2DZix1XUPO6oL0jaZ8msOuoQROBrH+wou0Q1koM45c1YSaME= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a57db494-a05d-4880-084a-08db98628f35 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:55:28.1497 (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: xNDmawqZ6aRor2Pr/+43o44pQoNy97fuhwfzQs2gIV+nuLFa7S9NptE6UI+HvhrFBr1lQc4bFK181T6XItCbwFpPhO7nh+PueYt8HVHO45BZeK67VRlPHSK6sa0aeVF4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: SFUDYMXC7247HZKTQJGQLTPCX7VAWVIC X-Message-ID-Hash: SFUDYMXC7247HZKTQJGQLTPCX7VAWVIC 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: Maxim Kochetkov --- sound/soc/dwc/dwc-i2s.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 1f1ee14b04e6..0a4698008d64 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -443,7 +443,16 @@ static int dw_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, unsigned int tx_mask return 0; } +static int dw_i2s_dai_probe(struct snd_soc_dai *dai) +{ + struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + + snd_soc_dai_init_dma_data(dai, &dev->play_dma_data, &dev->capture_dma_data); + return 0; +} + static const struct snd_soc_dai_ops dw_i2s_dai_ops = { + .probe = dw_i2s_dai_probe, .hw_params = dw_i2s_hw_params, .prepare = dw_i2s_prepare, .trigger = dw_i2s_trigger, @@ -680,14 +689,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, } -static int dw_i2s_dai_probe(struct snd_soc_dai *dai) -{ - struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); - - snd_soc_dai_init_dma_data(dai, &dev->play_dma_data, &dev->capture_dma_data); - return 0; -} - static int dw_i2s_probe(struct platform_device *pdev) { const struct i2s_platform_data *pdata = pdev->dev.platform_data; @@ -706,7 +707,6 @@ static int dw_i2s_probe(struct platform_device *pdev) return -ENOMEM; dw_i2s_dai->ops = &dw_i2s_dai_ops; - dw_i2s_dai->probe = dw_i2s_dai_probe; dev->i2s_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(dev->i2s_base)) From patchwork Tue Aug 8 22:55: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: 711603 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 DA32EC001E0 for ; Tue, 8 Aug 2023 22:57:56 +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 20C7382C; Wed, 9 Aug 2023 00:57:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 20C7382C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535475; bh=iNVI1dNqTjc5N0xITW/zwh9tQmCAC84TlhF5MpFTvWE=; 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=fEkvHGw+DRfqBxMNTxdttma54SlDdUUMT5t4j+5BFRhFhpBc5iPtvfTrGJtFoCMPj TSUGjJaDpJWxtqkPXTZtmhPIEqKJvHlak8l7VBoIlchOUKqQppLPLzWA6brM17stxD WbtsDvMNtDdxSt5HTv5OQA5kLwgDorP92HN6KYuI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4F451F80134; Wed, 9 Aug 2023 00:55:55 +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 C031EF8055A; Wed, 9 Aug 2023 00:55:54 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A1A18F8055A; Wed, 9 Aug 2023 00:55:50 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071a.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71a]) (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 B3AC5F80558 for ; Wed, 9 Aug 2023 00:55:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B3AC5F80558 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=LCyWLLU6 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EHp4aFFksRsmgO/xWX7ZREomhv9buhMqKwTS+swukcPGjR0hAUMyAlzHzvuOFASckGPu/mpBRrf2tFYFd1bB9abPbCvZPORJVlsYQhmMn9o1ZR3pIP6tBVN9iZ4cVp8IZQQQ0YzO0Q8DHjgCC44cOq3UkChOBUWiVXUrwOEPN7I2yXD2/H1ZvuWZ7ANzEYTW6qryAAYzp53kDTKlCVBxlFXfK+MlDWKtowBrFeMlu4Rg8nLzM/A14vxvW1mVjPZQ6xREN0vfO1k3hAZl0coy4aSh3v4Ps94gfPbLPtrmGlrrFhT1JHT1wccVDcWqi44j2XG7ffeskfBHPQ6KxcgDPA== 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=c/MCvqKgI3bH/KOHsGb7w9iK6nl1X7wsNOWp+wg1B+c=; b=SjbFzVwdsXFaySIswa4D/R7i55OsmFrxPHtediAV1Q+bGx2OzPpdrVjd5Ogsz0JBo+AHLNROEA4yc5OtcHawBNu2962AOaKk+mxOIPgr77RluB8aEovK5c7q/6fS5i0slMg8BpNhpUOxxcFQtkXHescXtcYfkcUKo4JWt/bsJzRI5tN7syWkQy9biHgWYD+GdwEw0+S5wxfjX//W56hF6CNHehGdwzqBliZU7TFla+TDVHqYhdQi2jiM94w0o6Xrdz3sA0y+9knUZ4hT81UScLJwGzH6BVBfGOJf0BYLgOtyMr/XcOpsKEJqXhKm2Z2GhxACgH/Q7m+B3/Q9Rn3geA== 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=c/MCvqKgI3bH/KOHsGb7w9iK6nl1X7wsNOWp+wg1B+c=; b=LCyWLLU6fWovQ1E2S+oMuBW0FcVYTWWGm2/Try0+6o4WIbanXfgYnEkXXRCo6FOhspxzWGFxfpSZv3e6D2gPNorsCmP4p8n3B8LKc7w+uTvw3AtZopSLyL7Oa5NwuvlSetfrp203xTeMUXp8SE2go5dWNFtJhixqzn+WlgDQPYs= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:42 +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:55:42 +0000 Message-ID: <87msz1b0uq.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Daniel Mack , Haojian Zhuang , Jaroslav Kysela , Liam Girdwood , Mark Brown , Robert Jarzmik , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 07/39] ASoC: pxa: 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:55:41 +0000 X-ClientProxiedBy: TYCP286CA0023.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:263::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 88efa12c-4e30-4bcb-3109-08db9862977c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vv77gu+3Q/EFoICcJRo3t/fjSAxgSi6z1NyddoXAIec1J37bjnlwrsOE421lW8BC1/G+QNnI++kOXeS5An2vAtJHBtV8VDqbj0i6l+PsEEeQOJ2JTDnhJrah7bWr1GfhU6Jn82WeSj4iPWC017NtZPsh3WH/TK2aNoxqeInqInqvw9YRgCmNLbz0It2ewQ8knChozLLLye/jShVVo8U0I5SS8vhmhDru2sBUGDsxuM6ywMU09R1RuDfBIZGggGQF5gGR5X+24MG0IDHco0rmYt5Q1UFSWz7WaNBMV/GlLz7hyiDAyXj92KSaZzyzjZijhdZswy0Bfb8n4+xvW9tr+4vZEKgfGMWqCDdduuaGnA4b/6BGNWBrdbHBCdh7KTvvnLnQYOOxuJ294NWPES/BdQwDn0KH/Su7TOZ89xzgpJhXJl9rZAeOJn+EquvSOaB/p/Ls6YxLPlFtl2Y3UtyZAe6Ym82AUQussUtIPIzN+AQ4tDv6fzbyy6XbuPEolX3zyzXAUYdxcIxrtQS2mQvR4E7qAO3fdhYTU3AOBVznKAnwZFIB9hbvYUFq+7c7Ji3x5yWAqGJispnRbxlzuaOrIhF6xO85hbR5iZSggyv6jPb7pOgbAc03IFZ5R1EMfrWvp3TCJfscB3ozXVn8bWF7ww== 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(4744005)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008)(41080700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4qZYI2uhlindUQIMBqqi2RUCKIrlHZux5JrmyfGsFKSMttIvI83bwyOli4CFQHi3PPDBZ+hkQI2uBCPOTraesLnhxEAotPBImQ4Ur8rWE6nbPJlVbYGIR2Hq4u/cEctFNsMdttEiJMn+wVfRDh8ZxyPZo01BHnJz5Q2T8DoDuHQ+VO+B7MzZrQttL+djc0B6u5qoXjOEe581hBoFmrGcbsywQU441Y/mldVhE6gZfbhibt5gVUgZj1ACCZE8EjITWCc87vydFKs94O3vC6+lbt0b9NBSMvgcxHzzkZF7/89F0wMdWmYAlz6BqAMeEHubDuSEa9lVvOr3hC1GL7zvXgEGgceQJZYy2g15fr4ivv4QA8o7wG8oZATBVTu4+rbwp6MTzTZOAjYH3/jQiHBY9R3nW4rr+c1V7iQKHmNmBXZdcoyngca/ccpvEsMEP8W4E2TC/eK1FUoIWOnQbPN62JxpGanrySsUVVfgGw+8r6YnnIDfXiaDnyCrcb1lkYp+MnO/Luk6vVnvYT2L/SediVgYYgW5jsw7DS3dux+t2KYc7Z0ddwRe8XSuIPRQOSeJ6aCoZPzSFpq6Y9k6TpXgqiI8gy0w2EdkrgEppQYAxW5rblpAU40W/UGp4UuAi9Mknu8Zzm8Alk/nwbMVET7wg6GihaLlGbxROEGhmcShsC9fS7biZXks++jsPowvTQqXXxMd6XM3WxicAAK1yyzTcBXFvwaSsHGGtNeAeqXZNnPdh5pOYmXTNItYedpntZX1LayFqwmACTPuJldFNGUxuzoCphSDYeb3QmSbhuZvOrggs7dOttLiib9h5x6kknasDQ/m24+AYIGQCJDsjwrOrHlAD2Rk7101Jenm+8bC8QyDbivJD5FkxYQ4cz9O/ZvxRltKmgHR0oaDDtwPE8mfw/QHBBd96beAPgQkL8yoNKUS9ssxRcjz7RZBPDN6Fdmo3bNRSG0a5NVyULJ1P3YdXhy2rY0fTwEZ8l2c1gwmWKb3HVFZCED/Zi+rx0tEmJRF5tIPDUNJvrhg5iVm/TkjDO6m9ZAY9/ZLpDBGShSAB4dNKLvnyK7PrHhAVdQfvcAbzHS0v1hD8xDfB6ol3lUZI7N7ld6UaafnBAqrO4SDzbaxuAYXWe7a9q4NWFirgvHEyfgewFoly1Loh/pLvXnSludkgJ8f/MzTc3mvOW5rrkxzffBguivQrWGizcZ+Y+27icpxQ1mmqQENvsau6h+fCyhV1z+w36IeBmjpMWHPGGDq22/PeMWbqYNLtUU8XD0sF4D7+/Odrw187sr3gO63nQ3dz1byz0PslL8XpXMjc8DKfhGpIMkUCoKdcpcJJYa8eUb8Qs5DkyoLTx0D9vNtU/Pye9o+pBOFzbCjz654abHPq/FnVOSIWMP2R6HMAaKNiP232OzlbBFjqzhPnTjJ+kS48ePiFXce7VBrmuhi40QYPKKFmqjk3F6v65HYVBhkqc0Vio4cBwcFc1CN64R81xFqtGUGHUjTG/AiMFrcRmYfLr+B3xNPQXwSrU7g5CGCM+O3v7HGL/NbDykYyPp6ASCWP1pfSHQin0u/rbram2wF+1z2kL0WhgGP9vqEOVzq1xKabof57L951s360eeBUhYCYsByjpA0vBFz9Yy3Kt4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88efa12c-4e30-4bcb-3109-08db9862977c 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:55:41.9959 (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: BPhscQ+Rbpmsauv9n/06GbNDxOPbaBSuieE0oiigDu7ol++C2+WQ01+n62T8M5mj+ltCLgvG07OR00Fh8QgwWtruXFoxiUS/smnxnNd+1jbuZ8piNtJiJOO6MNLuBGlJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: PBX72IZZBEH5GCTUMHOWKMOQPLEVHXMW X-Message-ID-Hash: PBX72IZZBEH5GCTUMHOWKMOQPLEVHXMW 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 --- sound/soc/pxa/mmp-sspa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index a1ed141b8795..abfaf3cdf5bb 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -340,6 +340,7 @@ static int mmp_sspa_probe(struct snd_soc_dai *dai) SNDRV_PCM_FMTBIT_S32_LE) static const struct snd_soc_dai_ops mmp_sspa_dai_ops = { + .probe = mmp_sspa_probe, .startup = mmp_sspa_startup, .shutdown = mmp_sspa_shutdown, .trigger = mmp_sspa_trigger, @@ -350,7 +351,6 @@ static const struct snd_soc_dai_ops mmp_sspa_dai_ops = { }; static struct snd_soc_dai_driver mmp_sspa_dai = { - .probe = mmp_sspa_probe, .playback = { .channels_min = 1, .channels_max = 128, From patchwork Tue Aug 8 22:55:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711979 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 B5697C001DB for ; Tue, 8 Aug 2023 22:58:21 +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 BAB81E0F; Wed, 9 Aug 2023 00:57:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BAB81E0F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535499; bh=N7u2qCc9gNKn0meNRg7oME3CPzLfJzKBW0FvQyIfGAQ=; 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=tIkUk52E5Jw+dZnS2PM2Crso5xwApna5UUznAVgNpviFmkB1FJHaTCRepR2NHrKJq qW+0f+iq3imnVet1cZ1iDA4wy6UrBBEauzqhIwMA4biCuVSctR9uG62x+As0cHKvgq TsY3t9q3z5mCbXJ6iMNYkyJsiEXr0+BDRfRebtes= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3B792F800F4; Wed, 9 Aug 2023 00:55:58 +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 B67F3F805C4; Wed, 9 Aug 2023 00:55:57 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8F2B0F8055A; Wed, 9 Aug 2023 00:55:52 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071a.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71a]) (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 6B4D3F80551 for ; Wed, 9 Aug 2023 00:55:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6B4D3F80551 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=X9uzMMZi ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IGXZ7847OFEoo/P94KL9ehZX7aDzKvIkelcC0HC3iyTc/rW2yBVcfuL8MvDgeRrotSRk2tMXx7rD3nfoDEC0Zq2f5ioa+o6VSSQ6dnCTW0wY9TchpeeLavo5mIXNawDkJWbTf0EuEsLtqmlUtUw22aoyVV+3rM7ek7TSbqg9ZQuk4gH254c2XpFNBZzT6DNHoUa6Q0G/eXZ3HZAHMG2OKPFmfktQacrrxsILGh5iDa+vf2af78H6dzGz23liNquL3ycJXAZbNByDAHWjuVGgLC+/Mk+ZrD2PlnFDZSxZLiLkACq3nockM1F9MrYux9DvVGjD8LSoIUrD80oVGerLqg== 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=fSUZg12zCX0hPVSogI5xDKfQey+ufFK2V+lE0bGoecY=; b=RHBHYxuj/OUHUHF7E6Cxf+d9qm5y3ZXNvbAmDIvR73ZecHIRilE1AMXfEUIZIzQrsFOOeJs4bOrnGHWqjqP5pxDckZYAukImQnx7XySnCjHSvFzoPu4xG2CL2WYG3XW9WPsoxDXd7oPRUhvY1wSKDZL+TiPfaiXXQJDfGoyw9ORAOkolDJoEujZGgq8uNnwHO9kbfGaIt1oslI02Lyd+G1xMATuJ6qZhGhN6mibIcMS/vRG0iHSYRSucsuZ5scFD5qMe0+Fg6mLEQkOP/KwmD//VVNWyIWaDWfhJ4sgtro0/VOONpjMlBysQNCSJuqKp2hsIh6smNAY+Ky0J9awVBg== 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=fSUZg12zCX0hPVSogI5xDKfQey+ufFK2V+lE0bGoecY=; b=X9uzMMZiuvApujvoZN45Q99USLjhjUi3G7plHP/nqcBGBdm/rv0kIDFv1BC2SvZnUPUT74BerJ0OlwL68um9StKrr0aScbWn0ZBAeID2cSopmsh6rwCoWiSLQaxbstjeFv9tJkoqNJCO/05255bEcoeO/uxcRLwEsgeYEcm6bh0= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:48 +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:55:48 +0000 Message-ID: <87leelb0uk.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Florian Fainelli , Jaroslav Kysela , Liam Girdwood , Mark Brown , Ray Jui , Scott Branden , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 08/39] ASoC: bcm: 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:55:47 +0000 X-ClientProxiedBy: TYAPR01CA0054.jpnprd01.prod.outlook.com (2603:1096:404:2b::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ac63555-2527-42a2-78cf-08db98629b1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pqsfa0hDaL98ziEZu518q+YFYju678N4yCSyDqcesycc9fDC3Xxb848T/Y2UHmWsSTrHvDLOe4TXZvPuGjtKtIKlBg92C2ij9mUQxEnduwwOEA8M5ReqBGdJYhjHyA5DVTcT/yhApwQkwxrXd+Gz0bGdoCa9tDRsG24oQgslK6m3L8BAnvBerLCobUCafZQ4QjX1aIraBvvsoMjp1Uvcym4KaRRW0zeozAve4EW5wxEyAHLHwqjbRn4/m8YJ1xnYa4cQrAerQOI8Mt2ALlWHJL7AByQ/LY03D9B2K/TfExvY6VMEYZZnDlmhtXa5SydVBwV1aQworWryebPaC6et2Zr4gfT4McsHm2Cy9QLnXvPbS2oeZVbBT8II8bxAsN6FcdmXEqSrlEvPExMAPa33+rMsTgPr67OmAnIK8f1pIJxQI+Jl+41p1S5xuAVVkvui2qurQhxV8HXdJd6crvfm+EHTfTDZnR3bZaEFeAzM3y1FONc9s9VxO4vLJpxprqUxqdEoy/BMRClOp7kHMPMT/8hWUBtuk7IKdRMLUcVwAGlZxyKgCHDolY63jCVZA5PcSOiPi9NT01cMw4uu6kRPPwZZ70rka2TQ9Kd60lJO/sEsPBENoXVTuHOxCytiKU6T 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3dkmd037IY4zhMzQR9MOTkY1JHXgKr+t1ycWdBoH49wQ+aGgZ7raYeMdWnl9Dqj2MwGRYh6zEzqfhcqodh7QSTIrtaZH9p5+TBChk2+bfkNzi3GIvwj+cHqA3KrH3Dz8Kf2YaKVBPB22nBPyZweNfVCDv+l9Bd0IyZABa+rMNxj5rszVxtnGsOHO5MFDsZgunvJTKDTbEzKpYbArMaCdELbLi5YXmVmgLu6fxRb6rq6bWYx75K7WYa9CgwjzmfxBkO26/JD8kVxU2hdHeub95G7/9Ey1cryUOxJq8RunLVxs1pm0yhf5hdaJyTiY/5G+wNjCP6nRdJBORSSuJSi0nVPHOOJAsGlXT4Lqkf066J1v56xVGEE4M65rMZgL2UELzvUG1jQDW+NTL3NWqCrNesU/q2TwpX78+8/ESgPBXT1i2bQFLbh3Jaxvy1QAiE/OTzX38TeFovZQ+ZkZa2a8VkfrtkXhy5WQ/LZOINk+v+SUkix6Wi3rxAFtKDBly+avN1FGYMNZKxwZE9cQVNOCnjdVa17AK3jMJLk63f4I72vFHEJ4tv+8s0IxMRWVQ7wU8Ap0vqSr8Ve2bqI32VaRsBMTLOWh64ynOfPWH4mNBwBUQU6I0jXKINoknIAhcKrgq/UCNMLT8QolIkwtE7txgzs71XvxzVAYYuwVSfxsI/E1rNfRtMJ2JUE/4Lo29QmzS6scNEgXZ76pdGilEBLtyGItacWzTUeID7H82ZBWsrSpwCEl8DHEsRnTeUYJzQxKSdCUemYKAi9vccDvCUmY090iZ+Glms5BAT5wB0OthruetRn0PgflS3G+P3CvEupGFHWeUtCY8BCXZ8Ey2TOmDVjT8DZxD4pJ0DgMG2dH/nGifSxR0ydA5BT6+J81AOmpcfKuoR+GL9uJkmIa5c/gnvHoCkYthNiSNtsIsjgE2NtOEJRQkX+5yBvnPc3AP9i14KmzGQ3fSVFrFMLOgjlDAZ4kIaxLCcyyB1tfRbVwuIvpboz8JBxRKkRi08xGZm5LMsxagndS61fVKua4ZPPoK/ZIecBIdtfq3eyQcvElDEeMHsjf4JQOXEZB93KAEDm/W+1RJclbndu8SthLqfXZFl3wa5Bpg+NMl9YUG8UblGwJ3mTN/y0uAwSlA77HGLZtvUUx0kEasQSciGjg3YrHluVevefCuwP0ty1IAhov5N2CelrPcj4ykZZ/esnGrBZk/x9Ra0HbykGUMQ4h4hSNQQMwh6ATNzhUDX4bMu8blbtCAIiBMkmzQ5uOu8n35GGBXsTwZHXwzXfY7s+Ot2rJ64BmyEhT473D1XqtTdgOQzf2uAugQ6GTjyzYCkSYVWnE3vWlqKMnAuzvhvUHjpmiQjkqp0fyZ0c73OfhouMHBIjDWu62PaOCdOpqQJcBb6moscIfNuEtQuUBl/iXBoMzbPtCzJ8ChmVkLdSxeJux2iAAjVInZ+nuqG4jShakcgyCwVDekqPvluJ6jE5IwX1wZbwuqvBtlUcROF+cpdToxXuiW3okuXa8H3/Cu+1FpuwbYt1pXFpte8JfVi/nyYzEMK22mKi97JU34D/moBp7tW+6Y9cvwNY6bDx0NHamlhsi2e+Mm1U2xnSR6AL2Xhu7QgCHb7a2SR0Bg4wKFhmRdNE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ac63555-2527-42a2-78cf-08db98629b1b 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:55:48.1084 (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: CEWzdVU1KKZttICcQYXpJ0lxSo5I5JpXu7FDr6HXKyYe4PlZZdLagQhqVmWxUxVj7PhaxxFPoEk58cd9PVp9kXfEcyDjT1hV+TFoK+CGtFzMQaidLAC5LKtq8rTM5XWj X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: AVYWHHFWQ7QRROVOLJKG6ZVUU4Y4WG3Q X-Message-ID-Hash: AVYWHHFWQ7QRROVOLJKG6ZVUU4Y4WG3Q 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 --- sound/soc/bcm/bcm2835-i2s.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 85f705afcdbb..9bda6499e66e 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -737,7 +737,19 @@ static void bcm2835_i2s_shutdown(struct snd_pcm_substream *substream, bcm2835_i2s_stop_clock(dev); } +static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai) +{ + struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + + snd_soc_dai_init_dma_data(dai, + &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK], + &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]); + + return 0; +} + static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = { + .probe = bcm2835_i2s_dai_probe, .startup = bcm2835_i2s_startup, .shutdown = bcm2835_i2s_shutdown, .prepare = bcm2835_i2s_prepare, @@ -748,20 +760,8 @@ static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = { .set_tdm_slot = bcm2835_i2s_set_dai_tdm_slot, }; -static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai) -{ - struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); - - snd_soc_dai_init_dma_data(dai, - &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK], - &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]); - - return 0; -} - static struct snd_soc_dai_driver bcm2835_i2s_dai = { .name = "bcm2835-i2s", - .probe = bcm2835_i2s_dai_probe, .playback = { .channels_min = 2, .channels_max = 2, From patchwork Tue Aug 8 22:55: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: 711602 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 AA25FC001DB for ; Tue, 8 Aug 2023 22:58:34 +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 A4725E72; Wed, 9 Aug 2023 00:57:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A4725E72 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535512; bh=hY/fA2x/HhYaBhZWeA5u2P4VdmnpWAV+wPiTVbf3nF0=; 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=LduaCRIH5btiU/iTe5vW6wbXxaGzZlzWgLKUGHvQ3RJ4AFQHtaxYUSp+ABy6HEP4j KA3xtuRAZMItzTzUw8CnbJ3lchbvhRFJrU2cC/LWzX1JKK5cJXRMxsgpJzQvSsUgp2 G23V+FsUm91qHTdj8NLyxRVIIP4+F2n30tKV++is= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 52193F805DA; Wed, 9 Aug 2023 00:56:08 +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 91EEEF805D3; Wed, 9 Aug 2023 00:56:07 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 455DDF805D5; Wed, 9 Aug 2023 00:56:04 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20709.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::709]) (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 6FEE9F805CA for ; Wed, 9 Aug 2023 00:55:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6FEE9F805CA 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=ixvGdphs ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QHUZrhz/EqPjmGOym6ckztv/T7xssUpRWAxLRSYkFRPAfkBlWmLMu45pLj3Cyw6W0vZ4lZbQuZKBmhFAlMcUd2SdPk6pPAX2GztlYXFQAOc4CvI8gYnXtO1hnnj0DzkOPuXVeM5dYmS4Z6ffaVctcLG8RLnkA1VX1WSj5XkuRUP8x4U8Xfc0b6rlClb/58n8AvaBFB11wnBc1Y9/ZU8sfN/PzM5P/yfkpSkxCP8BsZnfpAECOGCgV6VDp8HcFfVd7j7I3IlK13pOWnSXYazH0lS3p3mPwF464SPoCxEVqGTelMEkloGLrcn4lFxKIvdLTxdhyq10VHWLa6vueq3Dxg== 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=u56ZyqAfHiphX/NxM2TPY+78jTH4MiJCCjb8MBFx+x8=; b=kCRrbpPeK2DafX5knxCoUvRBIZgh1wNczO04OdMS/cjIRtYasuHCzvhnMjQJNcWOQs9zzdNr90j6jcL91YdP9T5KulgpsMSHvXWau6n2mHqv91+wvUkSRDSroIYoynWflN5BzXs9n5d6qdpWhuEPFyIlkz1FmBa5rS2x4IJcZs9y4xVlpIa9B6a5Fzman1jBAdj6m9Bwk1rFf9uZLWVhHp+zwmJFuB3I0LLsRkrqfAsMgAr3kb4mqOcq7+IHvsl/ODukAtOdf4+j/tiBPxyuRe/PNrAziHBG/6rodU7cuJg2aR1zjphBSOl6oMzHsIiwmJkqKQsSJUmRn03Z1x3qUg== 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=u56ZyqAfHiphX/NxM2TPY+78jTH4MiJCCjb8MBFx+x8=; b=ixvGdphsRpvpVyJypqJNUnIln8PucNhgPUNZ3amCxIgyO5FRX4IC2ACJCqqQhbNWeV59kqZTmhZ9CUzWwKUgqA0x6jyLHoTi7+/ebMQZMIuTkXaXRA64TEiFYh298u7zcbT4z5h+aIOJPrm+lVu4dvUDM2wPLWaCR14x81902LQ= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:55:54 +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:55:54 +0000 Message-ID: <87jzu5b0ue.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Chancel Liu , Jaroslav Kysela , Liam Girdwood , Mark Brown , Shengjiu Wang , Takashi Iwai , Xiubo Li Cc: Fabio Estevam , Nicolin Chen , Shengjiu Wang , alsa-devel@alsa-project.org Subject: [PATCH v2 09/39] ASoC: fsl: 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:55:53 +0000 X-ClientProxiedBy: TYCPR01CA0174.jpnprd01.prod.outlook.com (2603:1096:400:2b2::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 761a428f-786d-4231-aed7-08db98629ea7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xXVKSv0zTljjRs3B8/ezSjpFnrkM1R4as38xhbct8ERzvn2pIiHZ2ke7FxutOLxqI550CIVIZTXaQKqOB/YdYQnwEpYt3TitWdSSB5MMmrZ4gURy+ANGZaWRf17L6Iq3pr9IAjy2nSFA7YUQC2QJzGh58JGOoseOMDRmEjuq6YxLX9EUNPDEAGI7wvkjot2KbYq+Vj4qF1FPy5CwsEMmOr0oRUU+J8ZZXQhIczQP9tXJhjM4fhimA3R2ajZ0jPeaV62XlovqQBwoMhSWCdSrG9ZMW6bSPBE1EfTl6OWiDZ6+rpIS4TmHLbj+QVujvkz6LtyacvMh+5wXrVG5odUGqsGj6pUw6d/5JyuZ0NDGqTfB66uYFVoOIOyXqoBL1Tg9XvlJOx06IV2Yi5E2972ldDt62GKQjIM5tzEccLBNS7hjD6dbL+GZBB83LUgF3apH6dqxzaZ1nN9CdLFyUd+wyD53OomY+fwceGkOJmZptF8HfAkgvJjSz0v9I8J559pOMGmw8jmUi/0pGcs26f1zqPJE9Z3U3hI8ld/psoIUGXlHZESPLPC4szBZTjahEvQz3JJE4TjBoSAZ4Sswy/Y7cldxb8pQPQcgO9pr3KQAKOpr+Wq6cmjFJv2Udw6o+MQ+ 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(30864003)(316002)(2616005)(41300700001)(86362001)(5660300002)(7416002)(26005)(6506007)(8936002)(8676002)(110136005)(54906003)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c+fZ1APk6mOO7F1G7DI+85RgKsHkcnmCw9N72DNbbjUWvPqJaP2daLmo23wqkm5w0jSL8LSYEvDvbvVH5FgYfWLnMqL0MKH8USWuUHhTIvNPsdlw/1f2cuE6Z8vNysvEf20U1cJ4kfEOe9zb3xXE1OA2wytteLvmhCgEbRqDmuQjV8/xn2Rx4ZELxv311ljP3QDIm9Iuc6biREext6iPsOpKNXE3bdXNJbnfxJrVGpDqzixDueyC8Rd6OZkK0edCJnxngEZ+6a6Ou0lqnoFQZhnyAi3TKpqCmGZXc4PbYt31LrBNb/yfm/9fsddCcJEshWaVGv1hk2YxqA+SYNGj/HQQ5dzUUe+ic4Go6kl6N2pnqZZjlpkIli9WkY/2sD0bKEQPDU1ESY5NCoJ4okcoC7OmQBOqxQWbyhvUIj08uwuMVhvVNVpToscSJC6XMkhMGhG1Ly9Kd3K4IWUpOvLlyYlQ4mj8jweWF8/OOvlHNnKyET1WbblwBCNU+ZJzC/RrQHPA5Vf4miFAwvb/fj3CFHZcpir1qIHntgWB/itlgsp+te9tXYinc6DDS79V9cEU0K+qQkjPkocq5y6PGZ0hBx+VOqWONIz8nzXyVhoa0NV6WGDYM7/PKB2ogLrTZqCeKs3UCrHaB933oKXrKwjKaGymWh6StFpXPeOXpiGCDnsVYBkMsL1l2lDGhE6ppHqJ9+v8Rh7Upn0+m4B1VVwjx8LwflC4gjcQNfDkY7HrE+2apTCGaDUy9D85i/LEqyorXieE4FnLWtzEfimzN1T+rZO+qb0SI9W7W07SdtPKT+u/D4wvj27HZ/6vScKvnIxzccsSHHWhMDiXoF8U9drIe9HHcNWMlg+z7uOdZlSDJIR5OFqrCi+0q4RyoqUskJ7tCPWIym7LhbLcmPudA26kLqMsFO9PNuYtKOViT883yvzehtoIgItAf5j65LsbEqaGqRNV90gxz/H4pa9ixddP4jFfpdqm3x/8aEwh03Fjz5xopCj2z9DWUobOLH2Ac/ZydIvj/BGmvt8byq/hLicQkX1B8Qb9daD78VtGiPHzb+BMhdmawhfzJGcY82NpGe0wn8zAA16QXVjK/MHh840KhSXonvFXcFgXa7Li8yM7JgR63lbTyuFigTviCgE3rubkzfQZ6Hl5g5IWs4CCkBEaomddq1tkniO08wFfIWU4LTrMVbI+CaQUml6TZaiH1F5LNv/i2smSZJwIpPtUU+xfZWI4pJJy8u+bn0rviCup+2ny6CeWQMY/uRW4CPxrbINV7p0BUv2sh7GzkfOwG89h414kZUcVGaZf009+A1EdF5NPW5FTiawjUM+7Gr0CCP5bgTLVNB/UcAaYpje/1y2UYl0ohlg1WW52/YwEJANGylLaHEUXa2I7VYIyXoKr5TocDc0eERexwqQ+VJy7VnqfeR1yN5HuBlPkJQGzDL/iDjU4ebC16vlalIFSXYnZkI1wt3Gr8E2izxUW6Z7StmKKQnHMKCVnIm5QV+Nl+I6wODhBpCFYLzApwFEAlIFGz3DtCspAYShrXVaDIERY0FJvmPfsGA3DDDW53Hhx8+okUhDGgK0vFfRRU8rZVp3EIo0BrRxXgEH9wuzNKa3+jNi8WJ6WRgbNxD2m+gVLZY9iD8k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 761a428f-786d-4231-aed7-08db98629ea7 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:55:54.0194 (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: njyWB7cJDGLExOpzjmxQJgudPSJmaAE/vl+pPP7VFnHcEfuhnmUn52bMDNhP7ifly6PEAIF2Sb0/zxk2Fwke436Z03pCMYBG22HwncsTkcKIeP7IFz54O33VwHKHoY4v X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: 5HDJIDRGNLN2L3OMR7W567D2DFMAT5U4 X-Message-ID-Hash: 5HDJIDRGNLN2L3OMR7W567D2DFMAT5U4 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 --- sound/soc/fsl/fsl_asrc.c | 16 ++++++++-------- sound/soc/fsl/fsl_aud2htx.c | 10 +++++----- sound/soc/fsl/fsl_easrc.c | 16 ++++++++-------- sound/soc/fsl/fsl_esai.c | 20 ++++++++++---------- sound/soc/fsl/fsl_micfil.c | 14 +++++++------- sound/soc/fsl/fsl_sai.c | 24 ++++++++++++------------ sound/soc/fsl/fsl_spdif.c | 17 ++++++++--------- sound/soc/fsl/fsl_ssi.c | 3 +-- sound/soc/fsl/fsl_xcvr.c | 16 ++++++++-------- 9 files changed, 67 insertions(+), 69 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index adb8a59de2bd..b793263291dc 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -780,13 +780,6 @@ static int fsl_asrc_dai_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static const struct snd_soc_dai_ops fsl_asrc_dai_ops = { - .startup = fsl_asrc_dai_startup, - .hw_params = fsl_asrc_dai_hw_params, - .hw_free = fsl_asrc_dai_hw_free, - .trigger = fsl_asrc_dai_trigger, -}; - static int fsl_asrc_dai_probe(struct snd_soc_dai *dai) { struct fsl_asrc *asrc = snd_soc_dai_get_drvdata(dai); @@ -797,12 +790,19 @@ static int fsl_asrc_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops fsl_asrc_dai_ops = { + .probe = fsl_asrc_dai_probe, + .startup = fsl_asrc_dai_startup, + .hw_params = fsl_asrc_dai_hw_params, + .hw_free = fsl_asrc_dai_hw_free, + .trigger = fsl_asrc_dai_trigger, +}; + #define FSL_ASRC_FORMATS (SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S24_3LE) static struct snd_soc_dai_driver fsl_asrc_dai = { - .probe = fsl_asrc_dai_probe, .playback = { .stream_name = "ASRC-Playback", .channels_min = 1, diff --git a/sound/soc/fsl/fsl_aud2htx.c b/sound/soc/fsl/fsl_aud2htx.c index 46b0c5dcc4a5..fc56f6ade368 100644 --- a/sound/soc/fsl/fsl_aud2htx.c +++ b/sound/soc/fsl/fsl_aud2htx.c @@ -49,10 +49,6 @@ static int fsl_aud2htx_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static const struct snd_soc_dai_ops fsl_aud2htx_dai_ops = { - .trigger = fsl_aud2htx_trigger, -}; - static int fsl_aud2htx_dai_probe(struct snd_soc_dai *cpu_dai) { struct fsl_aud2htx *aud2htx = dev_get_drvdata(cpu_dai->dev); @@ -84,8 +80,12 @@ static int fsl_aud2htx_dai_probe(struct snd_soc_dai *cpu_dai) return 0; } +static const struct snd_soc_dai_ops fsl_aud2htx_dai_ops = { + .probe = fsl_aud2htx_dai_probe, + .trigger = fsl_aud2htx_trigger, +}; + static struct snd_soc_dai_driver fsl_aud2htx_dai = { - .probe = fsl_aud2htx_dai_probe, .playback = { .stream_name = "CPU-Playback", .channels_min = 1, diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c index 670cbdb361b6..ba62995c909a 100644 --- a/sound/soc/fsl/fsl_easrc.c +++ b/sound/soc/fsl/fsl_easrc.c @@ -1531,13 +1531,6 @@ static int fsl_easrc_hw_free(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops fsl_easrc_dai_ops = { - .startup = fsl_easrc_startup, - .trigger = fsl_easrc_trigger, - .hw_params = fsl_easrc_hw_params, - .hw_free = fsl_easrc_hw_free, -}; - static int fsl_easrc_dai_probe(struct snd_soc_dai *cpu_dai) { struct fsl_asrc *easrc = dev_get_drvdata(cpu_dai->dev); @@ -1548,8 +1541,15 @@ static int fsl_easrc_dai_probe(struct snd_soc_dai *cpu_dai) return 0; } +static const struct snd_soc_dai_ops fsl_easrc_dai_ops = { + .probe = fsl_easrc_dai_probe, + .startup = fsl_easrc_startup, + .trigger = fsl_easrc_trigger, + .hw_params = fsl_easrc_hw_params, + .hw_free = fsl_easrc_hw_free, +}; + static struct snd_soc_dai_driver fsl_easrc_dai = { - .probe = fsl_easrc_dai_probe, .playback = { .stream_name = "ASRC-Playback", .channels_min = 1, diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 936f0cd4b06d..d0d8a01da9bd 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -785,15 +785,6 @@ static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static const struct snd_soc_dai_ops fsl_esai_dai_ops = { - .startup = fsl_esai_startup, - .trigger = fsl_esai_trigger, - .hw_params = fsl_esai_hw_params, - .set_sysclk = fsl_esai_set_dai_sysclk, - .set_fmt = fsl_esai_set_dai_fmt, - .set_tdm_slot = fsl_esai_set_dai_tdm_slot, -}; - static int fsl_esai_dai_probe(struct snd_soc_dai *dai) { struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai); @@ -804,8 +795,17 @@ static int fsl_esai_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops fsl_esai_dai_ops = { + .probe = fsl_esai_dai_probe, + .startup = fsl_esai_startup, + .trigger = fsl_esai_trigger, + .hw_params = fsl_esai_hw_params, + .set_sysclk = fsl_esai_set_dai_sysclk, + .set_fmt = fsl_esai_set_dai_fmt, + .set_tdm_slot = fsl_esai_set_dai_tdm_slot, +}; + static struct snd_soc_dai_driver fsl_esai_dai = { - .probe = fsl_esai_dai_probe, .playback = { .stream_name = "CPU-Playback", .channels_min = 1, diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index fe28b27e50d0..550bf4da36e5 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -717,12 +717,6 @@ static int fsl_micfil_hw_params(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops fsl_micfil_dai_ops = { - .startup = fsl_micfil_startup, - .trigger = fsl_micfil_trigger, - .hw_params = fsl_micfil_hw_params, -}; - static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) { struct fsl_micfil *micfil = dev_get_drvdata(cpu_dai->dev); @@ -760,8 +754,14 @@ static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) return 0; } +static const struct snd_soc_dai_ops fsl_micfil_dai_ops = { + .probe = fsl_micfil_dai_probe, + .startup = fsl_micfil_startup, + .trigger = fsl_micfil_trigger, + .hw_params = fsl_micfil_hw_params, +}; + static struct snd_soc_dai_driver fsl_micfil_dai = { - .probe = fsl_micfil_dai_probe, .capture = { .stream_name = "CPU-Capture", .channels_min = 1, diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index f7676d30c82f..1e4020fae05a 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -849,17 +849,6 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream, return ret; } -static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = { - .set_bclk_ratio = fsl_sai_set_dai_bclk_ratio, - .set_sysclk = fsl_sai_set_dai_sysclk, - .set_fmt = fsl_sai_set_dai_fmt, - .set_tdm_slot = fsl_sai_set_dai_tdm_slot, - .hw_params = fsl_sai_hw_params, - .hw_free = fsl_sai_hw_free, - .trigger = fsl_sai_trigger, - .startup = fsl_sai_startup, -}; - static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) { struct fsl_sai *sai = dev_get_drvdata(cpu_dai->dev); @@ -885,6 +874,18 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) return 0; } +static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = { + .probe = fsl_sai_dai_probe, + .set_bclk_ratio = fsl_sai_set_dai_bclk_ratio, + .set_sysclk = fsl_sai_set_dai_sysclk, + .set_fmt = fsl_sai_set_dai_fmt, + .set_tdm_slot = fsl_sai_set_dai_tdm_slot, + .hw_params = fsl_sai_hw_params, + .hw_free = fsl_sai_hw_free, + .trigger = fsl_sai_trigger, + .startup = fsl_sai_startup, +}; + static int fsl_sai_dai_resume(struct snd_soc_component *component) { struct fsl_sai *sai = snd_soc_component_get_drvdata(component); @@ -903,7 +904,6 @@ static int fsl_sai_dai_resume(struct snd_soc_component *component) } static struct snd_soc_dai_driver fsl_sai_dai_template = { - .probe = fsl_sai_dai_probe, .playback = { .stream_name = "CPU-Playback", .channels_min = 1, diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 95bb8b10494a..78d9dfbe6548 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -765,14 +765,6 @@ static int fsl_spdif_trigger(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops fsl_spdif_dai_ops = { - .startup = fsl_spdif_startup, - .hw_params = fsl_spdif_hw_params, - .trigger = fsl_spdif_trigger, - .shutdown = fsl_spdif_shutdown, -}; - - /* * FSL SPDIF IEC958 controller(mixer) functions * @@ -1283,8 +1275,15 @@ static int fsl_spdif_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops fsl_spdif_dai_ops = { + .probe = fsl_spdif_dai_probe, + .startup = fsl_spdif_startup, + .hw_params = fsl_spdif_hw_params, + .trigger = fsl_spdif_trigger, + .shutdown = fsl_spdif_shutdown, +}; + static struct snd_soc_dai_driver fsl_spdif_dai = { - .probe = &fsl_spdif_dai_probe, .playback = { .stream_name = "CPU-Playback", .channels_min = 2, diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 53ed3701b0b0..079ac04272b8 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1152,6 +1152,7 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops fsl_ssi_dai_ops = { + .probe = fsl_ssi_dai_probe, .startup = fsl_ssi_startup, .shutdown = fsl_ssi_shutdown, .hw_params = fsl_ssi_hw_params, @@ -1162,7 +1163,6 @@ static const struct snd_soc_dai_ops fsl_ssi_dai_ops = { }; static struct snd_soc_dai_driver fsl_ssi_dai_template = { - .probe = fsl_ssi_dai_probe, .playback = { .stream_name = "CPU-Playback", .channels_min = 1, @@ -1187,7 +1187,6 @@ static const struct snd_soc_component_driver fsl_ssi_component = { static struct snd_soc_dai_driver fsl_ssi_ac97_dai = { .symmetric_channels = 1, - .probe = fsl_ssi_dai_probe, .playback = { .stream_name = "CPU AC97 Playback", .channels_min = 2, diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c index 318fe77683f5..fa0a15263c66 100644 --- a/sound/soc/fsl/fsl_xcvr.c +++ b/sound/soc/fsl/fsl_xcvr.c @@ -888,13 +888,6 @@ static struct snd_kcontrol_new fsl_xcvr_tx_ctls[] = { }, }; -static const struct snd_soc_dai_ops fsl_xcvr_dai_ops = { - .prepare = fsl_xcvr_prepare, - .startup = fsl_xcvr_startup, - .shutdown = fsl_xcvr_shutdown, - .trigger = fsl_xcvr_trigger, -}; - static int fsl_xcvr_dai_probe(struct snd_soc_dai *dai) { struct fsl_xcvr *xcvr = snd_soc_dai_get_drvdata(dai); @@ -915,8 +908,15 @@ static int fsl_xcvr_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops fsl_xcvr_dai_ops = { + .probe = fsl_xcvr_dai_probe, + .prepare = fsl_xcvr_prepare, + .startup = fsl_xcvr_startup, + .shutdown = fsl_xcvr_shutdown, + .trigger = fsl_xcvr_trigger, +}; + static struct snd_soc_dai_driver fsl_xcvr_dai = { - .probe = fsl_xcvr_dai_probe, .ops = &fsl_xcvr_dai_ops, .playback = { .stream_name = "CPU-Playback", From patchwork Tue Aug 8 22:55:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711978 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 7BDE6C001E0 for ; Tue, 8 Aug 2023 22:59: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 147DE846; Wed, 9 Aug 2023 00:58:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 147DE846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535538; bh=iPfESJ+H8QhvwOWznxTmXHh5IaLheE17tVejepPF1T4=; 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=o/Y5LYK7t4XZVFy6XR6S2nIzh7Rns+s938n4EF6ueH2obNyxdptXcGM5/aTSgj5Lc e1aHU3qtyyFXOqY2dCatiZgQ11Rm7m+G1GO/Ov9+Ny15F39Ro9ogObe3c1vH/2ZLu/ f8e6hDIAA6Kd5IdwCGK2JyvBZpLoia5ZPqZ2uoCQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 369ABF805EB; Wed, 9 Aug 2023 00:56:14 +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 88766F805EA; Wed, 9 Aug 2023 00:56:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E060DF805E7; Wed, 9 Aug 2023 00:56:10 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20710.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::710]) (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 37B69F80564 for ; Wed, 9 Aug 2023 00:56:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 37B69F80564 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=dQZRk9l7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Icq25qPLfAjnZ52ofDg9fLOMozMlVBlAKrjQD/O0eWAs6X+vrf3YVW+5s9SYVIrPLbGxz4wZVkqDtogG6qisJFUAuOuQAB+Tq22H/HVfs3GSMl6Nk3lsK6puSDG4uOdXOxSgXiaNvlCNngvKqEXSGjlz/iBBWZZqdXC+4xrlzks7ooDdmASWreI9MbHF9cWIPwVV8Tog8QvcnD7L4Q0g5DiV/BSwUVfkeEtenI09LTBhwgdNcaGi+72lyjAJwKb94jQy3ui9Y7Na5BWds1RJSzJKCAJO2RVnm85lOQucH0LVIM/CJfcTi+z+va3JMAzI+rN9emgKwd9zxciLMUoAZg== 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=RIpirIoWU5KMo3+vn6jBMOS8KvZoxLDqfz7Fa8Z0B4U=; b=n85Wm3TPDsjYFEPQvDDBIFtb4NFZ1LkMCdKX/CS8ljRk83GpZoNW18xbKHXXkrF0Aqj/Wb8x2h0fNh2IG0q0ZSYuTxy5Dp5NXTvfYrLwDl+0EROwTmiQ1alBaJlhoKipotEGmCfExdMSe7kMIhYbO8G4iEBXFyDfHVwfi+t/FleDwywloz/bP9AgkO0OyEp5LRQRZnAgEk/baHxObKyEXAWa952vY4DFqvTNVFu5nMUWeV+s0XAbFcW+wqA016T3VtUXp+dEzIUOK9qPX683jNGU4k0rt1iduuthQnlYMHqOAbDTedD5pw3quDASuu15N3pYWyy8GKMB37HyIkakug== 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=RIpirIoWU5KMo3+vn6jBMOS8KvZoxLDqfz7Fa8Z0B4U=; b=dQZRk9l7cuihyqt6Wq5aaQm1O2869pAuKKUvaYvM5WL1P5+9PpzXBkQZs4G82wRRdZydg4MNFSLLNfbumv+AUeQRHSr7ry6HEf+U4+AOxdDfyXNWfwz6L4uGgOspGV2V+EBuMPE428sUxnpMe2y2jgrjg87JtujvxjpqrEmxrXM= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:00 +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:00 +0000 Message-ID: <87il9pb0u8.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 10/39] ASoC: img: 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:55:59 +0000 X-ClientProxiedBy: TYAPR01CA0188.jpnprd01.prod.outlook.com (2603:1096:404:ba::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 61afdfdb-d2e8-4367-9763-08db9862a225 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bjp74NuYp9dJrUdTMaKCFw2f2vlV8lB0KYN8RJeS2T53cG32rCfrKMGew20SnQHtqQSoUUe35hOpRTYgvGJSsGgzMiJm9/xWJhIHEwsSL8b37fn9S3MdlBE2Di2Fl67J1s1sm8bxzDuFZcCaezZEfCid9YrogHMhoRF0Ii6mjDR+cyjHmO+5dvUBAojrrT7xib+/ufEI2qhXo9YNZPS9cjaIhSs5AG1r0Qo98YU2C2yGsi6xW4gr3XZ8ZEvHaVItRg39oj3nOoDHcm1OLZyPIVHxAaGwEa7K21qzPeFKrOyA96/iMG3WPx1lZPi8czTSLCxOyLIw4xSJAlWa71T93FfkRpneUOsZZ8eRk54fiXXuYdrtKFvEJwkOnh4YvO5EFiQuE1geIHaT9+AGJ1JoAGOjAs2VhSoRRoEkdA1slz7VJo01hkE7gpJTo/zR0c9g5tuEEywu690zVl5fg+1cty7pACZ6y98q++8jiYCg1BUNFw3w67J0Tg87Ae5kfLzQ+/QcK6t6ZmuaY8DdCTBauglGzqi61fGH8JTLn/TF7qvRB1NVD8+R5G2mXgNdlIbr5b4Y8f4N7xyt/czL/jgtfCXJaewq08yv6uV5JFnZ+8cvEF9Nn/20QiQS+lujtSjY 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j1XXRJ73fFa8rr8B3SqDcaRTT62CTcE8YSy3z+AX6q9Autuv07hwVOyCmsD+N50nlc4hdGOazKfVXCCTcNnisDLcoQx2PEPMqty9JT+ZY6Rgu9sp1mn1qWLfzFZHa4HBGHbiwGvApaQTtScEx6j0zpZ5oXVXQwV+YfZxio/4eJqGe10ya2Ac2ncVvxGrEl7biKGS7kumisPTyLUI/yuRUQ+w2IaqoYefnT5gtmV2g8AKE6AvFqyh302Xg80Nj5fRu7p2KjECrEtck6JdAh/M6m4d75it0BwduBGLgq+BGJAJOg+fiHVMGAm+wuWoz9Mp7D3jv4/JadrIrCeg3nRVRR83Y6x8f/1e0apLNXls+07Y7VvbiL1cJcI5Kiart0AlTpIy3B4n1nu+eAhv+9vrpaqlo9mfOhVdkOH4ajo8LXHP3s5FMs7Wi+DF7VCgHMTJKoak6VT2RQURhJ8p3QMR2jVTLB05ZmbWD3i6RVq4V1VCokqsUU03cj2QC5gsaoIJOtKfMPE++ZayehPsdLMoNbwUsuT8XuWLQYxNsj9CYEGjmvLHmYg0qEWXmnQxRQs9IRps8PoKNq0MAGWg3z5x02Vt6HIrJLR1fP9MuHpmIvlwIPe/Xh1CpMjEfEP8TFage35UX4e3NiUl0STdgYS70l743QbkTahMsd9m+Yw42a2KCWgCTFdFjx9J7nEJ1UVOiXEkz5kdsOGBg0GgpehOU2yCA9dAm7rAz7e2/molsR4PVepGheRyZfeQUsQqs5eJ6ce7xTKog+M4LxXxQWBIiNUCK+qeaM3bsKfVqm4ps6RxA3OyjHUbWZk4qaQdYSQPUcFdiyJKWa0rfRy27SqfUaAxyl+X0nCSncLtPE+5yqdUyGpl22/XLO2fLMqAaXoW+MdrHeoKkJatkxN60GkLBgLAkJCxIQvLXhTLv3gwlfixmOCQxKCTJOwH6bW+J6aTQu0jGwjwSfI0sXErv7TK6h3gvVIwB9fqgP2Crr/Mn180alg/SOywgBRO+3do2kseV8LgOEoxBRoyzuRBpEv7bzNn76RC7SaiLB+gVH/h86RAqkJlKtMzOGhYO3dSbys7++kLYfk7d37kDswE2i/vACGKX6dfhqrmNCA7M2r2NM2z5eKcP82RnKtL264LtGbVFBIvYFbpsFQPafz/01Tovwh41qw4QzPiGy/3GxmJacdWm9IPH0qEnn0IAM9/V6OzRvm+pQC51dNjGLIb207j49WUlGZoSlfjLmzbIVL/U0B0TreXUd+WyDTGdlMaemn0tPYzxGv6rZ3WpGtfo7B9dU7OxmymgSmBfnacSGsV+Cxp4kvznqfbG7jNmDZxyEcbWSjeJG/JvIXM8OsPmf6j4C2P7ail5Ekqr16+dk29rhUfhLAmpWvmbH+r8RePl/dZTrJUXkeEI07izYq4k7wnFzv0P4taCsCja/omP2P67a2VgGdHTkkQ4klwZoWOpeM5eiLMn+900GOGRdZHhmLVjy++ui5Pv4Xz273M9kz4E8WtVoRlce4SW5h+YrS2vLBHPNkKjmE/BTSPbLkR14CEfRJofVb7e3YE05inVL2WW86fqWxL0DG9YKOYGWyR3TWJrRZM9te1521Cx8notW9U1rj3Vuk4m2LZ0Cu9JoUiW20= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61afdfdb-d2e8-4367-9763-08db9862a225 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:00.0072 (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: /pjamttjiuZmdKiLaAYcl0OEq+4jxFhoOQ0I4dwnoE+j7FYmkEW1WDsIQQN4qWbjsK2QGz143UkaKKSWYun8GiK5331HiORjK1NFvF9WzPbX02eyhFCtNzhgUKioWsuD X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: HYLYWFYN6DQJWDDOA2FRATAJ6K4CZBLA X-Message-ID-Hash: HYLYWFYN6DQJWDDOA2FRATAJ6K4CZBLA 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 --- sound/soc/img/img-i2s-in.c | 14 +++++++------- sound/soc/img/img-i2s-out.c | 14 +++++++------- sound/soc/img/img-parallel-out.c | 14 +++++++------- sound/soc/img/img-spdif-in.c | 12 ++++++------ sound/soc/img/img-spdif-out.c | 12 ++++++------ 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/sound/soc/img/img-i2s-in.c b/sound/soc/img/img-i2s-in.c index b7ab8467b5cf..b6b6339c164b 100644 --- a/sound/soc/img/img-i2s-in.c +++ b/sound/soc/img/img-i2s-in.c @@ -370,12 +370,6 @@ static int img_i2s_in_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return 0; } -static const struct snd_soc_dai_ops img_i2s_in_dai_ops = { - .trigger = img_i2s_in_trigger, - .hw_params = img_i2s_in_hw_params, - .set_fmt = img_i2s_in_set_fmt -}; - static int img_i2s_in_dai_probe(struct snd_soc_dai *dai) { struct img_i2s_in *i2s = snd_soc_dai_get_drvdata(dai); @@ -385,6 +379,13 @@ static int img_i2s_in_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops img_i2s_in_dai_ops = { + .probe = img_i2s_in_dai_probe, + .trigger = img_i2s_in_trigger, + .hw_params = img_i2s_in_hw_params, + .set_fmt = img_i2s_in_set_fmt +}; + static const struct snd_soc_component_driver img_i2s_in_component = { .name = "img-i2s-in", .legacy_dai_naming = 1, @@ -468,7 +469,6 @@ static int img_i2s_in_probe(struct platform_device *pdev) i2s->dma_data.addr = res->start + IMG_I2S_IN_RX_FIFO; i2s->dma_data.addr_width = 4; - i2s->dai_driver.probe = img_i2s_in_dai_probe; i2s->dai_driver.capture.channels_min = 2; i2s->dai_driver.capture.channels_max = i2s->max_i2s_chan * 2; i2s->dai_driver.capture.rates = SNDRV_PCM_RATE_8000_192000; diff --git a/sound/soc/img/img-i2s-out.c b/sound/soc/img/img-i2s-out.c index fe95ddfb8407..41ea5ba52181 100644 --- a/sound/soc/img/img-i2s-out.c +++ b/sound/soc/img/img-i2s-out.c @@ -376,12 +376,6 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return 0; } -static const struct snd_soc_dai_ops img_i2s_out_dai_ops = { - .trigger = img_i2s_out_trigger, - .hw_params = img_i2s_out_hw_params, - .set_fmt = img_i2s_out_set_fmt -}; - static int img_i2s_out_dai_probe(struct snd_soc_dai *dai) { struct img_i2s_out *i2s = snd_soc_dai_get_drvdata(dai); @@ -391,6 +385,13 @@ static int img_i2s_out_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops img_i2s_out_dai_ops = { + .probe = img_i2s_out_dai_probe, + .trigger = img_i2s_out_trigger, + .hw_params = img_i2s_out_hw_params, + .set_fmt = img_i2s_out_set_fmt +}; + static const struct snd_soc_component_driver img_i2s_out_component = { .name = "img-i2s-out", .legacy_dai_naming = 1, @@ -504,7 +505,6 @@ static int img_i2s_out_probe(struct platform_device *pdev) i2s->dma_data.addr_width = 4; i2s->dma_data.maxburst = 4; - i2s->dai_driver.probe = img_i2s_out_dai_probe; i2s->dai_driver.playback.channels_min = 2; i2s->dai_driver.playback.channels_max = i2s->max_i2s_chan * 2; i2s->dai_driver.playback.rates = SNDRV_PCM_RATE_8000_192000; diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c index df1291ee2b3b..815e68a7048c 100644 --- a/sound/soc/img/img-parallel-out.c +++ b/sound/soc/img/img-parallel-out.c @@ -174,12 +174,6 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return 0; } -static const struct snd_soc_dai_ops img_prl_out_dai_ops = { - .trigger = img_prl_out_trigger, - .hw_params = img_prl_out_hw_params, - .set_fmt = img_prl_out_set_fmt -}; - static int img_prl_out_dai_probe(struct snd_soc_dai *dai) { struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai); @@ -189,8 +183,14 @@ static int img_prl_out_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops img_prl_out_dai_ops = { + .probe = img_prl_out_dai_probe, + .trigger = img_prl_out_trigger, + .hw_params = img_prl_out_hw_params, + .set_fmt = img_prl_out_set_fmt +}; + static struct snd_soc_dai_driver img_prl_out_dai = { - .probe = img_prl_out_dai_probe, .playback = { .channels_min = 2, .channels_max = 2, diff --git a/sound/soc/img/img-spdif-in.c b/sound/soc/img/img-spdif-in.c index 558062a1804a..9646e9d3f0bc 100644 --- a/sound/soc/img/img-spdif-in.c +++ b/sound/soc/img/img-spdif-in.c @@ -682,11 +682,6 @@ static int img_spdif_in_hw_params(struct snd_pcm_substream *substream, return img_spdif_in_do_clkgen_single(spdif, rate); } -static const struct snd_soc_dai_ops img_spdif_in_dai_ops = { - .trigger = img_spdif_in_trigger, - .hw_params = img_spdif_in_hw_params -}; - static int img_spdif_in_dai_probe(struct snd_soc_dai *dai) { struct img_spdif_in *spdif = snd_soc_dai_get_drvdata(dai); @@ -699,8 +694,13 @@ static int img_spdif_in_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops img_spdif_in_dai_ops = { + .probe = img_spdif_in_dai_probe, + .trigger = img_spdif_in_trigger, + .hw_params = img_spdif_in_hw_params +}; + static struct snd_soc_dai_driver img_spdif_in_dai = { - .probe = img_spdif_in_dai_probe, .capture = { .channels_min = 2, .channels_max = 2, diff --git a/sound/soc/img/img-spdif-out.c b/sound/soc/img/img-spdif-out.c index b13e128e50d6..dfa72afa946e 100644 --- a/sound/soc/img/img-spdif-out.c +++ b/sound/soc/img/img-spdif-out.c @@ -287,11 +287,6 @@ static int img_spdif_out_hw_params(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops img_spdif_out_dai_ops = { - .trigger = img_spdif_out_trigger, - .hw_params = img_spdif_out_hw_params -}; - static int img_spdif_out_dai_probe(struct snd_soc_dai *dai) { struct img_spdif_out *spdif = snd_soc_dai_get_drvdata(dai); @@ -304,8 +299,13 @@ static int img_spdif_out_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops img_spdif_out_dai_ops = { + .probe = img_spdif_out_dai_probe, + .trigger = img_spdif_out_trigger, + .hw_params = img_spdif_out_hw_params +}; + static struct snd_soc_dai_driver img_spdif_out_dai = { - .probe = img_spdif_out_dai_probe, .playback = { .channels_min = 2, .channels_max = 2, From patchwork Tue Aug 8 22:56:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711601 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 18EE3C001DB for ; Tue, 8 Aug 2023 22:59: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 34A21DEC; Wed, 9 Aug 2023 00:58:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 34A21DEC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535552; bh=FoGHS2KcaN1P/dtfxDGThgR45h2O4PVkgLqtIfMcD+Y=; 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=XtAAQ6B7TyTCtb44Y2fQvi1HWI4ygyaJKxb5W8W00I9RICxybJRrqboSegByi1hMV U86WYjSZA4ii0Su+szQMrWEpfFG+epI29TUJhVvnh8XmK2TymePOviaeSt+JmV6Q5O q5kkJsyCDoYVlTMsro2Kb2/6i4ChvA7GgClXkNQw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B1EE0F805EE; Wed, 9 Aug 2023 00:56: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 1376EF805EF; Wed, 9 Aug 2023 00:56:16 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3C647F805E5; Wed, 9 Aug 2023 00:56:12 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20710.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::710]) (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 186F7F805D5 for ; Wed, 9 Aug 2023 00:56:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 186F7F805D5 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=TQvo44jE ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JhOaS8DEFeA+bXSRPYMY1Aw1h6mGIOBnlxd5oHVGdEs4fVYhR+LuY6bCaPboXRwXyR+6lJTLeB55PGXDH48mIRTSFhq4Tqxxrioax/EU1CuE5C4oFXnxQBEXp4VgUZWGTy3ZshbzfiUtfluSzZ0HbjvOKdBZ9WZ05PDgYR/zbqAH/Zq233ocjKGp7GkWwDkpOiw3vVY9GGCj+BmzP8OjNSJAtFnIx6d7PgPuuk9ahU1T6pMR0P4vUUJGbhWl5BfN3OHvuC5dU9Ezhbmceey5oN43rNLQfuKHECwgb+DLBjOkleR5gshVuRaIAKspoYrfnBUnN97OHxev9tDbWsr3zQ== 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=cTKuXr/A2BPp0JtsD2ycwLEZWaFng+Kfx7n76DzsDts=; b=RplgXJ/sh7K9w8SjGIuFyPwZquux/RPGdRkkTe0BJIKqR0rRjAul1dlp+kdobda73A7vMiKtOjRA2iQtNOET3wYWkKOu41VKHmEAVSwG4tXxKRMzGPkpj5io47jblEjoPCMGWyfO3SY9lwnlZceapZyCgu2H8uGpzZ9Oedk9azlcfF92KwUl005dSRxib75cDOQayy+jnueQ9svsJjCwEEL80t3pcq3Ljoa/3TOUzxh66b4JhL7lZRcfmPHQHwGOr+10Cl0anLj8Jy7N1Q7d+lAq2J3J5RUigeDkoXVq704+VDggByV8oWI89dO16lqgNZIvUhv23QgI9vW5hWXAow== 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=cTKuXr/A2BPp0JtsD2ycwLEZWaFng+Kfx7n76DzsDts=; b=TQvo44jEXebwyOG7ZpXq6GNoT5vetoayJ/jiHPC6JsNS/RKlE0dpS1EClKqMR510VikhfDuSgXPbwYpJjoxN07QhH546pXPD+WDSd3KbdS0HsubfxayOn1fMlPF0KoWtre1R9vjxdssYSaIHtV5w+p3o14QApi5K9RPCtcvOLeM= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:06 +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:06 +0000 Message-ID: <87h6p9b0u2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Daniel Baluta , Jaroslav Kysela , Jyri Sarha , Liam Girdwood , Mark Brown , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai Cc: Kai Vehmanen , alsa-devel@alsa-project.org Subject: [PATCH v2 11/39] ASoC: sof: 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:05 +0000 X-ClientProxiedBy: TYCPR01CA0173.jpnprd01.prod.outlook.com (2603:1096:400:2b2::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 150ad926-08df-4688-180e-08db9862a5df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xGbg1fthESSMr0zaPBiVY4E4GzmdE2iN1NYnrQ2pmdsHtzcYDhxvrU4RiTJjzL0+UsPNm8Un/FNzM7BR6Nx623P2KP/GHdQwj6vhHrrGqfOvqJxm6Jx7vAr8aIsps+ZQyJ+sPxKxdWEfjAuHhJvfCEv3qcUe7njAcFScvWBNdLGYyAft2192PM+1woy27g30zXQVEsPAd1ncPIkfxAHk6ikrAyjtW0ucIa74BXyawOVCn/Qwi9E9XMqIKcfTTA1JAn7GbqBscnV3BaYLu/rGbYG9b3kmGWRSBReLyOknGFbYVN9TZdLTaKMvLfjNNV2R3KTTOUN4fb6lCPDuMhjsgvmNPOlpjwvDyVXdw53XD/2yvwb6GElkK+eu9I5q12dnQGqkOIL1ealkrcOiGOlHO9hNcr0fCZJBj7ErjDD92kmFqlfUAzsruOtUsDYiV9RR19nQPljsUKtlHYh6rm3y3x7jsQaIGPe62aYpgUN2rjTTKM2G3hb+Tmzm58/q9NY36ikvXnbeHMc2QhYJHnJa+z2OBMC4Yg1NTk+XDDScL0+Q3fm27Y8WTLlmLRS7SMFJucaTSlsbKChyVhLLbNb61bWLwIoJSuWLbnqssEIbuIcWe2wnl0alFsWQmNqLkIpxg9ewS9YHUBm2G+Lroh2qNA== 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(4744005)(316002)(2616005)(41300700001)(86362001)(5660300002)(7416002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(921005)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /02YMcIVKsm2K7iuWBKN+lE+3DZHiCQrjy1VuZIZD6+MB1VpreLouuReqjmsBdqp5PzGyuTZaLZ9eTaYgtkVAK962bHDl9U4BKeS296aG+w6iRWlokJrlQSxf9o+nRbHkSxdYDureIhxqpf+EDpyirnyDlGQGpCWD2vu+jJCguK4zlkFOGpSbEUHLub6B716/4Kgifwav0CuyeXN5p3CPF/ZJtAKhCL4qmoH4x6IEKL6Lg0oEaa1p5RrT+mXg21qceuq3Wfvd+c0s04VZffmaRLBjJkXsniS92+rfuhAYDa/5i36oTIArH5KAt7YGk1F8VbH9M0AA5l/RRkrx1sjx/DPtC9CPP1f+boaPB549jCEftjKBzaR2EAW7gnDIGxr8uxzPrnhRF8iRmpQIvD5UomQF/iJp6doyPIldvcvlOQpzyAkKwhMJpMgueVBYrXuk9FGWCzehOUFMKXZiahknxJeiT9fITMyUJRORT3zh9bmcTs2PYmyK+QdTPgDjQ+6st9feD03818V1F+ol1A4pJpnd9pmAWwd8ZoyTQu55ewQJ5qfAQZKqDfi7Qg27B4PDci+CzYZUW8/r9zbSBksE/btMLn1mEkZcqWgLPTNMO4l5Q3Q+2k7QsNqSDGJ5Y4ShdtXIFwZAWYi8V2GJELdb0aI08vJLy/y/bBvnz2HYna3PX0LXkG0x7rGIrVQAdpJ9v+MYxh2j7/bnhTa5abF40mNa9pqa23kRDopPHZzQwkgraIBFhkUkRjXtSMZpaAajNx65oBDeTA7ByMZvPHktPEH9cq3cMucx3Mv/IgTNrbwqJZlCY4GcoIYr7OoV6x7iSVKnIDFFxKeU93xSEj6LRj3BEE/LbRlnt5Dw8X+sHvialjBBx663P6v/Hsh1JIfd7HSz/TK+gLYzOFOZa6gsyn0crQilsY25YmWSzkfHz3ZPrqVdVwkZ7/C9oKpTtHSVw8Dw2GOXMOSUHKxXeHjxKBV2+hVpbBCNTPDYgMOM9MPtm7x+2C2Gcqrqp6BgqlCXIRCbvtVswKm1SngiBQybk6YGKh0vBg1WxlWXC2HJzCgnT3J9vQu8uThnL8R08WjWZeQel0pgIBkx8CZh4FM/vWc+3QnU1WVeZbTVqmUNtbqwWfC2Df4mr9WheJgQa2f61X095etnhMU4BDSEK+VObJ7dY8j3ZlBe54PkMTxIY3vqGahODYnmqZPJPSqlcddGWkgz5j0kUvvo3gw9DwZ5t6kCSC8mba/F01Ox1CPpbo3HIgZF0+YSIIjiHOsBGqEO5zWjmJAKvxYowjYMi3sAarHA7j6Q9PeVLi0Vy6IWWnjKl9KzHnRGvMQRXqvfQT4qDGS679BSEOnRzsaMT1t6tGSS1JR1LdMDRoUulkIDGsYi07IQByxqJ2Cp/llLAgR8wdUtOm+F9dYcamV78tP3s8YtalAP6+cTAvyR3BofrhIm0xkCgUFk2sig5MwXjrXzQWTUVkrE7e3NxSybt1Ty0GeUeDxLa9DMxLc0/GmQ30DgjeHLeik8tYwTRRstDPJHHojMha/JYmbM0hCFN8HN6OZ5dZNaEQLEtOyu3cO38KrOgNfqjoGXx0+3wBDe8MxVzGEZuKPFsJUOOKGjZk90qH6Ox2OYbjCTC2SsRsx7OA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 150ad926-08df-4688-180e-08db9862a5df 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:06.2886 (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: eHbpIwgreqpl8MRe5qRSMKzllMN/Q3PsITgJwEho/MCLo1sky20AgmYrBv5DXQ+5rCa+J4VjjOj+js57+2wkyoVS+JMJEHgy9UWwtk6e/0QvmatLO6hbuQTWlE5PK2tK X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: KUTNV2IVZAFX4M6ABHCBYS34CAM626VF X-Message-ID-Hash: KUTNV2IVZAFX4M6ABHCBYS34CAM626VF 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 --- sound/soc/sof/sof-client-probes.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c index 5530b5d793d0..740b637822db 100644 --- a/sound/soc/sof/sof-client-probes.c +++ b/sound/soc/sof/sof-client-probes.c @@ -354,10 +354,14 @@ static const struct file_operations sof_probes_points_remove_fops = { .owner = THIS_MODULE, }; +static const struct snd_soc_dai_ops sof_probes_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver sof_probes_dai_drv[] = { { .name = "Probe Extraction CPU DAI", - .compress_new = snd_soc_new_compress, + .ops = &sof_probes_dai_ops, .cops = &sof_probes_compr_ops, .capture = { .stream_name = "Probe Extraction", From patchwork Tue Aug 8 22:56: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: 711977 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 19619C001DB for ; Tue, 8 Aug 2023 22:59:26 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id BFCF9DF9; Wed, 9 Aug 2023 00:58:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BFCF9DF9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535563; bh=290o3i+IesnNoqxH2L52RnzXw/of88iCAqN3E52djt0=; 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=TaE4kzMoYTVPAa2nRtxf+I/r6vu24weynJEViFHP8qItgNg7znAHdwFcmXrAOcRrE WBBaoLSS/T/WA6M0Wh2uQIk/oE6t7yLcmlCuIxSkcXE2oRMNDf4oBWPwSJcNwsIEH8 1MEcaNUXW6qDjwI9ksPfSg3A8extKwSg9BnMbLRQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 73178F805FA; Wed, 9 Aug 2023 00:56:21 +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 BE454F80589; Wed, 9 Aug 2023 00:56:20 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BDCD1F805F7; Wed, 9 Aug 2023 00:56:17 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070b.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70b]) (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 7DA36F805F1 for ; Wed, 9 Aug 2023 00:56:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7DA36F805F1 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=ngSOuj7D ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e0GfXR5W6riUF7v8owPB5YI+SjKD7lT8UGs9QoFmhUDhtxnSHALA7GlVoGtU5uouyz3bf7QG3Pk95i3blOmuPQsFz7YgyZkVFiO6VuOPqROyvyc7+p9D4ptqNpVBubEBJ5+5ZRw0u/Itn+sQvvfty0qxVSZYoXe5yiG5494PuqJbf3UbWDbzrd/EPQain//WY/80OZjUx0pCYljPEV8kvSF6moX4V4H4mgFlEfkIvUvHvfxRKaIYLXAZwam+8aO+B+jzf8bdlwiU4Ear4Et0dWN55XuSFlKXXlwffXIHMWwH2z9UoAaJod5KhCFiMzCiqYVIGLADsa+T/A3eeTbe6Q== 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=GiEw61IUokwy0eH4EakTj2I4VF4NlWxgZJnfg9YVAwU=; b=oPxo/RcQFyxYepjECZd2U60oAW4irxHsNWdRhFp22njO7/4FrGuQ4GBJR1GRXm8r034L64M1f/OKVbHy+nYPfpQvgKJtkUSP9aNbk4ON88Tp6nkqIQbwV96btqYic/fySGxzeXhln0I4sLcO6J2QImkJgKyatrVM0MEGvrZj56oCX16ooQ32lf4l3zzLjSCn4XqofXMp/DVVNquUH46APIxn56PVkpvUU2i5ujvyWQ4dGQZmVQTctV6K+6IKfupI4ISNacrOMD/LUrQqZbXcz9NkAvGxvXdnWYasvWqLqv6SI/Bemb207V/Xu3tAkV3mbYliKlhmmexzoWVrAbT9vA== 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=GiEw61IUokwy0eH4EakTj2I4VF4NlWxgZJnfg9YVAwU=; b=ngSOuj7DRrzh+l4AyIRy0AoORX1r84/ZRgGhaBnVwfa3AMZCWDwOy0enqBinhdnViHZHsSj6iHI2A7nhM1Wb9PC2JCyboTbQC7w7lhUlwesuqDeh+8ZgDWLjP3bCfOXhspZG9WC66LfCuVDllBAsY8+21CH+BAd+MaRowr3a57U= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:12 +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:12 +0000 Message-ID: <87fs4tb0tw.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Arnaud Pouliquen , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 12/39] ASoC: sti: 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:11 +0000 X-ClientProxiedBy: TYAPR01CA0015.jpnprd01.prod.outlook.com (2603:1096:404::27) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e7c0388-e5da-46c1-fda5-08db9862a97b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M4DfK0ammYLhe9hpFpoLm9dHlrsGcKmbA3tgoATJ1V16+lLxBfpmjI+xxZYgtrM9m5eAhWKZng86JU3sp+vkvnITBzmIGiBaGfRvIX/ZdxZVtGxtwzbiL480ZVm4BYhpZjzqvbMdj4/AZl4K87QrdLVxh8uUSOCOkxQjr8Cmcwx4NomhfaLEolhc4+48uMiXGrPhaTE421INmLXL2NpgKjKuxiZqQruhXzfg9aER9Mai68/4DSeWCY1lBpT1DlcXz4SRcK2pE1v1CHShC+Ks47yqveKGvv0uPTc6G/Mn1AoyPxpdxK4Cf1mrdynQ+9wIm/r3Qwnndh7ZIP0CpJSow3ZGVUPwbOFxBAbUFczOlDYgd7fFvzSAaFXQnCskhTykokFOF9u3r1oUMop59fuX7gTPmAPaiuW8WoKiCRfSENtVFU/j5KeuI2CLU/hb/+peSTs9k9c6rN6N+BGWAXd3DqoHyuPpgr3ORJFR3mjYQQfomPMtCY/4q5xkK84tIjWndKFGDep5v+rs5gSWFJ4KR4KBwE+t/8jiyv/YhWLzob4TyQqqS2J6iskzVjhGmea0LTyu945o7yRCCORreqQ8B50Qr7S4BxX3uvl98XnkzFw3mvoX9yX/3R5imkbeY30c 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(4744005)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JAN9HF+TtHFKlgsqLbJ7NRp7olUriWtuhRgOygLsFRHu2/4nZ/OnZOVvV1Q/BllVOrpX9+jE5Y38o//jg6OklsT6m8B+nyuCrACVzt2hm+Ctzkx43X+qAA6rV2CMtNQ49k+rY4R0nwbvo5RJ/kFRF50qjH24c07X5DKh0e046QoHHu+mGXZdzcByOvyos19kWRoTio8S7+5BdxDgRWhRjTDdKCrAEjxtoBkeNqbyIA13Rzxq9n7Ak6XjFyg1Oa8FC+GcVraw5Et8NBFVnLJRxFE3guaRqwbFxsBMQ5NBeBmZVwdTWULUB49Kcv5n/xa5dLkImLL/3Vc/zLh7epPrrigX4FVmE/4aTSBqke8K5EcUQjEajx2FHshjdAzVsc3oVsAbhu5fw2BSlhDb0GAVkGCxXaZkInvh4365bZ6KgUQFXjxYRWq9dJJzak+Q+Z8L0/HJquD+QXxPt2F6n7f3n1AswX0kHhsxKEGNJrQAlUVhnhmQ7e5/+e/X80U2npyqbLoRRfc4Qt/Tp+XNJ8FnBqBKoHWBqJojPDGsAhqy4CViafV0kYAVrlShEQR0IxTUjjlJBZbzepFsq5AI3PmFoDIC391vE4ULDc3p3BKB5hQE3t04zS9FhoNXDARH3hdffLXVV2vCt2ayQ0Z21lIrx6lETpYWawOfxJRRY/njRuZ7HyHlDNUnH9OBwRW1HgUGv+9n4gpcszg9oSIW6+WRx2kiqM5aUHegV0YjquzQBKfcvx83ZWi3GJ9ZbZBszUrH3WOs/2/Gm5EvENAabaKfbAUxaZQVIzc44OGTgLdwDFHokm91bAQdVdEsQocj/shp2kcOdXzPl08nUS7XT6Nank2pimInchPGq6cph+3UgmhHrfBgvwZq3FYBCsjDVLFFH5FERkzadb96CEScCvUxqX+53ZbPDtYikH0nysvP8K/F/0RBQk0zLoRznajh/8wlpB3A9R9/6zpXvuAuykGPzPoVjUOeym4io1UhHxMGnodlfr0RvTPiz1SGw5AN4VUtYqGjgbvpzUlby2kM3LU//0gPoAeKGADVKrgPAn1TfTBtGecTNl9KTr9rmRmHq8XazSpNjbk4VuA6/CbcfcMdVXsYD2szFN4iZg4am8xlYzYYUc13nMe0bowyHLtpWzoXhch7i/MHV2hmOmIisef8Cy7PzpTBZfBWX2NiuLDUP6R5gNStZS6FxEPMDc2qNJaJ7NAOV1YJWIAieEFe10GBeqUtANEjQtIpTV9DBS500wVNsIv17/rbBWS7Ab6kOiqp0LVw4LbnQEu5H1Y/KYMyrGhCcuftA8KDsVikjhA7rVYokv4cJTkIU+7VARdYFVNIjCTR3kWmja4Gyt/hLZ5J8AjvnsgOrNUstju2qW1G07yskuUCL6wFJfsE55aRott6pNdYEvPKRwQl/SQwVDIO9WWri90OloxhNK8SFRhvxtn6rqn+b6QnrmxGGfX+qKfQJE+YQEDHCvFOCn1HzwfgtKAYfi8Y3nUB3Trz3WlChXHKmCZLYe0sIuEuTegnLaoHvRPLvgsTxpvAqkF94NGAKw/VjclVdVG0CWQbyGnIJDjmLvBaA9Z5I8IDnAOT7bah3yJ5P/8wbe3sZ6j6/PKfrmcx+TX92KA5cbITro4VBsA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e7c0388-e5da-46c1-fda5-08db9862a97b 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:12.1540 (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: vsEgAZn9meLNx1+gYaLG/0w1RNsSVj6nrkGGgiDhR7IYtLRHqqwRXiZzKagnkj0J69wLvO99mWjC5sEhnJsgPi8YBum1K6NXjLpEf/ntj5LQiCfCik7c65FMkxVfIDII X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: 3LKJHEOE5VWEVBFXQMZAOTX7D3KA3FJ6 X-Message-ID-Hash: 3LKJHEOE5VWEVBFXQMZAOTX7D3KA3FJ6 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 --- sound/soc/sti/sti_uniperif.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c index a4d74d1e3c24..2c21a86421e6 100644 --- a/sound/soc/sti/sti_uniperif.c +++ b/sound/soc/sti/sti_uniperif.c @@ -369,10 +369,14 @@ static int sti_uniperiph_dai_probe(struct snd_soc_dai *dai) return sti_uniperiph_dai_create_ctrl(dai); } -static const struct snd_soc_dai_driver sti_uniperiph_dai_template = { +static const struct snd_soc_dai_ops sti_uniperiph_dai_ops = { .probe = sti_uniperiph_dai_probe, }; +static const struct snd_soc_dai_driver sti_uniperiph_dai_template = { + .ops = &sti_uniperiph_dai_ops, +}; + static const struct snd_soc_component_driver sti_uniperiph_dai_component = { .name = "sti_cpu_dai", .suspend = sti_uniperiph_suspend, From patchwork Tue Aug 8 22:56: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: 711600 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 75671C001E0 for ; Tue, 8 Aug 2023 22:59:35 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 42560E10; Wed, 9 Aug 2023 00:58:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 42560E10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535573; bh=hQYni/gxt7JLymewevPtfkGHVGxU5v3a+ckiQ8icSHo=; 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=FTUTKxj2N+sWjUJ1zPyTAxcB8BsWz6ISM8chIam4q8nqngBkNXnqV94TJPCGv6qEU cndFABUCFTrlOttljhDgOgY86xkP3FKtGejcxGBwyuu0k7yj8nlFu4vuyoyBEXrojo 1612iWLDFbRCmoYRDjii0Jr0iDgPk657OcrgVZ2s= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0E9F5F80589; Wed, 9 Aug 2023 00:56:27 +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 87F30F805FC; Wed, 9 Aug 2023 00:56:27 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A0615F80600; Wed, 9 Aug 2023 00:56:24 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072c.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72c]) (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 16D90F80589 for ; Wed, 9 Aug 2023 00:56:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 16D90F80589 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=OF943EJi ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZGfkdG3rnLK4XZRqyJJt1otkCMe8dlYCzMUlZ3gTQPUre9TmO+G9JLoVlV+B8748chOJQon9ee5qY1CYD6pFPF5zYITTvpat476mG9rC3wrFNUCh2H6Od+eqrKZ0KrVYdPpx1hMo7sKR6taJdhS3Pz0NQJLWvCj6dvEJnm1CiyFp6vMHX7ffsluPzC9I48CVScHz3O8xjr9Fy8aUWYklXerlSy3A2EybRRdis6ZcIZPLRLxhEwtC+2BYjY4DOoskTm7xglqaiezUOX6T3Sa5Q0EdykyQNJNjo58LdoC92nlqykJ7Meb55Ny6iv9NVy85qAYyGvx/u0LsMRORHHVIEg== 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=FU4RAmCNy5jZYBxSn0JjlWwVDjc4LtjdpnM0azAG53w=; b=CkhzgqlNRbz2iD3ok6Z7FHIAx4Q4ASBE1Yx4DZP5bR4knMM4Fsn3keUB6e4NB4THyugFQOOmDmU+Im3VB/gNmhev2nqED2X1LHkCQX47dSdWUVeVLzBV5jfKK4LShnDAmP8E8/bFyeBot568j7JAjiea1UXFYg+QI3a81i8o/Lw49AXSXMdlEHFrndEsSTY+TW5w3hXaq8Db0xRubhVZRDzbAtKbbwHf3baycGHtXRZax6tkq5ZlOH2frSWQ50SOOb824D5FPvJSLw21nztuglRGzav7jORk8BRwYWkmkgwThhVMLHPeU+Bgqi9czYI01DprrAtinsuhGOE5iZooqA== 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=FU4RAmCNy5jZYBxSn0JjlWwVDjc4LtjdpnM0azAG53w=; b=OF943EJi7ilhI//cfyKRGBxTx2sLet4p0eM+bfzGH8bIgPVfP/sq+oqa1DhyzHM/j1Y4Am0nM9LLFFkNZogF8MhkOrVfUsvMTzHO72Ig0oC2sT6/Y1pLneGdMbkxFsBG3D/jtfeb/P+hRcegxSb6UO3bKuquFj2cAk/T8DvoibE= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:17 +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:17 +0000 Message-ID: <87edkdb0tq.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Alexandre Torgue , Arnaud Pouliquen , Jaroslav Kysela , Liam Girdwood , Mark Brown , Maxime Coquelin , Olivier Moysan , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 13/39] ASoC: stm: 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:17 +0000 X-ClientProxiedBy: TYAPR01CA0114.jpnprd01.prod.outlook.com (2603:1096:404:2a::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: a5d9f4d8-3d46-46fe-74e2-08db9862acc5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wlToLXyTfQfx/KHBxjSAU9mQzpr0e6LkfuEx6+lPpwnUomMbO9JIbBFhSdPptEo44IBbwf/BOw5io/Oko6h1QWUn0AStbS5DPq9chnfKxz1Yavh1lnPsQN1p6EkqZDFqrjV+cjHHM2KE1i9g1ns1LoVas6dPomgR85GjH4UXhdzuXmgqp0KHbjyVKXeKUgeN7ku9Wltgmj+0rhjCD5Nj33nKzeYsozxncoMrItNTHeZaIADzs25f4C8g1CSgrhHMAy7zsPhE68U5mrqBThyORbTJxocFkgFWVj361bGxDarSZRz8yGMct5feimB7o6z2LPhhu0diPDVWNT7Df5cZSaED3dkMtT6zdLSwNBlLr4al1zdFjpu+tpLoGBZS03oaIpTZlYpjW0PAVRrBWVeS4x0Dewea53TLDtEC2ylHme/FJgITSrMX5anMlZkQWihcJaEWEuYYtL+m0BEj6PlH/umdVAlqVfczlElV/a8q3wOV+j6UK0eEjk4BceHiHkFGMAyaeGfIcyv7n23dU9BBEC/YkeKDGLQlMZBFQZVXdUfgZvliHKqljPSkxbjpZJrsO5cZfoWALPzir95knXgB1d0HjcytkaQ+9ftY22+B9a0cMWgHLlZvsrNM9QCQo9ZD 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: baXdhtkgi8Bc6TXDO4waOfR05QHRm3sxSP+qdgjtVcm47YgkncvkJhgwDK2cFNVK8Z9Kq9DnCE29Ob6dTTXmYe8ySMUsErGQEMbxZKYJzGt3FbyeYyIJtG3+iFOP5+cXz7UqlBpOYrHzrwfyrW/1ukOKG9Rh/1x+GXIWVC+7R7KoR4ajLj/xK4uQB1MfmThCdtNhk3eFJLfukvSjeScVWfwxCVrrG8vZv+eaCUMdiN69pMNyrL3R+1SqA/HklwlQjPjAnD19Y8toxcCE+p2myhtC90sgmdEePq6kAInyHg8KEYWstCxPQgcAFLDzQMpOAshWrjYcrfQwAAjOt3KtxgVVRpA+lY8mfkdX1ZeKAgYRHji6WLXGIxlVduegSb2ndRHmGyBAFLrGqhvj0++8upPKXdeEaYoyvFBLPeGx1TKGOjwP2fmVGM4L1PyPTmW3mlhQpsVNnvi+hjT+9ayKrGxTmWU7hOQcb6kS28EXc5dU1I3Cm3buw99tTNszzkaQy9sG3XsiahwLDQeWsuxQhWDm8D5uwbGXpzWrRvBcZSNHwJwTB/UwfBqWtpykvPJLykXugt9hte5RPEGdOUxioWAyeMXQa/YpNVFRBLuuYfIryMekJ8Lkvbz6gYevUzXozhSdEz6c3sVAazbH0/SDXsiIf7sqLhyyBm7Ylmi4omYPl7/LUexCBpEj8C+l3c0uCq8JCc3W0isrzk3Hahxe/6h+jLDQ6M1U0RPQcCxnMTqRTRia020feMLOjvzD4pkXO4jcZdsMxu53QQQp71My0FJY3ZnHgDjmMJOhXGk1EYFwc/Z4Z1mQs+YCfGjW0n0N3EB8GgyJ7s35RxQ6ta+fK59FsX6jRI4C5Fj5RL0SGnPmYAAlp/NyZp0JTkhOXtKJQLbH1ggB7yatZObjg5kPFOkKq7VUbBfRKTC8K6YCtkiRgcxZSk9bJ7D6ZlZkGt4SOAfJWbwf6HDd/QZzaOMmDsy1/oe8+hlBsVEUfseF6FVMpJLtyVmmXA3YjKuQL20TXMGPcGw9krS9SGvMLBZVNS6G3UHLaVcqkFVjIGRHl2noSBUH0Ke7I0M4FSX+4W21NikY5N0s8MwJpaomtt3wk3narGkwcdFXYjAlPCYtLsRcovlQxIEqS4ope7IzqjMdZxLYLOf/yAIUCZUHA0yW3pfE5NjOngpPEtJKV+GhZEDa9Fs1U0fIve8qleqOo6yyB0ck5L1huBvTHZ7+U7BlmNUbe8+qrhPM0DQfPfOi1Xhgi8dyChzDQ8Y1pZ+rxwv1cUxaH/aIZD5Jc8HOMczlxEmhF1szpyWMVSR4KcduXsfEaivYVQbpI6mv0C7lKOBMoDfxQHJPa6Zf4lP7Tpwb0AjqTisBbDtKOicy9nh8JgkGkVqMPJfAzE6RCkDkgXBd+Ivi6ltpj/aZXh0o/WGZCJrO6IveFSlneDL9biFnYsU7kUhNpgJwpTm2yh7aP/HHHCo30IpWscyJr+CQGq3BzskKFaWe/qEaNqGH03TaZQ0Z6Fpz6346qJJ4sW495s3rxNWtsk/JlcuN8gzc90rsiZJDelyhvbd891F+oKToR7xe252vL+TtK6kQCj/Asvu6QgkutD0uAv0lHgfCQN8bsu0h6kZ3mrSGaukR6B4kQfc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5d9f4d8-3d46-46fe-74e2-08db9862acc5 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:17.7042 (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: 7EGAEjRUq9U2//6vDNQ5CQc1c9kO3ZomSzw8H7sQ4kK1W1pwt9RudhIMuWsidY9C8qefMb5JyQY3ZpuBvnILNJ+IsYLUQqZ43sCAdJMKB2vA0cA6lLNlgzcd0NcWBIvP X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: BQVITOJNF4D4VEHFOGUPTLLXWEJDBCAQ X-Message-ID-Hash: BQVITOJNF4D4VEHFOGUPTLLXWEJDBCAQ 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 --- sound/soc/stm/stm32_i2s.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 18 ++++++++++++++---- sound/soc/stm/stm32_spdifrx.c | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 387130701960..06a42130f5e4 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -953,6 +953,7 @@ static const struct regmap_config stm32_h7_i2s_regmap_conf = { }; static const struct snd_soc_dai_ops stm32_i2s_pcm_dai_ops = { + .probe = stm32_i2s_dai_probe, .set_sysclk = stm32_i2s_set_sysclk, .set_fmt = stm32_i2s_set_dai_fmt, .startup = stm32_i2s_startup, @@ -1002,7 +1003,6 @@ static int stm32_i2s_dais_init(struct platform_device *pdev, if (!dai_ptr) return -ENOMEM; - dai_ptr->probe = stm32_i2s_dai_probe; dai_ptr->ops = &stm32_i2s_pcm_dai_ops; dai_ptr->id = 1; stm32_i2s_dai_init(&dai_ptr->playback, "playback"); diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 271ec5b3378d..42d67b7a68e8 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1222,6 +1222,19 @@ static int stm32_sai_dai_probe(struct snd_soc_dai *cpu_dai) } static const struct snd_soc_dai_ops stm32_sai_pcm_dai_ops = { + .probe = stm32_sai_dai_probe, + .set_sysclk = stm32_sai_set_sysclk, + .set_fmt = stm32_sai_set_dai_fmt, + .set_tdm_slot = stm32_sai_set_dai_tdm_slot, + .startup = stm32_sai_startup, + .hw_params = stm32_sai_hw_params, + .trigger = stm32_sai_trigger, + .shutdown = stm32_sai_shutdown, + .pcm_new = stm32_sai_pcm_new, +}; + +static const struct snd_soc_dai_ops stm32_sai_pcm_dai_ops2 = { + .probe = stm32_sai_dai_probe, .set_sysclk = stm32_sai_set_sysclk, .set_fmt = stm32_sai_set_dai_fmt, .set_tdm_slot = stm32_sai_set_dai_tdm_slot, @@ -1287,8 +1300,6 @@ static const struct snd_pcm_hardware stm32_sai_pcm_hw = { }; static struct snd_soc_dai_driver stm32_sai_playback_dai = { - .probe = stm32_sai_dai_probe, - .pcm_new = stm32_sai_pcm_new, .id = 1, /* avoid call to fmt_single_name() */ .playback = { .channels_min = 1, @@ -1306,7 +1317,6 @@ static struct snd_soc_dai_driver stm32_sai_playback_dai = { }; static struct snd_soc_dai_driver stm32_sai_capture_dai = { - .probe = stm32_sai_dai_probe, .id = 1, /* avoid call to fmt_single_name() */ .capture = { .channels_min = 1, @@ -1320,7 +1330,7 @@ static struct snd_soc_dai_driver stm32_sai_capture_dai = { SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE, }, - .ops = &stm32_sai_pcm_dai_ops, + .ops = &stm32_sai_pcm_dai_ops2, }; static const struct snd_dmaengine_pcm_config stm32_sai_pcm_config = { diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index a4066f271f2d..a359b528b26b 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -856,6 +856,7 @@ static void stm32_spdifrx_shutdown(struct snd_pcm_substream *substream, } static const struct snd_soc_dai_ops stm32_spdifrx_pcm_dai_ops = { + .probe = stm32_spdifrx_dai_probe, .startup = stm32_spdifrx_startup, .hw_params = stm32_spdifrx_hw_params, .trigger = stm32_spdifrx_trigger, @@ -864,7 +865,6 @@ static const struct snd_soc_dai_ops stm32_spdifrx_pcm_dai_ops = { static struct snd_soc_dai_driver stm32_spdifrx_dai[] = { { - .probe = stm32_spdifrx_dai_probe, .capture = { .stream_name = "CPU-Capture", .channels_min = 1, From patchwork Tue Aug 8 22:56:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711976 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 3CA8CC001E0 for ; Tue, 8 Aug 2023 23:00: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 173BCE7C; Wed, 9 Aug 2023 00:59:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 173BCE7C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535599; bh=4P7Ia+BOLTzpcSxlbwQRCF7C3HtrVemyGIVcIOKCHhU=; 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=Y9w/uLo4s6I+eEfj0TEpFSZV0Vn4oGXHeb7Se7AiTfEpBNrkE4+fi0WlcAnWXmj7v wyuuiPdGXVX0AOGuBG+Lsj23lsTOQTgpecV2SQ9Gtr0wUZ3qUWr+uv747LDBcfbhlf v0hXsnFbXOW1Fysmf9/c7ruUNO/MksuQJXl8CdUc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 71905F80603; Wed, 9 Aug 2023 00:56:33 +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 F3D85F80588; Wed, 9 Aug 2023 00:56:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 38524F80609; Wed, 9 Aug 2023 00:56:29 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::702]) (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 A6CC0F80603 for ; Wed, 9 Aug 2023 00:56:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A6CC0F80603 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=IdmQrxNt ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oO3P42VhyNScekWLXff4C+f1a4HgjkwQGEw20KhzXOOOq5nCjIDxfM8m64YWniJk7XufaGxl+Efnj/hxo+UJYemE51S1HDuXMkPfuuCoKOmus8r0XkBEVvv6iguoFOd8HAYOPsE+wy9zHtgZvOhc4O6sofbsSf8dnEnINCuZKYOlvXbgZh06IH0vqoK+4gqA92d58WT0kCJpDMnWGSIO6xcxGzJVP7gh+bfFOtLpJweOLKYDx3Nxoyu3n/TXT7r0HTU47Fq9BnZkEPP54k/bWof21aalLMjLX9HlxvliPvGnh/cTUk3YfXHSVbTgGQ/dwDgq2n05kSfBiuQFnYY39Q== 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=WRxwArxjvF55OwGRbGygE1p0gnhXYYcpA7e6/J03Y/c=; b=oexKzbtxn1fFqeWgd7BtW2+PH+7Jc8gT1WhupVgNWZ6q2TCrm9kyuGiCx5JCTid4cQV9hVAQXGYgrnvT9KozwnMwZH9J7Lz3idHmSFojg7qc9Ci0rAtD7MDJGI6xKAbhzmFvp2tQj4TKHfKkHrlKjbIWOGlESioFDXvM9DSLfb5zIXMBMUxPdfKwxmbmwKDofscS1fnYF7t3Y4sdxULqiMJnpWMkFQ/Yq0BRSOYIbSYnpBwJOF3z3HJA1IRwdLGs0JoLhO4ToNrGr+RMkbkzM0TeXeCwYPe0IbuwPwbB8BIxSEPyCye7MURrWhpvNuFpBM6eKdjJWLrjhhtSUkpC1g== 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=WRxwArxjvF55OwGRbGygE1p0gnhXYYcpA7e6/J03Y/c=; b=IdmQrxNtN5lQw7ehXJ5IOVyvJagXpwUgmNjLt1MVWr0ZbINzsXFvVJVkdA+N/bt+B1MAYNRddWypdco42eIu9dXVtBtAj0EKe45qn+07B7VLJ3TmT8+0PLImGkGDiM7b/K6Ytp2nZOO58fYlmo+wCd/mUgLa7v3ADtKBN2PCie0= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:23 +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:23 +0000 Message-ID: <87cyzxb0tl.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Daniel Mack , Haojian Zhuang , Jaroslav Kysela , Liam Girdwood , Mark Brown , Robert Jarzmik , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 14/39] ASoC: pxa: 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:22 +0000 X-ClientProxiedBy: TYCP286CA0004.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 09e7614f-0953-49b6-ec25-08db9862b00e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jmJq3q4ZjfwnwaOqf3nzE70i6a5mF3qMdDX4NRkMrWZ3rEERMqP9V44dqNGIHDeXWT0wQP5RAgirhgD+01YMuCid4+fGF0HGMLE6jLPWedB9SUIvwcHc8OIUXWRJ5vsxw7lXAcyEjhVUilUKAHV2X9maHQ83rEO9cBs4dHQv4Ql5fw0dZNOwN0v8GgN53HlJZyQmCq3OIv9NrJU49k+j77Im3dsMa0C54rZFPBZt2u6HtUTw+pbSJCe1UKSxg70K2/PHdFBEF28UECFTNiNy66Tb02iLPzAd81PrTCimyo02XlVuu7MuH4wa8u4bop5pZ8qtpq7zyXF83mUCh92NpqRELc4k+qNk69jC7//wiSluAwpapXBzQG95L2vtPiwTq7Lsjq5bUrNnRDCxRSZlPxARy/dkt4MbdshNvPMDOw7QxbQIGagNURVTcB0D34zJ7GpehZxY6xIOw5fsihFqIm3jVibYkJSUVzO9C6hNYqtxte/1jcAGvNYyYKYoM8ld/qfh9t25JV5i9mpqG6no+F4yLKvxz9BpvNIC8UoJOnMizNhXHKOxKd/wHOEe7r9G9fRIkR1XrGaqBrajRYqnA2txdqktQqId23NqLhZg9obCD4WffNSwwnZzSjbMYstJLw/a20SuitwTKWV2HfcfWQ== 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(4744005)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008)(41080700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rxSvkFdnIKkjANuiHAMgD0si7O8mPizsDce12ODdakIrdBAHfHG/PrYsRhBGRa0UOyNUGKzYoNqEnYMFWDce/AYOWFux2M6norSNn3F7AFLRN6Bay3zmCMV5VR3pQ6Q+VIhqtFHBnGFSJDSYVccdLcI29ei0zjLYhudEgxpRltHcRAECGcUzX6DLRbBiatk9M7LdM3W35N7QJok07pJbLVr38ShhXCqeT0wJ0BmAZIxcoStiGPOO165LVchM59DfW8bI1v9qJXUS5oJeWdZcd8eBVc3QbEe1LjzPPTGxWM1shEKeTe7X3z5HSTaGKCfW1/+Tc/2jVDFFJijewnHhq79J2zMGLg2E4v4pUw2PMqL0Lg41VK59AioYang7vOovtX0ysaxboStIzi0OFXbAQ7hCrPjHUrqCDmkDXx9bYy0zm/Dpqiwy5m3bcw0BCPsR7/1xawtJDZEZ3nYwy7RLFHrYKhb4lo8Er6r5rpXS9jjiimdiLH9XAbnE8a1NetgzdfTPTykqezFypsv3p644SAX5Hks3j2cKy4qzSaGdzflietcBMGxGOUE7/p/gPkPfM4goiVYe5XRZY59NbQMtHSmZ6gabydv+/IkOIj5G+25ZcgJ4zt1pJ3iMTjyeNqlX3zQc9TDyMDNqrND2ca4i7yugJCgWr0iOgisZptqjghCrhVCVmHEVPs934F/U3D+vEYRNWeaIjlI54fWoc/XEy82eYF7Xpkw9pkYg0/nKnkrCK8rl3FeYjYN1jWwAthmcU6C1tEaoLL6ddZnyFG0HNkGVW6YCsDQUMqs5j/DdZaFKqU8Fpffu+vjLWdsui6ULfjYwrtWLA8Oa+XrV2/I9umSQsAWj5nGNlLWGwX2CK1/BrCYR4bitpBnK2CUw+kqHGhuW+FQOZJgbl7AEToyW1P79vXGx7aK0rXu43Cr2/GPZsWQBg6l/8GLBN0YHwFoLKjdT6y2HjULwhmglYWItWNA4G1EncwkS7TNzl1ak1t+6PLeD+A7rMJgASC/uDJexTW+jSVEmcP+tqN1FkyVcmdFzo5gm3M/Ji1ZP7zHIvbMnWPB4IqDwnYawBYbYC7/0RBr8FSsNn4aygLLLuAXHCguEiItRx50vLUaanOZt25uMrR+THAf3j59H1jcyD5SiZt29g6Q4yghRAw7V8QfGfKUU8o7txh3Q0YHqtyFVCkipO3OwYccIY9ZOT3tZaBWOEedPT5TXAeSfATaDWL7iAfq89/YVyyGNTPx3RLJ0u+cOKb+8ZqZooH1oinOmgxG7cpjfBIcP05Y6ab4uiweCUhvjlfuIykHIya1HUFFkNEGqa2ZKMmWYKwlnNXHQ2mxwtBUCT7GSOcP0+5/1L/9dEbTn/9tVHOmG31VjOihV4HJuUaC8Z25meWTIoD0G/KRcFUeA/K3mqllsFxAssslzlN2at0L8ETgoGCtlBGzhpLD+A14M+J5d7GF45s87vUZKt6jZYKMMJ7pYcc9dhRB4gR/OF3JOkRZv64RbQu9SVKe+ppcY0j/3kLDuvJCFus9v1EP56QqNVxxQvgfGMWFphBaZwkniz9w6eaof+ySBaw0aAjGvyh0UqPPEO7rb/Qe7CRkTnLabAyMiBv0Sst5XGfGNNc4zVk29l3KiOp6K11I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09e7614f-0953-49b6-ec25-08db9862b00e 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:23.2338 (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: 8i5Z2YiBnH3SUmcTG2WJLClGB1zgtpSdZqGdCSKj8kMmfWaef0QUOPpkovaHpRqgEBLD6acwwfYIao5+uaRqG3/5Wl2kbV9hiOU7fkZpqAzhk/aN3Pjf8hadpO+Cfwp0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: HLNQRGYRIOAXHTRCDLIAXZ3OODWJ4FC6 X-Message-ID-Hash: HLNQRGYRIOAXHTRCDLIAXZ3OODWJ4FC6 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 --- sound/soc/pxa/pxa-ssp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 430dd446321e..32a8490d027a 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -819,6 +819,8 @@ static int pxa_ssp_remove(struct snd_soc_dai *dai) #define PXA_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE) static const struct snd_soc_dai_ops pxa_ssp_dai_ops = { + .probe = pxa_ssp_probe, + .remove = pxa_ssp_remove, .startup = pxa_ssp_startup, .shutdown = pxa_ssp_shutdown, .trigger = pxa_ssp_trigger, @@ -830,8 +832,6 @@ static const struct snd_soc_dai_ops pxa_ssp_dai_ops = { }; static struct snd_soc_dai_driver pxa_ssp_dai = { - .probe = pxa_ssp_probe, - .remove = pxa_ssp_remove, .playback = { .channels_min = 1, .channels_max = 8, From patchwork Tue Aug 8 22:56:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711599 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 33159C001DB for ; Tue, 8 Aug 2023 23:00: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 A5459845; Wed, 9 Aug 2023 00:59:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A5459845 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535619; bh=OBFvmaxQ35Gg20pWMM7MwkB4u9lnyIGbRmIi8vVFiXc=; 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=XxZ/a6+inBiLAm73eGIFQM7YVWF7ovHkGTlhEjdaW2SlvT2/uJ4zvXVp8bmVyW4Zp 0L6bAwoqhP49dVH/t0BV+TauNyRBBw5852SmoTGlmFfNCh0CizdDYdtCsst8098pfR w6H2YM0jkIuF6hRQ5qMh30wgnIY1MNAV2s2VcS6o= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 87464F80613; Wed, 9 Aug 2023 00:56:39 +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 52DC2F8060F; Wed, 9 Aug 2023 00:56:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F14A9F8060F; Wed, 9 Aug 2023 00:56:36 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20708.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::708]) (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 7AFCFF8055C for ; Wed, 9 Aug 2023 00:56:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7AFCFF8055C 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=fr6sMmT5 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lXekYwptVDJpXWbpnYevYbdKeSl//npmTEmq+srZU63J8+Zl0TC3Yq5TRHpLRP71eEj/KLLA/BnxHE5AM2RuGp+eIvPKy3COEHdNvCzPcT62Wib1d5xLvl5NLt85/KYOMjL+WsIN7tw0QlW4ly9GDHvYSMaws26MruFBS6WdxRGVB/UQsayj/u7n8xjjXE+dSr/z8t0kTE8I18xCI8L2cog/FG5knlPsZ0Ho9EivK6L9D3YomTb4wotBQA2X6Ff7ir8/IwLSY4Rk7Xyp/Mdzfgpa8HevrNAMX9wMQxa+z+kiEdSeQMiWFj1xgHvhil0wvNcSEuoI8R1R2xj4YulI2g== 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=ieuxMFBLhzUNhsmRrH+Lwo9yfzYn+M/8jTds/dFEPu0=; b=Fht3X+nBBtu02gWZKaLAbmc2kPnWRHhLtxU6DTUWHiOYt2MXI45AhFfXeEZSliPv26ctAqjskIG1uVkj+kpd3Zf8wpYhDqcVnmUUc7PDwDpfSyvaL2OPyasR8avNfgDKMkHGZyJKyM7ww0icEd3GXICL6n2ZljqAW6d7q5GuUNJiyiAY+FXaaVv8O4iqvwHXQj1R/2G5sjK4cmuGTJSDdTYZ5VkzjL0Oi3V7ewlyB3lJhky/O49z5u5vEDg0XXG8bGhILjWRUnkvD01S4VeEgGTXqu7QSLZs1N8G/U7+SQb/1fzB9XsJoGqcy4ZML/L3fH0ic181+mpJy4yEygrcRg== 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=ieuxMFBLhzUNhsmRrH+Lwo9yfzYn+M/8jTds/dFEPu0=; b=fr6sMmT5b9EE0c6pW/k+Dz5Yh/pD/g+keHsNBzRXhtcTQobwQVbHCrlfPLU0OtZvzJb5nrWbmtcKwuf++hJuB2SDj9D742GW8+6KAF0vptuMlBldNscAadjVNyqy0pnGfPTh7J8VirGGzfQ79dvGTZ4c5GG9agy5r23r2XvHip0= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:28 +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:28 +0000 Message-ID: <87bkfhb0tg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 15/39] ASoC: rsnd: 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:28 +0000 X-ClientProxiedBy: TYAPR01CA0005.jpnprd01.prod.outlook.com (2603:1096:404::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ce9fae9-9c8b-49d7-0406-08db9862b337 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MvouK71yTNnXtcJjzgMEd4MoqGsl8Yh5ehFWUEwBD8EgLoPGxH9/OdZE7ihky99uqQOrFM6bI/rgG4mHfkdaq9aa0liXj3T/vIiKlVJg6L5c4/TURpKfrnzTYTgkbw2kr7X0ry8nIKmDynzOO3Bmci+ijilS3WvDy/g63aqyIYPXzHu1lSKxpyP79M0g0VoBgvQPPebRBh7pnQXEPf4+eQebYqOVpYFXNcFy1Rj7HOUjU655nbQbOyvmv4u8v48ooTA9XlMA5G07K19ifC8+E1uQa4HUcF9lNkWrPZ4V738ddPeW3R6+T751A4kaeKxBfEAg6XoZN+lBKZo9fZtWu+s/bV3/OWCaiZyMBnWnY2wCcPm1njBh5/N8WpvTjFkrzClUqDZb7QNGxuwa04Q7venTQhnNnVaclqxXUxE7NDy30FrGY7nWtVrFyin5wrlSWg6kfRtdTAnBnWfqCM4kl2hoWd0vYA6Priua0RGOMcyyxFwLYLOG7INoYIEcOmCJaUnrnBadQR1XQx+JtBh9ZPZh4gq/22wKbPGTrtpBswkEaQXHULkmaVWZ7nUnEehYzwb1xf1X4r6aBlD4McqCuSAop0eak+ixdJV26eWI80ypDmsA/yq/hqeGmr4n4Whb 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dqv6gYP/CQVGe6GQ7v8Wl1KRY12s89Ai291jryKvRbOl+g5Ep9h5RzOQYoi6M/fsDLezuvAGAJ2hBotET2mIE7NpyscjgZti9hy1uxA3fNNBE6BwzLAkyRMPmy3kA7OLg/lucZEklT9fP295zxERfQLNNYIDDifIJ9rxESlaVYB0NkuoDfSc/sXgX2PPqp557mxHQdNLv9w646c5nqHzg0CA26aDztuImfc/khxWDSqyl0GC2BrnOtnP6hMQ1rGfsBdX9ECxbFxtr4Lim+WjmTzkDyyye9YtHqduoOlshyVJ2u+MbCQ95R4MwgV1LzI6MXrb3T02ZM+jiTvwDdPE0FtJ2eEpZL5TzGsTIsPjRO5HjV8uSsjdc6KgcD2aewBY4SPfcLrl8HRVMhWB9BXnzCyvPYGya+PZAvnKYhm2ZsmDaZGDU8nD2SW1PzjaIU6vc+URRKNSBNNVmB1aKSp9USv0t938lv8djDeqBgWefmAOwJO7cUWTJ2sI+v0QSkQdjlTk2MnrBHKsxSKceCSiqc9UxniX2f81HHvOS+m1sMDp8qVCjnzGt6F28zockAr0++8FncOWCkerKvil7nrtL3WuHomNEHjcuTLnXxzIadBkkICi2O80c94VcqntoqQFsMp33/1CKGPS2CfTQJwDdVLnf0KDfIhRSH2kLx05IFe4m4Ol3CCypYLhgENaqXMKmyIN6NefS8JJx38xXRj8RzUaYRa3PNihaPDkx7uo4suHxrbYudkQOGkUtj52GeKGou+SZp0KeYXzJ32TAImKrbhPo29rvziKlKMNwJ/sSCcCcWEGwWyKjPVyLA+aX0W4A0H4m8KtXfBcHMroFjMe+BCsO+xFa8jMN3eZu1UHD9rB9fGgVdBL9mguSmiraoufmBKwElwarUonayM4Z34FH3eEoCrhKmIX2wJUI+a0z8dQWFUEbpAXn4R+liqxGvexFg0uh3R+8zD/HEy6eSBdxTGg8O7hXfv+L7VCQsi+qu/du0cgPebE4qyk10CPlWJgf5Y0usmbJvzXAtHLHDcQX77CCfe7mbYqqDsBAaCCwADQxKoCmatLSv0zzzHwPPLN+wv/OPCE3SJcyf8DP6L19nX/Zrv7hdgLxSJ/rKaswJ3IZEjIcyKibNS+eesHUAvvSDj4s4bd0SsCHblfiTwI9LsgD8nbm9dNAnz0EMFuiR0EvesCvtgSeVq1dtjfQOhS+TJHMluVyu9xYD8fzBtwrgFaWGh+F28gKOVkJtWkH1gub6DbLBB+HY41rmt/sDL3CorbuYs/sBqbMCF79Kr/K3hshLU/FUZVhctWPF+2J/usx2rEVsoHT/ITU4dXoOHkNIpK5pdOnfCklpnTsjZ1MLxcNH0P9qP/8JVR+Pq4v4G7ihNYsEkq2+zIyfK2CHi5/gQio9lv9d7thT2GB/GfOlHrODkL1XRBrCPLOfU5UmIr7QYGig3l71ge2+69eireGyKTg1JZCRjox5LSHN9JJtJC68yRmRlmveF3tWaHmAkRxdFPkiMency9nSUvf5FxwW5qr920X+v7j4iCHdnzqY97kB45NBPB4D7YRUbXB0ky/NPJVyXV7ZIZbc0cV7nJlmkrIrkwyw55PMFWFjSNti3mrDCgjPKklbK3vOkkAsc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ce9fae9-9c8b-49d7-0406-08db9862b337 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:28.5022 (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: 6kZIpCfpxBG2j1igWgj5KmhlTVpcGRHuIZzS8Wz2TzN6VjdYu+uuINSu3IWZ0UBgr+swUx+o2Clfi3qt986mSoIS8nREAyOYjm2PleylWlxQNK1uwc/h9pJfbR8ux212 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: GMOEM7E5YT37HSBB32BVOYHNUQTCB5SW X-Message-ID-Hash: GMOEM7E5YT37HSBB32BVOYHNUQTCB5SW 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 --- sound/soc/sh/rcar/core.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 9f3d97bc177a..069add7b1b71 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1085,17 +1085,6 @@ static u64 rsnd_soc_dai_formats[] = { SND_SOC_POSSIBLE_DAIFMT_DSP_B, }; -static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { - .startup = rsnd_soc_dai_startup, - .shutdown = rsnd_soc_dai_shutdown, - .trigger = rsnd_soc_dai_trigger, - .set_fmt = rsnd_soc_dai_set_fmt, - .set_tdm_slot = rsnd_soc_set_dai_tdm_slot, - .prepare = rsnd_soc_dai_prepare, - .auto_selectable_formats = rsnd_soc_dai_formats, - .num_auto_selectable_formats = ARRAY_SIZE(rsnd_soc_dai_formats), -}; - static void rsnd_parse_tdm_split_mode(struct rsnd_priv *priv, struct rsnd_dai_stream *io, struct device_node *dai_np) @@ -1353,8 +1342,7 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd, return 0; } -static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd, - struct snd_soc_dai *dai) +static int rsnd_soc_dai_pcm_new(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) { struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); int ret; @@ -1380,6 +1368,18 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd, return 0; } +static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { + .pcm_new = rsnd_soc_dai_pcm_new, + .startup = rsnd_soc_dai_startup, + .shutdown = rsnd_soc_dai_shutdown, + .trigger = rsnd_soc_dai_trigger, + .set_fmt = rsnd_soc_dai_set_fmt, + .set_tdm_slot = rsnd_soc_set_dai_tdm_slot, + .prepare = rsnd_soc_dai_prepare, + .auto_selectable_formats = rsnd_soc_dai_formats, + .num_auto_selectable_formats = ARRAY_SIZE(rsnd_soc_dai_formats), +}; + static void __rsnd_dai_probe(struct rsnd_priv *priv, struct device_node *dai_np, struct device_node *node_np, @@ -1409,7 +1409,6 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, rdai->priv = priv; drv->name = rdai->name; drv->ops = &rsnd_soc_dai_ops; - drv->pcm_new = rsnd_pcm_new; drv->id = dai_i; drv->dai_args = &rdai->dai_args; From patchwork Tue Aug 8 22:56:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711975 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 BAE21C001DB for ; Tue, 8 Aug 2023 23:00: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 C09C584D; Wed, 9 Aug 2023 00:59:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C09C584D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535628; bh=a5/u2O0aVtAek9pzw9n3uhzXgqcEekm6He4sPZluX90=; 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=NqBwc3v55tZv/tBCm+xJLimAvZgcEx0LzKR+KTRT0Ptv4nXAfJeDXBhvISHCPWeXd Ns0NrdI2u6B0FcRxRILFbJPWDP1XK1cMAiNVkYXIkizOeRcRV1yegddAMeVHmYPNJS NJDgVQVUNCqyxYrnjkw+kCzaKYmAPw2hhK3yV8Ac= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7B41FF80570; Wed, 9 Aug 2023 00:56:50 +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 DD445F80571; Wed, 9 Aug 2023 00:56:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C2415F805AE; Wed, 9 Aug 2023 00:56:46 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::719]) (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 DC15EF8060F for ; Wed, 9 Aug 2023 00:56:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DC15EF8060F 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=QY/ea8t7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FNp6sn3FmrNQkLzYdi/WsC+YiQrFN5gaIlmU0rgQdI+TzwN4eGYoSuNMemTP9tALrsL3gVp6X/JjQ84P3tzSuLOhSv/isDNVZ6zwA2gj44ZBipjdZXqkXiMSwUeoni0D74CXeDWolukRUzFSzXkXneOx98gppXBAua0qcEeRXJb5zjDuXEToS3UfDvcUHjQlKM9g5AFh571aFGDf3pSJdnSz5wYzgWRx5wwffqJCKqST56bFKtm1XljN6ocqi65NPotrdHOtzmMRvsdRwvqLuXwXcgVeZ2hEKuSvx2EzEHg37voXwtgWcBKpnLUdFg7hdikbofRk87pzOoGe6Xe4Lw== 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=96rUUBKRpdf5pASUEXrT8TTbqCcFIbs0SqCZB1dd5pI=; b=dB8JpwhVqcKq1quXrlyuyNPGlc7diruAYzWaC8eV5yc4VErT/lty0oje9DSRSunehng07lnFjD1aKlUS3PUceVEcwhz5OIPIevLXLyT/k5PtLb3oH6uoWbgWCB5o6pWZdS8TlJDjddtxYfxQQ/IppBTaofkAF6gEBhofsNyjS1zkVW24xIbaHuDMCg3tmyYUd/bKQpcjOcmPCM5SdNoGkJ1nPlow2PiO6gSAa4ECDOSaqNDYaiAqDkjK43RySocF6gpUEDeBRsosondstbzLt7/YNbqC+7bQiURbolJ/G/PwczB0qkRG61stdL0NzB4h8mEwBjJyU56MAtjR20Wg7Q== 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=96rUUBKRpdf5pASUEXrT8TTbqCcFIbs0SqCZB1dd5pI=; b=QY/ea8t7oY8w5i2ocTrcWSK9lWz0B8p/LxMeuA+vAKrt07DBgZ637Ci+6SWmXWJp7ZoNfPusDzgAsUc/lnWDOd1LZtIbWDay3sSnWMz8iFjFdPhgXUEK+0oVXMzVnDoxs9o/J7MTeq+o19Ic+y9ek1qrY6JCKlD6cpzdxO8g1sY= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:35 +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:35 +0000 Message-ID: <87a5v1b0ta.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Banajit Goswami , Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Srinivasa Rao Mandadapu , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 16/39] ASoC: qcom: 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:34 +0000 X-ClientProxiedBy: TYAPR01CA0003.jpnprd01.prod.outlook.com (2603:1096:404::15) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: fafdb83a-5821-45bf-5de2-08db9862b6e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZhP5RfRgbd8BLaF7w/1YqkVPzIi5w43lK6Gi4RHI2yEnh9YfQCaMOStdG5aXTo2AGXjabGrMxBH/+YINqePmWdmG0PlL+A+HOKotou91uOzGh+ZOiCjRhxh49+Le1eRastWCx3/VZR7qSTu5Rst1rmu9UmHqvIiGTCuZxRP79XA77HDpC5lUz9ex1keDLzbKT5hcJFzg6e+ViADGL1RB0dgbFEYzOOQ/rxxldeVFwG9Dn3kdx5pzFlcbzJCWX4PE83rqUkB88TrtoO1RCTOvSD5vuGUl9CTTOq/gW5oD03C19SPUnDpjdXAkTJ1FbujpqGNuEnN1as7XWOIzE9n1n+LJqbzdHlsGXYuZezANnAP8Xjvxw5kSqCTRdeyoWbtyy+YQ84TqgqsJ8M5BeCMFVGYt1Czp8PO/E9hAm8D8Ar8AyaF6Xk0v2VZE9vW5yNiSiqStCKE+LJmWNH5TzdlsfmSREilq1gYFNxV/VH11ObvKjYW1kr6T46A1DylqrSNkX49hJjPIZL6B4Rg9pWiRKnnnSZFpN1IedBVZaB9atRz/Ij0O3achsECNAlOlI8lIZYDkUH6OdqOmg149WZGhOPtYw8pg9B92xcO8lra5ADfv8gZtbM0DLdEMyqHPvrU0 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(30864003)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y4zNhjiIZUtnpLiIsmRuuumMQ7d9T2GKAT4Q6thPXi/7Tl5CT19Fm5JTrOY6w73/pWmg+oAdEvBwdWqLudK+0ONLB3UuGytrlYXmYOJFSOqidRtcrjWWPxI0xE4GG1pzoK8wpyXNHVTQx4qIOJZ+ZxXgp0m+ps7A6RLlNwKVBchVyCO3PRdmnKt14FFsOfEiizjikM7BZM6ZTzz3m6CmHpcgQFr+EahV5tm7JswZO+QDFvBJL7anQOEiOUIil1sAZFGAdjzRNwpdqzoKlYn39h6XJM/tbcWpn9nl+NXvzny2/tTEfBbXC8MgOPCRhxwzi5ltk/alsolY7MOOIpPAzFp+94ryAKD1A2l+MRSrZGRqszQXHBBMJLWM6Zg4hkrdjm7YEZByemJ7Pzlr7ZwiO60FlxhSI+XZnBgiVRKLR/yKrryj0UFCFPKwPgWeuWuP7ZMtcVhAP3xeq5G2yUlZJ1Jvc3kR7BUIcVjCXWcNJC4TDZs/f3jJE+d3KhiGlu0wM0FPw4QC4BZu5i58lTbSd0jAa6FCNz/6Z1JMvyeayeVC+5jsIkKEiJf4FV8O9ulZBFMGRRLDpPldRe1he9xN4i7sLvZqK+wb5pV7Wkgx6uBFq4G9Uz3vsymDkCw8igXVymxJdmektZh0USXES9QoPnuqVqwEJrJTP9OuQHIteNBqO+LROLT0W3yF3vitI9OK0x8f7FDOuTSv+KI88PNfkBi8mthNNt+8v/uqU8pEwr3ARa/udbtYZlKBbCp/2bIArDggpXlYDxqFYMFrHmkSvZeqmXTf80MpjYMB95ABrAFzWzjVf4ufhO3/5l0yoe0q/QtRGSSu/kmqCU4kCdBwt0405pgUMlNidJP0yIoXQtOW2vp4RkeLkIwRbOB4pAHzn0SoBB1/28Hg5OFdD4W7h5Z8xbcpMV57og6Rr3xtsJ2y+Xr5yTe4Tw3IP7BEUtBzfSCFL1fBO4i57eIlw4Ec90Uwv7jy1YSpaJMI+LWGaH93eANpfsw2VbgGQyYh55iSEsd0w67+KZoYAmxcpne/ZCS4iDBxQCzJoNT8ijIZzCv/cX5DAPRmStaVVRqSO956sHvQwBxSTFSqbajVhs3NkFTT0V7kWSwgEyCtNjHI7jdh/dgVYEx2a6OrqCmJefRJsrN4UMtFc1n1u2q2beYK5VZHkOxCahL1fCAM6MQfXOajeCdumt8C9Y5ANxpLOk8XrUYOLwIKL3QqSC4uwblL6cfeEwFJWSS7u0QPcHQQlHy5TrectOxgVhoFqdDW/cEafWWwF2SHU5B1FOMdWUOUATkVRD+6A87DEXM60zfepE1gdHdlm+xjast0/84k74mcy3Oeervl224avRotGJZIRLo+US13KnAg9swlaP9+hVLlBj+uoso2Y7qCDBbaIp01nKknjMtQOGbwDTRYZX0NsFb+uKuz3JcuBws9uvxXAposUqsUr59Z8SIRejHiSfuM75RbLOoztdoflg90hTzAjI1s2RBswwxN50HTRH87f7zGX4XEEUrDKDwM3mU0KZPmod87kCIsD/nrR5SjEh0fTy67n0hced3oigcddfQcR8H7Rth8ez4t/MVhWHP/YimoKEoYvPaJcrRQc8bJOsP+/Gg4wVrxDddAwNfnj6vCP04= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: fafdb83a-5821-45bf-5de2-08db9862b6e9 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:35.4376 (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: UlYNY4KO3EioijcnG/BtQDiTQALedMA5knCJhs+v4Uz6Dy/42ddDRsrj87uuhtuVK6SCvAldMV66t0TUpP6TdDKZ+AIcfc2k1+lYr53DinRdl2YdrPmM46E8LXMh7y10 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: 5S7YJ43IIZKROJE765WTJHQBXVZO56PT X-Message-ID-Hash: 5S7YJ43IIZKROJE765WTJHQBXVZO56PT 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 --- sound/soc/qcom/lpass-apq8016.c | 4 -- sound/soc/qcom/lpass-cpu.c | 40 +++++++---- sound/soc/qcom/lpass-ipq806x.c | 1 - sound/soc/qcom/lpass-sc7180.c | 5 +- sound/soc/qcom/lpass-sc7280.c | 2 - sound/soc/qcom/lpass.h | 4 +- sound/soc/qcom/qdsp6/q6afe-dai.c | 88 +++++++++++++----------- sound/soc/qcom/qdsp6/q6asm-dai.c | 6 +- sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 3 - 9 files changed, 80 insertions(+), 73 deletions(-) diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index abaf694ee9a3..f919d46e18ca 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -41,7 +41,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { .channels_min = 1, .channels_max = 8, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }, [MI2S_SECONDARY] = { @@ -62,7 +61,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { .channels_min = 1, .channels_max = 8, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }, [MI2S_TERTIARY] = { @@ -83,7 +81,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { .channels_min = 1, .channels_max = 8, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }, [MI2S_QUATERNARY] = { @@ -119,7 +116,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { .channels_min = 1, .channels_max = 8, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }, }; diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index dbdaaa85ce48..39571fed4001 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -404,18 +404,7 @@ static int lpass_cpu_daiops_prepare(struct snd_pcm_substream *substream, return 0; } -const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = { - .set_sysclk = lpass_cpu_daiops_set_sysclk, - .startup = lpass_cpu_daiops_startup, - .shutdown = lpass_cpu_daiops_shutdown, - .hw_params = lpass_cpu_daiops_hw_params, - .trigger = lpass_cpu_daiops_trigger, - .prepare = lpass_cpu_daiops_prepare, -}; -EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_ops); - -int lpass_cpu_pcm_new(struct snd_soc_pcm_runtime *rtd, - struct snd_soc_dai *dai) +static int lpass_cpu_daiops_pcm_new(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) { int ret; struct snd_soc_dai_driver *drv = dai->driver; @@ -431,9 +420,8 @@ int lpass_cpu_pcm_new(struct snd_soc_pcm_runtime *rtd, return 0; } -EXPORT_SYMBOL_GPL(lpass_cpu_pcm_new); -int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai) +static int lpass_cpu_daiops_probe(struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); int ret; @@ -446,7 +434,29 @@ int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai) return ret; } -EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_probe); + +const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = { + .probe = lpass_cpu_daiops_probe, + .set_sysclk = lpass_cpu_daiops_set_sysclk, + .startup = lpass_cpu_daiops_startup, + .shutdown = lpass_cpu_daiops_shutdown, + .hw_params = lpass_cpu_daiops_hw_params, + .trigger = lpass_cpu_daiops_trigger, + .prepare = lpass_cpu_daiops_prepare, +}; +EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_ops); + +const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops2 = { + .pcm_new = lpass_cpu_daiops_pcm_new, + .probe = lpass_cpu_daiops_probe, + .set_sysclk = lpass_cpu_daiops_set_sysclk, + .startup = lpass_cpu_daiops_startup, + .shutdown = lpass_cpu_daiops_shutdown, + .hw_params = lpass_cpu_daiops_hw_params, + .trigger = lpass_cpu_daiops_trigger, + .prepare = lpass_cpu_daiops_prepare, +}; +EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_ops2); static int asoc_qcom_of_xlate_dai_name(struct snd_soc_component *component, const struct of_phandle_args *args, diff --git a/sound/soc/qcom/lpass-ipq806x.c b/sound/soc/qcom/lpass-ipq806x.c index ef8a7984f232..2c97f295e394 100644 --- a/sound/soc/qcom/lpass-ipq806x.c +++ b/sound/soc/qcom/lpass-ipq806x.c @@ -51,7 +51,6 @@ static struct snd_soc_dai_driver ipq806x_lpass_cpu_dai_driver = { .channels_min = 1, .channels_max = 8, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }; diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index 56db852f4eab..d16c0d83aaad 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -43,7 +43,6 @@ static struct snd_soc_dai_driver sc7180_lpass_cpu_dai_driver[] = { .channels_min = 2, .channels_max = 2, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }, { .id = MI2S_SECONDARY, @@ -57,9 +56,7 @@ static struct snd_soc_dai_driver sc7180_lpass_cpu_dai_driver[] = { .channels_min = 2, .channels_max = 2, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, - .ops = &asoc_qcom_lpass_cpu_dai_ops, - .pcm_new = lpass_cpu_pcm_new, + .ops = &asoc_qcom_lpass_cpu_dai_ops2, }, { .id = LPASS_DP_RX, .name = "Hdmi", diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c index bcf18fe8e14d..6b2eb25ed939 100644 --- a/sound/soc/qcom/lpass-sc7280.c +++ b/sound/soc/qcom/lpass-sc7280.c @@ -38,7 +38,6 @@ static struct snd_soc_dai_driver sc7280_lpass_cpu_dai_driver[] = { .channels_min = 2, .channels_max = 2, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }, { .id = MI2S_SECONDARY, @@ -52,7 +51,6 @@ static struct snd_soc_dai_driver sc7280_lpass_cpu_dai_driver[] = { .channels_min = 2, .channels_max = 2, }, - .probe = &asoc_qcom_lpass_cpu_dai_probe, .ops = &asoc_qcom_lpass_cpu_dai_ops, }, { .id = LPASS_DP_RX, diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index dd78600fc7b0..bdfe66ec3314 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -402,10 +402,8 @@ int asoc_qcom_lpass_platform_register(struct platform_device *); int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev); void asoc_qcom_lpass_cpu_platform_shutdown(struct platform_device *pdev); int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev); -int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai); extern const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops; -int lpass_cpu_pcm_new(struct snd_soc_pcm_runtime *rtd, - struct snd_soc_dai *dai); +extern const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops2; extern const struct snd_soc_dai_ops asoc_qcom_lpass_cdc_dma_dai_ops; #endif /* __LPASS_H__ */ diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index dbff55a97162..3faa7e0eb0dd 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -619,44 +619,6 @@ static const struct snd_soc_dapm_route q6afe_dapm_routes[] = { {"RX_CODEC_DMA_RX_7 Playback", NULL, "RX_CODEC_DMA_RX_7"}, }; -static const struct snd_soc_dai_ops q6hdmi_ops = { - .prepare = q6afe_dai_prepare, - .hw_params = q6hdmi_hw_params, - .shutdown = q6afe_dai_shutdown, -}; - -static const struct snd_soc_dai_ops q6i2s_ops = { - .prepare = q6afe_dai_prepare, - .hw_params = q6i2s_hw_params, - .set_fmt = q6i2s_set_fmt, - .shutdown = q6afe_dai_shutdown, - .set_sysclk = q6afe_mi2s_set_sysclk, -}; - -static const struct snd_soc_dai_ops q6slim_ops = { - .prepare = q6afe_dai_prepare, - .hw_params = q6slim_hw_params, - .shutdown = q6afe_dai_shutdown, - .set_channel_map = q6slim_set_channel_map, -}; - -static const struct snd_soc_dai_ops q6tdm_ops = { - .prepare = q6afe_dai_prepare, - .shutdown = q6afe_dai_shutdown, - .set_sysclk = q6afe_mi2s_set_sysclk, - .set_tdm_slot = q6tdm_set_tdm_slot, - .set_channel_map = q6tdm_set_channel_map, - .hw_params = q6tdm_hw_params, -}; - -static const struct snd_soc_dai_ops q6dma_ops = { - .prepare = q6afe_dai_prepare, - .shutdown = q6afe_dai_shutdown, - .set_sysclk = q6afe_mi2s_set_sysclk, - .set_channel_map = q6dma_set_channel_map, - .hw_params = q6dma_hw_params, -}; - static int msm_dai_q6_dai_probe(struct snd_soc_dai *dai) { struct q6afe_dai_data *dai_data = dev_get_drvdata(dai->dev); @@ -682,6 +644,54 @@ static int msm_dai_q6_dai_remove(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops q6hdmi_ops = { + .probe = msm_dai_q6_dai_probe, + .remove = msm_dai_q6_dai_remove, + .prepare = q6afe_dai_prepare, + .hw_params = q6hdmi_hw_params, + .shutdown = q6afe_dai_shutdown, +}; + +static const struct snd_soc_dai_ops q6i2s_ops = { + .probe = msm_dai_q6_dai_probe, + .remove = msm_dai_q6_dai_remove, + .prepare = q6afe_dai_prepare, + .hw_params = q6i2s_hw_params, + .set_fmt = q6i2s_set_fmt, + .shutdown = q6afe_dai_shutdown, + .set_sysclk = q6afe_mi2s_set_sysclk, +}; + +static const struct snd_soc_dai_ops q6slim_ops = { + .probe = msm_dai_q6_dai_probe, + .remove = msm_dai_q6_dai_remove, + .prepare = q6afe_dai_prepare, + .hw_params = q6slim_hw_params, + .shutdown = q6afe_dai_shutdown, + .set_channel_map = q6slim_set_channel_map, +}; + +static const struct snd_soc_dai_ops q6tdm_ops = { + .probe = msm_dai_q6_dai_probe, + .remove = msm_dai_q6_dai_remove, + .prepare = q6afe_dai_prepare, + .shutdown = q6afe_dai_shutdown, + .set_sysclk = q6afe_mi2s_set_sysclk, + .set_tdm_slot = q6tdm_set_tdm_slot, + .set_channel_map = q6tdm_set_channel_map, + .hw_params = q6tdm_hw_params, +}; + +static const struct snd_soc_dai_ops q6dma_ops = { + .probe = msm_dai_q6_dai_probe, + .remove = msm_dai_q6_dai_remove, + .prepare = q6afe_dai_prepare, + .shutdown = q6afe_dai_shutdown, + .set_sysclk = q6afe_mi2s_set_sysclk, + .set_channel_map = q6dma_set_channel_map, + .hw_params = q6dma_hw_params, +}; + static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = { SND_SOC_DAPM_AIF_IN("HDMI_RX", NULL, 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_IN("SLIMBUS_0_RX", NULL, 0, SND_SOC_NOPM, 0, 0), @@ -1041,8 +1051,6 @@ static int q6afe_dai_dev_probe(struct platform_device *pdev) dev_set_drvdata(dev, dai_data); of_q6afe_parse_dai_data(dev, dai_data); - cfg.probe = msm_dai_q6_dai_probe; - cfg.remove = msm_dai_q6_dai_remove; cfg.q6hdmi_ops = &q6hdmi_ops; cfg.q6slim_ops = &q6slim_ops; cfg.q6i2s_ops = &q6i2s_ops; diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index 5fc8088e63c8..fe0666e9fd23 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -1230,6 +1230,10 @@ static struct snd_soc_dai_driver q6asm_fe_dais_template[] = { Q6ASM_FEDAI_DRIVER(8), }; +static const struct snd_soc_dai_ops q6asm_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static int of_q6asm_parse_dai_data(struct device *dev, struct q6asm_dai_data *pdata) { @@ -1272,7 +1276,7 @@ static int of_q6asm_parse_dai_data(struct device *dev, dai_drv->playback = empty_stream; if (of_property_read_bool(node, "is-compress-dai")) - dai_drv->compress_new = snd_soc_new_compress; + dai_drv->ops = &q6asm_dai_ops; } return 0; diff --git a/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c b/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c index ac937a6bf909..4919001de08b 100644 --- a/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c +++ b/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c @@ -603,9 +603,6 @@ struct snd_soc_dai_driver *q6dsp_audio_ports_set_config(struct device *dev, int i; for (i = 0; i < ARRAY_SIZE(q6dsp_audio_fe_dais); i++) { - q6dsp_audio_fe_dais[i].probe = cfg->probe; - q6dsp_audio_fe_dais[i].remove = cfg->remove; - switch (q6dsp_audio_fe_dais[i].id) { case HDMI_RX: case DISPLAY_PORT_RX: From patchwork Tue Aug 8 22:56: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: 711598 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 75CB6C001DB for ; Tue, 8 Aug 2023 23:00:51 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6801BE7E; Wed, 9 Aug 2023 00:59:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6801BE7E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535649; bh=Tz8lcZB61HEWPkdNCIX2Ci2g1rUIySuO5e+w+e4/F5I=; 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=Eqy/+gWit8CqTSB7W8erJ0jZVFtnYiwoiRUacHCcT8MmjZuYJ/DwE27TgUSCLyhQg j0TTaoe8+lxEfavqvy2QjX3jgYMlLek4nEJVVKrnTRLRGyuRYbNvwuCSxXf/twveub jA7SZBNxAIkrKYLPgdMOCc2Z6X+sJwE6CLQUxQ1o= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 548BDF805B6; Wed, 9 Aug 2023 00:56:53 +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 995B1F80616; Wed, 9 Aug 2023 00:56:52 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 30A1DF8057C; Wed, 9 Aug 2023 00:56:48 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::719]) (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 78F9CF805A8 for ; Wed, 9 Aug 2023 00:56:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 78F9CF805A8 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=hZMR8WNg ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qolp2TEBib4fTmdtWs687YYVVu/A/VNC6avXbI0Q2Z/SLxLNwnxD3ld3IWfPKwqVSEH+VA129V3r+c+DlwiH2nvDL6XhLYFdZFZCZdbtF5zzd7rxabqmNcoeUZAVEZGMVyuesLv9/eRFKOy+0M02NT+UI3++n57JI++gi6mQUKn9ZyMz8HNkFqz3MYawTj7hJ3yD1oCWi2b2Ea4MzuPGLj81GWdnQyo+HKFNF9wajW3i3pWrDV0KkzEoWAaRqku05cVHIP9rolvvIcIngh+/1JXf0TgoJcUr6JWql0KuAKonzaeug7i2QCB8Nrquj/W663dfaOJTJxXrAzXQ090zxg== 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=ALiXSJGhdHcMcBAx30zvJZXIBrbk9xfyo9TteHMtghA=; b=mK+uDnnXfCFdyrHcL98erZ5Tagx4WJuLtE+rGmKiqg8fTo3Y2YHdPY5e00KezlBmd2fELwROjTJCwmbUYipTP7Qne9zcQET6tfqlVBI3PRplogMLv72KcZlpC6DfnLurfcz/qxnaUm1jbOQlu6dKcvZ0mCteg94R+8q1lzLq0sE4ooFfDNrDQr4edrx7NY8PKE2Uw/Nxi17YH+qQeKN3X8y04piY17Jbh2uFx5w+iYaGELGXMxTquk405CU9zKjo8BRZtGul8pnBpa2YAXoENQezNfY08qF4kGldt7hQOB9k84pTQn3l6KU3jAaffIS5tm/+TeiKdAtmzwnypr6pkA== 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=ALiXSJGhdHcMcBAx30zvJZXIBrbk9xfyo9TteHMtghA=; b=hZMR8WNgqUXjYIUPjrayMVKhidr4Qfl5SBul9NYI6uzQF87K9fjmfaJLTICirlm5onmSP3VhlVGC/9U/zrNfo9SChXejquA8rbbdVJYAD+Qn2JDn/RcAMuN9MELD8H38yNRSqjYczEigDIAFGMbjAMltJUyoRsZYkd+XAc2cHos= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:41 +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:41 +0000 Message-ID: <878ralb0t3.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 17/39] ASoC: au1x: 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:41 +0000 X-ClientProxiedBy: TYCP286CA0278.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: 91be8a8a-bfbf-4d4e-1449-08db9862badc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3DxCWyCdVG3nWVSP5L2ROpjoZE6OmSykKPxPUjdZYbJyPkP5txncgZPRhe4JbKM9nroMbOJZz+bMlNHeDKcd1QnQdGNunxRgilc6fEfk5LAuMRkSMhNijjBEVkGNgFiJzGpK2nxMlJ/Ky3O6R8g3v6LP+2y9QXsTgLhzWePZeFO8RHe18tKPVFnwHqbb4mJTAjkupiZqEiy28//H0z7D4dgYXCLYc2iTkKSCJYcfk9DkxzQrPu1jW90CElopgEwzScrEOLYqrB7j0qX0kc7ev6r+eJk1mz+eddGOidOzUlWhSZEzNz/+UX4ILer9m81CGzxN58Y7RH0wB5KxPeB3v4VIu6ZAJGzfIDRrpR6KWcxPyOoqr7abi5dugStXW7L7RMmgTr1ydzsksZFDxMu2nQHFnUSvIh4uBCMJzKmdts8r1zwt+AhE1S26hGJD3wdaHewA2ma/KmcDtSOSEllVq0tPBZSQVX6ZsVL5Ys6g5cFAE2z0C/TPLQhfX64wI2tDoZZPYEgX02QF3L5SmIy85GeF0G8rkILFwwIxg6EjZXNCw3KfhqrDjmTdv7R51d84t+uBVtx0a/AB34Yv6P2K+mMqjP78RBralypSF9V46iy6YqF8sTOTW/oSr7CqQ+6fmrri51AHaxXxLzwCGSLAkg== 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008)(32563001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MZAoqr9cpzWh9X+M3EvZZLjq5yWxloKJDvIq0BWz2jd7Nnj+eNhgKxpoeV436cRfn00t+Jq0RScYs+7AyAsv14OEgO2yqkCnc5QdIXRRIy+9Ew+HEzCg2EypXeQsO35v9LR5RCv5s6/BDVKFrFQVn4kTdhZyzrqkH6OYOIJFWT4Lrm1sL8+4ULBvVhfeRDC6b7cZ6kh3zoQH3/v2MSP1Qc6t7VbPVEv8sFyW/EjQLt2w73sWngHenTLGhRTqJFbe3pdFj/ccqsYyqM45fS1lLYd/oPhx6iqcCPC4MastBjlnQ8kDbsA+uYI6W8io4A6wAiKIK3O+sio5NrNJjc1zQwETLKXEEQcf6agbTfKNpY3HPTvoag1BXhil/wHqLjO5+FvrCmNg/lu/NL97h0MuZp5t01NB5/2Gx95h9Liw3+8S7eOW3S1RkHhEFG4G7hTJ2v30lCze94vAyhsxyXvJbNmPHlyrOu1PeVRc+QNXJU64JEqi3t56xVzVh3XFBUMRawqt1zDh4W6GzswYLSZi9Deo1Wsn8yAOd+OKcayzsYIPWApQ6b8Rak0YtAw9MIHU1tlePB8Fk1bYiQ1nbMZdlvuxqSxNC2Pm57X5zStP40O1IKRE12HCVuicuw0Jdh45teT9JAqUIWYYVrCJ1tasoJ/BruQman85+UCRCr1s9urhVmUYgt6Rr2jTiFNFKC9gsA0+11PP1FISmjy8DKB8wusvSkSqv3y8RCQBZb01chdB77txac3Hkuaj2Z+6HRLr91pQuJsNRXYUqYGoUBDFlf8I7hYvwqGSZLLbFzBanIXDOu/B4vMP+EkQBkB+EEkawFFeQ2tZINO7OOuTQFErKXkrPOuO+gnB4fCzxZ6BqQHn3TbQh1MOQytCu+tV64KseY8N5iBjznQcRiI2XuByAkfh5BLtOhWtJEbYpVGeQekoHYqPKd5TWNAw62+JX3iuoVa0PzVBRChyztw+0tiyMoFtWbZvkUO4wuzAxtbH9tlNmCxaMN9DRZkvxF/4mzAddE0Virx9trX0HWHIuwvKMbqnZihkJI+5iJMlvx3WdWXzvWMZBTBSxnlEXMfpwDmbGkTb/x6yJDZJEaZfyywmGD1vtEJqO4AiPpmR6MZDG9lNgC2RCzck0sfMGXbb1BSMkU2k7s2pJf3SqYWAXdTAC/JpJNG64lgyQH9dO8x//emW0tjjEVB44pdJCtx6kGOj0fyegoX8AJ8FM1aQ2sCE3OAfKno4fx+VLhVNGxQeD7Nvj2uB1umqmq83u1lCnvrrheTI6ohyNjF7SSxIYZ7UOZ9s16yNuhslC6nXYAZqoeeWySwrD1ZS9dY7vep26RJza6n2I14um+JafQNibLXl3ox10GhU9KQUPc/KcjsyKotEqEFfTnIYTM5UrkW0igvw8lMPo7imc7A1NFVWa/8Ol4JzUuTwrVbpI9B5ABWJ/HJP8D7608myeRleKKqrD1l/SZrGbumE5dZExHJxbLWCc44gJca4gRkk5J7fSQek9aGFMw4j913YkAArWG+kgjpIvQOsJ2/jWwG4q6umtma1zAQ0YpJgSJBWEMt/1+R/VZHU+IJjlKTE0G8c/i3oaFU7EZNDANYwMDjRu6iuAVbXujVQu2LKdlwKpUg7eqye7Bg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91be8a8a-bfbf-4d4e-1449-08db9862badc 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:41.3259 (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: rbEWgMyjdPO8BlONvpc29vjuvk3DrvDJSR6Zu2yaqJJnLlySIhFs6MJOpuiz0wOlZfuLpVofqtm5/v6lS7uCMPs0VPhMVSrRp479lonPX1Y/PAVH0VlzJ+8qhU7Ugwna X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: KEUUJY2BCUTF7E4BVS4YV7O6Q2KWPPHA X-Message-ID-Hash: KEUUJY2BCUTF7E4BVS4YV7O6Q2KWPPHA 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 --- sound/soc/au1x/ac97c.c | 10 +++++----- sound/soc/au1x/psc-ac97.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index a11d6841afc2..b0e1a1253e10 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -195,18 +195,18 @@ static int alchemy_ac97c_startup(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops alchemy_ac97c_ops = { - .startup = alchemy_ac97c_startup, -}; - static int au1xac97c_dai_probe(struct snd_soc_dai *dai) { return ac97c_workdata ? 0 : -ENODEV; } +static const struct snd_soc_dai_ops alchemy_ac97c_ops = { + .probe = au1xac97c_dai_probe, + .startup = alchemy_ac97c_startup, +}; + static struct snd_soc_dai_driver au1xac97c_dai_driver = { .name = "alchemy-ac97c", - .probe = au1xac97c_dai_probe, .playback = { .rates = AC97_RATES, .formats = AC97_FMTS, diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 9fd91aea7d1a..5d50ebc2bdd5 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -333,13 +333,13 @@ static int au1xpsc_ac97_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops au1xpsc_ac97_dai_ops = { + .probe = au1xpsc_ac97_probe, .startup = au1xpsc_ac97_startup, .trigger = au1xpsc_ac97_trigger, .hw_params = au1xpsc_ac97_hw_params, }; static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = { - .probe = au1xpsc_ac97_probe, .playback = { .rates = AC97_RATES, .formats = AC97_FMTS, From patchwork Tue Aug 8 22:56:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711974 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 B075CC001DB for ; Tue, 8 Aug 2023 23:01: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 B1A02E73; Wed, 9 Aug 2023 01:00:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B1A02E73 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535668; bh=Lxu+C9UiyCz4ICucrxZDNUe74vOMcvWzFNFcMpqRmUY=; 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=PBCMZ+rzwxmuIy5FTuHhtotkpZBbh5dbgd3E7gK6pIsOZ3KXiAhfWN9CTpJsE2/+B 8Fz6o8qzYh919srcAfG129i41Fv9r6qd1KTsb2CaWSXEyYWreooXpQ1dMevRhOG7m3 loc24skNCkm1H+7YAQvF7oKvHvXP9/CL0Cj7AsKI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 155DEF80624; Wed, 9 Aug 2023 00:56:58 +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 55851F80622; Wed, 9 Aug 2023 00:56:58 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C61AAF8061C; Wed, 9 Aug 2023 00:56:54 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70c]) (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 B9D1DF80587 for ; Wed, 9 Aug 2023 00:56:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B9D1DF80587 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=bPIyJXs1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eW3JqChEO5gJb9Sbq+YSj4J9uARVaE9AaZZ/ln88VPhedMYCZyAf7yAUbfmVV8swErqkKcZSILCN6keKFXlZvx9+ZwHWoMkax9sqGi7vQGCSbj0PCUmfojHcF51mf4dGdeGainQq7cxnVOCGrFOAjIXeeiBdeow6mpilTFLWKJZp3MXb3fQU7TZFl2UKMObTfUJIH3dTxSDAUWVS7jrI69wpXazLclPIsf2hfN+kw1OU7qG2CdhC+0fH/DqWvcAcwYdoeRJ1qGIfgiUpQFK2LeYNx2QUSjxpuJVgetx4E7wo7ecC0WQMJjZsePu1kdEb2Pn9oNFN9OHmrxjS7kuikQ== 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=owj1JA0VfjcvkFGEBIjOhhHrYs55CX5/MP/Pn98nwqY=; b=JukXldkTRTmGKPlKk5dwHAVCPMjJJE82KCnnr13G9G4PB5ICJ82FQHC68I7KEdb6wc+oLO/AZwyT2R/qS1uH3gzVPtL0JG5Gug4i5Ldt9fizoQH5xNHu/v3uwK9HOfYK7sJT3GK/Ol3FOtTpQgkfOYP/d8pgMZOC8gIAeNA6V+w1TwsEvhlggvW1nnwjcyG9hYnP5C26/5HZs7JBd4n2J2yYS3YnypnXkqYxGshEZBoFDx9mmBYWSVWGJ86/7HTgcvUiy3idnYfttQKiB3qCukK2daF3SI4B6FchxNlC+H6B603QqFmdZKj52tFnK/fAE0XEPyjklP1dqSTPPo1WOg== 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=owj1JA0VfjcvkFGEBIjOhhHrYs55CX5/MP/Pn98nwqY=; b=bPIyJXs1TB8BE4few2vD+43iFhX5HAkTlp+HauaEhmoE+lKVfWa77epimT08ttGX4edqO10W+73Gz+GO3n+gq1sjIQAYvwC8hSwmVv1JmM1eFXZm8HKaJWmHEdrFbUzY0jUvcLm77RV/7GcsiKCVcVXjIdaFKsaRJUWflGK4smo= 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 TY3PR01MB11969.jpnprd01.prod.outlook.com (2603:1096:400:40b::11) 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:46 +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:46 +0000 Message-ID: <877cq5b0sx.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Arnd Bergmann , Jaroslav Kysela , Liam Girdwood , Linus Walleij , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 18/39] ASoC: ux500: 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:46 +0000 X-ClientProxiedBy: TYWP286CA0011.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::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_|TY3PR01MB11969:EE_ X-MS-Office365-Filtering-Correlation-Id: c15418af-6870-4c74-8e82-08db9862be06 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZDjIgpAB12ZYay0XFs4o4aFyRXO/ftsLllqkF5fqthnsPueBL/JekaHHilAwribxSFHSRMm+rtYx2zjy8vK4m13BgCBTq6eCWpasrbnZV6Dorg5/pY2JNzImLcefj+s/K6q2bfjy8hn0K4hbmXihdyRSrNvs9mb5NsfabM8/bmqUwYfIEHVnM0RK0pIaGww8Xkx71j+w4eOvVOwB4Nyh6PaXMXWo5L0dhx1FBBflXjebLOFTkae51eRR7WCXX5htnCaxbpKsFWOdIVnAUk4eeUFICvAds5E9z7i8zd3DSkq07RNTxsmZt0HUVsRRRM37JfbhGkPWS0RozzKXVCxQjj9KSkVsZlQ/nfqBh58Zu4Rxrd0J8ytmrtcxg66AO8MhXvuKpmTHyKyOjnoGrwGLT8AP+XIBptSUSgRUywgNUAVndwe7i8i/Xk3XmPBOcZ0+By3JqAienrxj1hvpSnleJELZ6kRW+oIOjjT1sgHS0EeLP9NvwSUAZrRCVCI6PLEpJtoikQmH/nmFU9Nv/bLvtZVy9a76q1KG93dWtDIIGxpXdJ5JmfZOpzySRSowGF1yurgB2NWMOSDSYpsEZgFGB5ODEznJZV4SPvtclBygzzeGDxJE0hgdah3e5sJMXH+s 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(186006)(1800799006)(2906002)(83380400001)(316002)(2616005)(41300700001)(86362001)(5660300002)(26005)(6506007)(8936002)(8676002)(110136005)(6512007)(52116002)(6486002)(66946007)(66476007)(66556008)(38100700002)(36756003)(38350700002)(478600001)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mnaJPx8WjRi7HgEXImFiApbZDiAjl2nocrL+lq+1XwemvmDV3I6wKUtdMkQiMfv8YVZ9vmZ3nvUqJYg4gXPnyYYDREY0izvDtqeHAjPuAaipXsaGHgn4JKL1wJCGkNy2u1udOBj0YdW4MCgDmJk6Cpq6BeMNdqgr0U8qiPthiBMr4ZFV2Z2njsT/WSduf3/9Lrqs1BhkF/QRJcmb1CdgEsYtLddUSlYyzBoOwUC+B9YWplpCuzWuaFZFJe9rGQjMEFG5bBI6FEK7O2R9jiAJmEyagno0rTpCEuz/KWWkdgai51TdrqcFk7pLHfKF53yIYllbnpv8NUU0nMbRB58/Velw+vKxiJSZmuxoikjI383uSPnGnAHPCK67h7yQT8koE7GIbPaoyc6aoiiNbV8XqEER2O7/GhONrcoN2hP8DjFB63sdkd2JUTdUMbiy0kdWqLih+8iZggVXXi4UrOnMlo06xuyWY9K4xCEbYF7KC/W9Fi47+ZMUnP/qO9L7/Mq/YtBRJcTDorKhzVVrBsHiyrYiPbsIpcxVIPgl3s68+gysQkOOOGxCZMBVXCnG62Xld/j8lVCGZamHf7YPqGYSaSqE/6irhUrHkNFXyTgZM8tzpsDMVfhH/NV6fxEB54476Z8Juwl7pNAoidRalVagmkxazFXF3c43MPHla7N/wjko1H4XC3QlZ0ixqRrbYPGf9Veo1vMeSROiu9K79ZPc1xKMuzQJQJ/CDegmJi4SukU/eZ/0aFhuSPKzhCrYgKidJf7VQefz1FiS3mous7/LAEgJE8Z3Vqg1l1AhpJeMT2rBCDClv+N68DmUTlbfAk8mGo99tYjcFNxgPKjxU+Z4LIXyNQqjekgIDvUZ8FI9n9DdT8ijGFOqbp77+OlWWrZX3qTsEQxic0yzbYQwzpYVGIfNuL+DE6rjKAZ3LSyZyrhxST5LfKWL0pt0tL9/n23uS2LktNpqC44bF546rnED6VOAOqyo+xyfPo+8FcPYI9/d3HO3PLdYnWHPCtsfzBH4diGW7ZECwXFaq9LItHtrQ3H5gmEgVtcQ266G3bBISIjxpnAgz2m04hRm4YhPg5SV+YC7cHAsuantNOsHIeq/GZ/hphp9xQzzljf7N39hfJQhp9AVg0a1928t9Cs2AX1TruGewJuF+gVivt8ZvkaOiIFKmZwEQEqvMQ5f270CPJ3m3GPdKahBOncG2wPH+3dWMFpM49T4e2jZ8sh6zdt8brY822urmw68jpHiF+akLY2PWcM0fSlgLKPEz95hYm+R7GkgNes4ekJffBswWaIP1Qy+mEZYIv2YltrdmlsiIu+J/8M2Wk4jB51lG7BIB3N4SEamTtNFTSAgXVRdOSMTR5t9YbrydrIFDUMTcOpP3/PYOnKmE/3HuUk3sm3UWsqCCFn+P6RvFluckcVKEuLaGf+65WdpjbJba7VfdXuOzKAm8ry8L1A6SxZerBV73EChpQF4IGJm+nHyrxB+I+DPhPylKhfQyGtCwynCNaUXjDJSs2FLzf8mYODaIENkQ7YWrn2Nj9Y7601Yc564dDRidF3KCsiM00/Gy6qnqH4eiN07kOu+XcT+VImQ2gHAsp5ffmbKUTMwWSyFy0Ad8KAOmad6/3ZKU1t9QDQwKC+0AZg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c15418af-6870-4c74-8e82-08db9862be06 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:46.6329 (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: 7DUu2DcuzHFKagzGJbAkkyNbEwzaR3jYp+ABnVA3mnlCSLhKtsTKI6BI2OUJ2kj2EJtJitTaXTQLwwEDRzVcYoffIO80AOUbauro1g1WC9QwsRtia67PsUEspbyilSTB X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11969 Message-ID-Hash: 527QVICFKTCKRTJZKNOZCIIJLWPH2MIG X-Message-ID-Hash: 527QVICFKTCKRTJZKNOZCIIJLWPH2MIG 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 --- sound/soc/ux500/ux500_msp_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 44e88dad8584..cde0dd8e2569 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -683,6 +683,7 @@ static int ux500_msp_dai_of_probe(struct snd_soc_dai *dai) static const struct snd_soc_dai_ops ux500_msp_dai_ops[] = { { + .probe = ux500_msp_dai_of_probe, .set_sysclk = ux500_msp_dai_set_dai_sysclk, .set_fmt = ux500_msp_dai_set_dai_fmt, .set_tdm_slot = ux500_msp_dai_set_tdm_slot, @@ -695,7 +696,6 @@ static const struct snd_soc_dai_ops ux500_msp_dai_ops[] = { }; static struct snd_soc_dai_driver ux500_msp_dai_drv = { - .probe = ux500_msp_dai_of_probe, .playback.channels_min = UX500_MSP_MIN_CHANNELS, .playback.channels_max = UX500_MSP_MAX_CHANNELS, .playback.rates = UX500_I2S_RATES, 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", }; From patchwork Tue Aug 8 22:56:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711973 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 90CE2C001E0 for ; Tue, 8 Aug 2023 23:01:40 +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 2D17EE11; Wed, 9 Aug 2023 01:00:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2D17EE11 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535698; bh=tTMI3NffjdTCVTjvDhez1gQ4yurAgGMTo8XWl5Aqkxk=; 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=dNHbNLq/jculywKt7tjSr0BOSk0Edenu23FSCUXHue+cG+eUDIHa4cHqI+NHmWtcg H8b7voD1kzHSkvCywZZnAWX42D+lPfMfu33RfPuFgOm5+P79ww6dVbo5k/KXupRH3k 1uErJrel22su9hI5mjhO8mRoRA0oyvb+dBkLteWY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 00639F80631; Wed, 9 Aug 2023 00: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 2BA4BF80632; Wed, 9 Aug 2023 00:57:16 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5A4C4F805A1; Wed, 9 Aug 2023 00:57:12 +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 0AFD1F805BB for ; Wed, 9 Aug 2023 00:57:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0AFD1F805BB 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=HdY+ZFc5 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KV1zto1nqC+kXxvBhLau4dXXMmhQ6rCCB1LmXUxi3uqujvIxNmDDO7BrGSwgIZEz8lrAZIAs0upXQ0IBrlclc4bqZhhgm+R7qwICB5OcIQO+FZab/xDAL7FgMSvRaXp3c1qRQYRdfZrtl8TwIF6XNU+RZJ0hO4EiXr8Yi+kL7kEWIZZxjNKkq3HgsWOEr2mi4NIrMXnjm8M5bosrvze2IMjMi8iGoxD5cNejXHdq/RhjiGocEtq4JuEdq0BMFCp/LIcICmV/iwH3YjNG/RozxTZdkUohw97L3p5JomgrFuvriJRLZpBW/NEIBzK3wUad/7fAOx+sRonyhwOBiLr7NQ== 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=geDSCqxx0f3whRSRL7RPlEy8zoyarcSGmY6C/LZc1Kk=; b=GkdjQWkqW/cje96QJ8T3G87RX3h7YJuu1ZQ/swKRukC1NXnnKdA+gQT6gw8uzwC9cVE2VftPOMHXCWdh/Tg0No+94Jezs7gNIIvbmZMcIUF0EJLo3+LrKby2LUnGFNPo4e2RfSi35Bwm4L3/9fIv8fyTrmpY2C4hZ0zUcB8gYGtvXOY0JinnMa2K5ysOiIikTMDlyloVj0jaaxCvMcYPEydZdkrgL558zVndyuWSGNCGfse6tSk8WwI6jNuls41TAS1Cs8uzBGPkmtWvy7OVbp0RSwT6HhNbmZh/fzFpI650aahn86LCCTtlhFNoe0xJvbEjFxFr8xhuYZNZuJgDog== 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=geDSCqxx0f3whRSRL7RPlEy8zoyarcSGmY6C/LZc1Kk=; b=HdY+ZFc5UywdJHnxKmm4equxpMe4+bBKXk/YnRn49V/ETunDalOWq3qAYHBiJfhwhvmUBj3uhA2ntluHWTszPN3eTcGM1VgGI9+cn0EYc3l8TkJexol6/zllKHcnbGfFOADaq0yunLemkB0C3Tx55QzjK46ND8FNqNDf8ytgWZM= 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:59 +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:59 +0000 Message-ID: <874jl9b0sl.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Jonathan Hunter , Liam Girdwood , Mark Brown , Takashi Iwai , Thierry Reding Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 20/39] ASoC: tegra: 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:58 +0000 X-ClientProxiedBy: TYCPR01CA0014.jpnprd01.prod.outlook.com (2603:1096:405::26) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: ceccc824-6510-4018-4226-08db9862c56b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kBzh1KGwv0Pf//r96vY4KDiacdYRELX33MgF1yKBFc/53FFE4DlQugxnLDcS+kRbhKmZwAoHGwYUEUK09cDARoSN665VQ5DFkD0UNevIEPdZA6HuIeaTTyRsWzxqZfvphmpfVJ7kPWR2ueq45ydLwenByPS55dTD+I8CAT5qgVmbeGWaUsDkNGVc8soXC0ousEh4masbfSPGJ/tdeIeg32eBaLFm6N0RhwNoT5KHlPtK1GvyFncn4GRBr+8n1FANmoXEAp5rT7JZU/Lv6Cg7QODqEpaVR39q9lRBk1veVcOv6dS/eyLB394rlqa4OlRBlSKx/+Da+DLK0Z+g9DXwe3hERiJ4c7cypwv3pQYVDSl8InRnBMixMDjiRIEjJhVBzZsehn0fqclzW8NWpQDKb9c6r7+9sxcsfpieff7m91+HU3QkClo0vKB0Oe0A56T7Se2a86zwhe1CygzV1YcWXhG9idl/Juw9mvnV6IkNC9TWJpnuLKM8pok1pbx8/27SMj2RzKnoiL5jNVDmYn+H1Xs109eYC9VdAN5wb8LE752TesPNG7jGcumBOSMZDigAb2uICv8Px3Xfz4VnHpsx6crtNp7Ydj7h1oodNXtiu0ogpuy0v/Bhsey/NnWtBbXg 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)(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: WhYj7bp0iqISgbAMFAuyPdscosWPhmMk/kBNIuADNESvY6LH7k+L3X1ZBVJVRsUkLU89FADX9HUymq7szuBLJOUMEYhf/m1BvFXM5867of/vDCCIossNA1Hsf+w4wCIA+wo/lrX96AU2P9l8+snztjPioSakoC6EHzT9YVueFyRa7zHHkBH4usXs5oAInqEcbzHPVcOEdUkHRjePBrjJ3QUBqpAdqEC1vSQtgnHHE9Qysb7OxpSaIc7qr9ayTloNwG6KPcorKHG3XlzPyEaRHLeICaiEjbigx7CVJ8QD4vgSaIMvgCH7KN/17ze9XlaTSZ2C0Vo4ip7103zKTTALQ/AOLyWOGSgzjls2etEbljlx2Yz7xaw4XrHMy+pq29AaK0GTBOlDy6u/Io/MeWTUhCN2iQRKByq5i4VYgHFzOLLH6RnY0J/tLeFUR/k1O0JvfkR5s7/sQ7N/2gc+i4Qk38xBlX+xMfuHISaODJA3JvWUICo4JO9onvljYV6lRWptRhc5t1to0DkW1JsOOBxTsl4FyaNZZ/gSPydvV6BeTkgDoWfweMEol4uM4zulLe8qS7016LabE44RgjOthOdOrVx7gpRm/i6O1kmPW6pj5Zm7S4iWoRhLl8TY9Eeppcq8m4mS/WPE401nvemOke8hyDLajWJWDr4nKBpydVQQceTz6mMeqIDyEh6iiJ7wjlxIhDYpmV+W7qIpQ149iozm62SPr9ZLiP/B00Q90zHM5wo+Gu6ZvPFX4aGbKP1MHwValOitJD2ZPgzYQ9O9gzVbxyQAewBri7Mn19oWWTjOPT3jPfYSi+XaRnxkOqFOOgAo0+hZWApne9jTLrMLr7lLYJSmmCaDpV11zwfd9EHY8+SWkGf3XBVLbVMwmLOtGG7zHTh7VnMIjWMm3bIW/myO94IyXhp85ZFMF7x8OVWLDKqifueSFbH/S1qDSwvY1BC21o8tCGvDiCiT5K9ovOGeEvVDUlwYihrz3fBNho4dues/Bog6mZuKOMDRi+0hnQAtRqdsN/cNSE5JWb3aPpMF2vM9q7KSDX75DYEr03AzSYRETFp24t8+ivgeUaus1wI6hp80DDhCRLsrJyOIoTyZFf+LzvfBD9pQlhMO80Z2ebNQF+PWgGb+ca57EjMq1ZrRnhCkDHOaQZZDRPQFUJ+5PbJkzsJqssBfc1c2Uzq5pGi7d9/Cj+KVExjTtHyp3Rqas5EkP7Xdq6Q+/z1JtDws8LM3lyDPncHYP2aAb2tEIMdv7GNzoknQQ3Wuf85c9u2TCD/LDEAgoFhg92ejllkdM1KEJ3mwwZEmipsjv56VyoY/JedwWXzxt0YdJcDk4td+twMzHtWmxe26wrq1MNFBV8OkIdntSY54BdPR4zTENwxeM1Hw9daIlm2fwjXKDsenz7NFbbOxmGH5Ug2NI0FTxvoYgodGrQcJ84YPFaT6VsR59nbL4Mo5dD8E0jr2mrRDugK2Erbu9er8zU6O5Yas/2ndcBzFT8Qs/lxhIH19LwYRWwBg62B7S+R+FCYxCztL8f1kkZnoa7J405+tBGRO/8NiJWCWCNzYH1Zg+QOro37CbgRxfVDY6B4UzH082Jbk7HsTdEaMXXdr9WdsY7sjYJLbF2IDoRCP4VDnxZqZ5dw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ceccc824-6510-4018-4226-08db9862c56b 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:59.0193 (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: PkCJXIdKLuyJFShzC2mhlYq8j3Qzp4k/BE0/F15DerPJujiJQp0GM0WY7mp2nnwbpmfDHGsZR5iO8sMwFBPd+q9py9vFsgI6yU8037bNfV46UQq3msWNQC/0u3aY2Dns X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: UE4RI7EORW2IP6DVJ453V5VGWWYIKIAZ X-Message-ID-Hash: UE4RI7EORW2IP6DVJ453V5VGWWYIKIAZ 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 --- sound/soc/tegra/tegra20_ac97.c | 10 +++++----- sound/soc/tegra/tegra20_i2s.c | 2 +- sound/soc/tegra/tegra20_spdif.c | 2 +- sound/soc/tegra/tegra210_admaif.c | 12 ++++++------ sound/soc/tegra/tegra30_i2s.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 60e7df41c64c..e713feca25fa 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -203,10 +203,6 @@ static int tegra20_ac97_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static const struct snd_soc_dai_ops tegra20_ac97_dai_ops = { - .trigger = tegra20_ac97_trigger, -}; - static int tegra20_ac97_probe(struct snd_soc_dai *dai) { struct tegra20_ac97 *ac97 = snd_soc_dai_get_drvdata(dai); @@ -217,9 +213,13 @@ static int tegra20_ac97_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops tegra20_ac97_dai_ops = { + .probe = tegra20_ac97_probe, + .trigger = tegra20_ac97_trigger, +}; + static struct snd_soc_dai_driver tegra20_ac97_dai = { .name = "tegra-ac97-pcm", - .probe = tegra20_ac97_probe, .playback = { .stream_name = "PCM Playback", .channels_min = 2, diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index d38b58305c6b..f11618e8f13e 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -310,6 +310,7 @@ static int tegra20_i2s_startup(struct snd_pcm_substream *substream, } static const struct snd_soc_dai_ops tegra20_i2s_dai_ops = { + .probe = tegra20_i2s_probe, .set_fmt = tegra20_i2s_set_fmt, .hw_params = tegra20_i2s_hw_params, .trigger = tegra20_i2s_trigger, @@ -317,7 +318,6 @@ static const struct snd_soc_dai_ops tegra20_i2s_dai_ops = { }; static const struct snd_soc_dai_driver tegra20_i2s_dai_template = { - .probe = tegra20_i2s_probe, .playback = { .stream_name = "Playback", .channels_min = 2, diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index d034803695a0..b0670aa4d967 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -241,6 +241,7 @@ static int tegra20_spdif_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops tegra20_spdif_dai_ops = { + .probe = tegra20_spdif_probe, .hw_params = tegra20_spdif_hw_params, .trigger = tegra20_spdif_trigger, .startup = tegra20_spdif_startup, @@ -248,7 +249,6 @@ static const struct snd_soc_dai_ops tegra20_spdif_dai_ops = { static struct snd_soc_dai_driver tegra20_spdif_dai = { .name = "tegra20-spdif", - .probe = tegra20_spdif_probe, .playback = { .stream_name = "Playback", .channels_min = 2, diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c index 6868508585a0..9f9334e48049 100644 --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -419,11 +419,6 @@ static int tegra_admaif_trigger(struct snd_pcm_substream *substream, int cmd, } } -static const struct snd_soc_dai_ops tegra_admaif_dai_ops = { - .hw_params = tegra_admaif_hw_params, - .trigger = tegra_admaif_trigger, -}; - static int tegra210_admaif_pget_mono_to_stereo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -550,10 +545,15 @@ static int tegra_admaif_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops tegra_admaif_dai_ops = { + .probe = tegra_admaif_dai_probe, + .hw_params = tegra_admaif_hw_params, + .trigger = tegra_admaif_trigger, +}; + #define DAI(dai_name) \ { \ .name = dai_name, \ - .probe = tegra_admaif_dai_probe, \ .playback = { \ .stream_name = dai_name " Playback", \ .channels_min = 1, \ diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index 644280603095..81eaece51130 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -304,6 +304,7 @@ static int tegra30_i2s_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops tegra30_i2s_dai_ops = { + .probe = tegra30_i2s_probe, .set_fmt = tegra30_i2s_set_fmt, .hw_params = tegra30_i2s_hw_params, .trigger = tegra30_i2s_trigger, @@ -311,7 +312,6 @@ static const struct snd_soc_dai_ops tegra30_i2s_dai_ops = { }; static const struct snd_soc_dai_driver tegra30_i2s_dai_template = { - .probe = tegra30_i2s_probe, .playback = { .stream_name = "Playback", .channels_min = 2, From patchwork Tue Aug 8 22:57: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: 711596 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 AD4D1C001E0 for ; Tue, 8 Aug 2023 23:01: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 971D8E9B; Wed, 9 Aug 2023 01:01:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 971D8E9B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535710; bh=2P6hxfhjQ26ia4EXM4U2fcu2xOjRmEjksXn2PeH2icc=; 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=G2gUw+bQwpFPTrPAPrZCtE1BgzC3/6FR68aQ2pFUex/2DhijyFUgD4zEojZkDY7cX t7IE4jHUOQJWdEt8EPduWpNcRu5uXe4Wb0ABuz0BAhSo5f/loPg8F+qIdyq+PLCY2G EbIyzGMaEqIvwZiN44VpylKSTuhxNSDOYgOUFGHI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 91038F8063D; Wed, 9 Aug 2023 00:57:21 +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 0DC4AF8063D; Wed, 9 Aug 2023 00:57:21 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 89757F80639; Wed, 9 Aug 2023 00:57:16 +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 A6D1BF80587 for ; Wed, 9 Aug 2023 00:57:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A6D1BF80587 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=FRobZ6i7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BsVVJhKsluMy2Dmrb/rzk+0uO5iIiSVq2a2k9YYOZMS1fhgEvcAueFL9wZ4MsulwlSUqKMI0SGF6UXCNUCuvVasvBKzOpB7fHsebPDKYWWgC9uXiy9E1zXuZ14lPenu5EP+3m+pyN2f25uPKIPZAJ26uQr+CS6CMvo/jHDWSRuoG+DEDMGspjVSk5OyYcI1PZiH6KPq0ZI9JaldylsH6NwsrzJzKjdGyvLG7Gejx7Lxrh21FtQy9FyVPA+q/FioTNh2YkTCEKYRKJB7ywGgVE60kCAvzDI7Xe6WyQEYideJyYUdAYAfOTa9gVIRcTxqO4SiqCqWpvYYyyk9QJWFXTQ== 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=MME9TMibQbXsaRHEl5cxqu5qB31oVFXoOIPPtbVTzCo=; b=S/N+y7NNY1n+U0BZLt7LdBJFlDyMQljPiwzDidOtjXD0Sh5tXSdou3qiNxuF69mIH0vHwEBJDYp6CzXf4JjW+vMiP8A8QPTHHsmIW6fCoosYdGPjbL0psfpOU7qfNsJ303VNfujLiOzS5412h3kVR12At4DNDWB14D7trn2P+5CqkVL4PbZC7cxZejXnw74JYFEcqytPD5WAsmVE1QjsNXDTfbM8+sHVdZmYMwcbYqxUMTOVPvD1Ew9EXrnpyBw5lsOBvDUgrcOBBH+XB8mwyCIkMcOGwEy6qKPYZLOzND5kVGPWaKxr5TuTIRsOeMVff/31TFfNCRuYaEK0X91AlQ== 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=MME9TMibQbXsaRHEl5cxqu5qB31oVFXoOIPPtbVTzCo=; b=FRobZ6i7qn2IoIq4kWxmVhoDVkW69NRIIROALUZKq1Z1dV6OZdtFj2CF7aFNGY87t6GviZciGzWuixXmoIpFzcX8oYXsjJkMh1tTTICaCJsTLr6x0AV1T0+Wb0KAa/9IsfUOTy95ig5SpWb0FR82e5q8CFBrZMELp+YOU7ceS1U= 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: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.6652.028; Tue, 8 Aug 2023 22:57:04 +0000 Message-ID: <87350tb0sg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Alexandre Belloni , Claudiu Beznea , Jaroslav Kysela , Liam Girdwood , Mark Brown , Nicolas Ferre , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 21/39] ASoC: atmel: 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:57:04 +0000 X-ClientProxiedBy: TYCP286CA0342.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38e::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c0220d7-2c33-4d46-3066-08db9862c8ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L3BlTGL+8tAC9VZfhFOCfrO1Qv6cWEsY4rSnCCZFFklziBt5tu3UWZAOFmCgUHpR5OAQOoXaoyCyQwo11eGCavJ2Sy72tqeoX5Lhw4MPhU/xsCXAcSEqZOW8gurIlYJZ3Q6E0yHSLnKQeMfvpvO5CimC1qNNx1MFlnltgQZHHpDebVIo1bajCRZrJcAHVWZAwJPvcGY1s3d5ZqJDnVAPbxRQzf3fkBxYYEb3KoVxtDsgOdG0B36HkSNXx/Az4LXVSHTQQswOWAkzisP9NLTDk1QdU5KMFj7GwpriOAt72A+aQWawI4ewmcEhBBNJso/3k65aympqpzUqIRrb09CDimSvRm4e81g0hP1jfTglxIOEB5tjrAe4LqlQwTw5XTSAO4G3edrUcrYR94sioDZwdi3mfqUIaPZR/nKfmq2PngNBrfQwgPenQSzD2HO3876RXhtW6gW0Qv5vZpoOK/qJZthvVB4HkJRf2K9SkIHjJBSNJDWVZF7g6/GzeqsdKM+L7+aMb4vmnzCsBKfAV0+XvcW3yu3Zi9I4FaUkx8hsVbAXe+Ib5QOkRWD8j0Ndl8NElY8Vw2Nas7i470/hyILBMxl04v2r56VeiRSAYP2RHIx1gRP+EAc84xIwkXfUxO7y 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)(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: 36ihWVVfDXUY0ZohfczsFa+bfSMvJDYzLhgJ3WyTIt4tZilbbUIdVGp+Ov/zjNs/QRDXr7Frsi7ehjEPKCiFANfysYM6bol+BcO1TkXIMEsy9VzbqdIWkGMyKDSTVyBZM/USJhymovmfB4cL+6iPT2Lz25hVnBP+GCUUcsQSMCBXl6qVoc72qn4GOB0IuE8h+dtyUXMWSW24fTVLx4yN/JV4eS9Vd3Lm3EUhqPkuCTTqt+Fqvc/Z9XSL5FbdDCCzFgDpQj6x+LRv82QgvdGenIE/zaDLStPYXqN4grakj1iAOwtyKtyL+1v6i8Jh1sY8Pg3wIfluEgNV+hlNQ73uPYzakzr0dJ+el7GIN7TzXkrnew9tRiPJMXPOPVYouuw6LkiKJ2BGGEtxtZwZwn5wGTh/7A9JAfjumWrNnd291dhgycKWdIW97MplE3jTsDq7UpOaK6tNU/HEuN5al5DSbT6AUm6hVOEQtx4AnOiqbLRfF2j7/K4B5a+MEPud0F8u7Vff73PB4PZ437FRRsJjsBrC3T1bcDLPFjhh+seHU1ZvWyjxXFuYh1W3QYRvmblLpK7pbfzZsHMG163JE0xl8J1/sDDXqGxg2FDCV0cQidZhhk6xDij7yNuY8OhC0wFuvtqBo6OpAuN7P1sljfRObDJBVmTNB3zL0ihbcQA/eYcdC5WV8r4E68w5WYQG5yoU4tK7qEn6JjbduKwTYtdmlJRKX436JsJEvDh+AVLkxwFxTHPTwrFR+8WxNHNq9CxdUjFTAX5+fagdpPxPJAAF3ELSHCxe/IQhzhsSj7xBNt/fZT/AfYrFOsZEi9DqHqRmLAmz+pBdl4Yhnmy6u40ncpCN8+z80CoM1qyY5QcmINyZ2+SIVRJDk0cDOLm7X5J8E826sX3ykiZG45kyZ+pejz/7rDG727AxZgBaEGd3pCmeLYEp/hrI4LiqN7uYJk9mXYZq106BiEamlOO3/NbtEkSPR7H+XVOSB7EO3Jv5YXtBvL8/TKd6HuIo1Mu2utGOEKCQYbJkPkp8+TjRtJg8cYkrcfj/gfxS5wAu2PP1alNz+MCl9AnXfmifVQR1/N1KKAtV85MIkoKI6CsLQIx8TaMZ+ypRU0QMc7xEjKIzmYDchILBXiEh1WYpccNLeaEZB6gB42/T8xYn9uSY02oRBaB0ojXmg//Fdukh/IiYujLt2X71ccV+keEpp4QIeRyPxAV0urYaXHGp13dbisQiQgusrIFyYdX0m5praDT4ORfxbvYgHX7pg+Yt9g0losq7KIfCM3/f4U47bwl093gKBMB0o05nDH8BdS9oFq+TiVQKZyAMWBSmDWjTOh5iarULiwg5Ou/S3k51jk6j629GihhYB7T6sYP+Bu6Dm/F1lP6n7qi+mAkfJJGWDralhaRBl0Dh2cxf8iDhNpIRDF48JfAC40REc/kF8bo+M3frS79Uv5IUNpbU7Ph0rEbS+KnBAMjWxdWiWKpWPlAyUMjqrVAiOjTCEvM4eI79S/lm1ryOt8eogdydmyjBb64xawgLz3twtGCoow3e+zje8eNY5bMm+/tUwKk2D+kD7rcDOaXNM5j6Ro0gu3CEMCO9cnf65aS3znz3QqBmUKdeHQUDb4XFKgRjLBnUvF0tQHq4Q5Q= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c0220d7-2c33-4d46-3066-08db9862c8ab 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:57:04.4701 (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: j4D93uiJgPds4+x0iBAn4DWxnxE3R9AjflZtjCTnEV6b6fhymNFDJN8h4rJlZF+aF4sLCikQAYxLDhrbW+anewZejK5mhuIxeyizgNQlCwPWk8L4jojMaUBwsQzplkFp X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: P3D4ANISI6SPFSZJJKO7AET3CMC3CMA5 X-Message-ID-Hash: P3D4ANISI6SPFSZJJKO7AET3CMC3CMA5 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 --- sound/soc/atmel/atmel-i2s.c | 16 ++++++++-------- sound/soc/atmel/mchp-i2s-mcc.c | 24 ++++++++++++------------ sound/soc/atmel/mchp-pdmc.c | 18 +++++++++--------- sound/soc/atmel/mchp-spdifrx.c | 14 +++++++------- sound/soc/atmel/mchp-spdiftx.c | 18 +++++++++--------- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c index 69a88dc65165..0840b8220510 100644 --- a/sound/soc/atmel/atmel-i2s.c +++ b/sound/soc/atmel/atmel-i2s.c @@ -532,13 +532,6 @@ static int atmel_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return err; } -static const struct snd_soc_dai_ops atmel_i2s_dai_ops = { - .prepare = atmel_i2s_prepare, - .trigger = atmel_i2s_trigger, - .hw_params = atmel_i2s_hw_params, - .set_fmt = atmel_i2s_set_dai_fmt, -}; - static int atmel_i2s_dai_probe(struct snd_soc_dai *dai) { struct atmel_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); @@ -547,8 +540,15 @@ static int atmel_i2s_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops atmel_i2s_dai_ops = { + .probe = atmel_i2s_dai_probe, + .prepare = atmel_i2s_prepare, + .trigger = atmel_i2s_trigger, + .hw_params = atmel_i2s_hw_params, + .set_fmt = atmel_i2s_set_dai_fmt, +}; + static struct snd_soc_dai_driver atmel_i2s_dai = { - .probe = atmel_i2s_dai_probe, .playback = { .channels_min = 1, .channels_max = 2, diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c index 7c83d48ca1a0..be83333558d6 100644 --- a/sound/soc/atmel/mchp-i2s-mcc.c +++ b/sound/soc/atmel/mchp-i2s-mcc.c @@ -870,17 +870,6 @@ static int mchp_i2s_mcc_startup(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops mchp_i2s_mcc_dai_ops = { - .set_sysclk = mchp_i2s_mcc_set_sysclk, - .set_bclk_ratio = mchp_i2s_mcc_set_bclk_ratio, - .startup = mchp_i2s_mcc_startup, - .trigger = mchp_i2s_mcc_trigger, - .hw_params = mchp_i2s_mcc_hw_params, - .hw_free = mchp_i2s_mcc_hw_free, - .set_fmt = mchp_i2s_mcc_set_dai_fmt, - .set_tdm_slot = mchp_i2s_mcc_set_dai_tdm_slot, -}; - static int mchp_i2s_mcc_dai_probe(struct snd_soc_dai *dai) { struct mchp_i2s_mcc_dev *dev = snd_soc_dai_get_drvdata(dai); @@ -895,6 +884,18 @@ static int mchp_i2s_mcc_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops mchp_i2s_mcc_dai_ops = { + .probe = mchp_i2s_mcc_dai_probe, + .set_sysclk = mchp_i2s_mcc_set_sysclk, + .set_bclk_ratio = mchp_i2s_mcc_set_bclk_ratio, + .startup = mchp_i2s_mcc_startup, + .trigger = mchp_i2s_mcc_trigger, + .hw_params = mchp_i2s_mcc_hw_params, + .hw_free = mchp_i2s_mcc_hw_free, + .set_fmt = mchp_i2s_mcc_set_dai_fmt, + .set_tdm_slot = mchp_i2s_mcc_set_dai_tdm_slot, +}; + #define MCHP_I2SMCC_RATES SNDRV_PCM_RATE_8000_192000 #define MCHP_I2SMCC_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ @@ -906,7 +907,6 @@ static int mchp_i2s_mcc_dai_probe(struct snd_soc_dai *dai) SNDRV_PCM_FMTBIT_S32_LE) static struct snd_soc_dai_driver mchp_i2s_mcc_dai = { - .probe = mchp_i2s_mcc_dai_probe, .playback = { .stream_name = "I2SMCC-Playback", .channels_min = 1, diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index c79c73e6791e..944d78ef2f36 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -706,13 +706,6 @@ static int mchp_pdmc_trigger(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops mchp_pdmc_dai_ops = { - .set_fmt = mchp_pdmc_set_fmt, - .startup = mchp_pdmc_startup, - .hw_params = mchp_pdmc_hw_params, - .trigger = mchp_pdmc_trigger, -}; - static int mchp_pdmc_add_chmap_ctls(struct snd_pcm *pcm, struct mchp_pdmc *dd) { struct mchp_pdmc_chmap *info; @@ -765,8 +758,16 @@ static int mchp_pdmc_pcm_new(struct snd_soc_pcm_runtime *rtd, return ret; } +static const struct snd_soc_dai_ops mchp_pdmc_dai_ops = { + .probe = mchp_pdmc_dai_probe, + .set_fmt = mchp_pdmc_set_fmt, + .startup = mchp_pdmc_startup, + .hw_params = mchp_pdmc_hw_params, + .trigger = mchp_pdmc_trigger, + .pcm_new = &mchp_pdmc_pcm_new, +}; + static struct snd_soc_dai_driver mchp_pdmc_dai = { - .probe = mchp_pdmc_dai_probe, .capture = { .stream_name = "Capture", .channels_min = 1, @@ -777,7 +778,6 @@ static struct snd_soc_dai_driver mchp_pdmc_dai = { .formats = SNDRV_PCM_FMTBIT_S24_LE, }, .ops = &mchp_pdmc_dai_ops, - .pcm_new = &mchp_pdmc_pcm_new, }; /* PDMC interrupt handler */ diff --git a/sound/soc/atmel/mchp-spdifrx.c b/sound/soc/atmel/mchp-spdifrx.c index ff6aba143aee..5da88a8562ba 100644 --- a/sound/soc/atmel/mchp-spdifrx.c +++ b/sound/soc/atmel/mchp-spdifrx.c @@ -503,11 +503,6 @@ static int mchp_spdifrx_hw_params(struct snd_pcm_substream *substream, return ret; } -static const struct snd_soc_dai_ops mchp_spdifrx_dai_ops = { - .trigger = mchp_spdifrx_trigger, - .hw_params = mchp_spdifrx_hw_params, -}; - #define MCHP_SPDIF_RATES SNDRV_PCM_RATE_8000_192000 #define MCHP_SPDIF_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ @@ -1009,10 +1004,15 @@ static int mchp_spdifrx_dai_remove(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops mchp_spdifrx_dai_ops = { + .probe = mchp_spdifrx_dai_probe, + .remove = mchp_spdifrx_dai_remove, + .trigger = mchp_spdifrx_trigger, + .hw_params = mchp_spdifrx_hw_params, +}; + static struct snd_soc_dai_driver mchp_spdifrx_dai = { .name = "mchp-spdifrx", - .probe = mchp_spdifrx_dai_probe, - .remove = mchp_spdifrx_dai_remove, .capture = { .stream_name = "S/PDIF Capture", .channels_min = SPDIFRX_CHANNELS, diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index 1d3e17119888..4b19a98b331f 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -516,14 +516,6 @@ static int mchp_spdiftx_hw_free(struct snd_pcm_substream *substream, SPDIFTX_CR_SWRST | SPDIFTX_CR_FCLR); } -static const struct snd_soc_dai_ops mchp_spdiftx_dai_ops = { - .startup = mchp_spdiftx_dai_startup, - .shutdown = mchp_spdiftx_dai_shutdown, - .trigger = mchp_spdiftx_trigger, - .hw_params = mchp_spdiftx_hw_params, - .hw_free = mchp_spdiftx_hw_free, -}; - #define MCHP_SPDIFTX_RATES SNDRV_PCM_RATE_8000_192000 #define MCHP_SPDIFTX_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ @@ -703,9 +695,17 @@ static int mchp_spdiftx_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops mchp_spdiftx_dai_ops = { + .probe = mchp_spdiftx_dai_probe, + .startup = mchp_spdiftx_dai_startup, + .shutdown = mchp_spdiftx_dai_shutdown, + .trigger = mchp_spdiftx_trigger, + .hw_params = mchp_spdiftx_hw_params, + .hw_free = mchp_spdiftx_hw_free, +}; + static struct snd_soc_dai_driver mchp_spdiftx_dai = { .name = "mchp-spdiftx", - .probe = mchp_spdiftx_dai_probe, .playback = { .stream_name = "S/PDIF Playback", .channels_min = 1, From patchwork Tue Aug 8 22:57: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: 711972 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 DB976C001E0 for ; Tue, 8 Aug 2023 23:02: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 C282683A; Wed, 9 Aug 2023 01:01:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C282683A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535732; bh=D51zCh8fiqPzYXROzJiZFRzD7RfJLtLg5ATHf8g2Ng8=; 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=U0Vi52Y9g6UgtXoqBXyHFAskEwfE/z875yTGplvFzgICXQuVBVLwJx/6LGBJF84G6 Hm9met/dLx+ZgV0uUcK5l/a17KPHQKtZ8jc+pJKzPIVBzLfEPUlg9pnHWUdbp6qfDb e8WiUs9LNSjF0KXCFwfF5GrEvsWNg3yItkI2sxn0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 77E47F80656; Wed, 9 Aug 2023 00:57:25 +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 C15F4F8064C; Wed, 9 Aug 2023 00:57:24 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8E1F4F8063A; Wed, 9 Aug 2023 00:57:19 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20710.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::710]) (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 A8BF7F8063C for ; Wed, 9 Aug 2023 00:57:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A8BF7F8063C 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=IWC9UgzD ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lfxo1FVavnD6iiltnFcbMTQjzFVw+lkGoWVLxxEpieBOQ9Taz8mGfGXEZ1hEAICW2BXNuiND60w7mynWGZWojl0mg4dO1ygO1lf++K4MeYpvj3xRw/Yb4DtXOnXYduSo6Pq8DJ5/TU7SjmIW6LYvO9vdOrarSEucjJKn3YY+xTcteQ8NaJC83bja9r3CHk0AlEFPFtlU7C7TSUTfcfhHQk1o2fDXhPiTGCKsCTu+cza7f2iISXMDO6L/RPm+JwcgJSKe1R68iY5Wnh5ZX/I39gqNgor39XIuu7vEFssvh6qPFlSG5rll8jZQy5+1e2EmrKlm5dGOP+U6S9YsOt5tIA== 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=1pDo/Lee5v6n+jYyDZo6M8AOWbYs9BN6KtnkrdtSW9M=; b=mxo0UckJtOSi0xIK9D4MtVQio9tKs4B2JhxbfFEFhZeA8YerMDoMDwcryOMgZaAwCtyRDabFkO/cioJo6HQl8ywrBrrnw2TG9iRGaT5xmDfyGk5CcqA5Rg1FcWTRh9je6CrWe+gXjipPqL4UjdLL1ER5Qtxo1dZbZ+nGJPVuLBcmUFikx1/m8WsbycQMeU3sCDJR29cPpF4gm/KmJBKLfwWMQgw/hbBHKnxOEQoTtRhgF97lse2ssqC5mtSpcYS8B6wevNmxpxaU4LHnlrSEGs/dsomd5JJ4Du+kcR+g1UrsvpD56SHccWRAO49HmzQiZ+n9mO3zuvqEw7if7L+yHQ== 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=1pDo/Lee5v6n+jYyDZo6M8AOWbYs9BN6KtnkrdtSW9M=; b=IWC9UgzDUp7EelLIq0IccD5iI3RpWhb5twWjFp7SZS7KW4ZCHAAjuurUq6+QjHlfqi8b653ynZt13rKkwhxiXQ8yN8DrhKgJXr/PCc7CczXnBNUhREfNfkHucIHEOCjCgh3N1kgNch31L/crm6KqrFf14ym7GzbCheq7vDfpUwY= 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:57:12 +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:57:12 +0000 Message-ID: <871qgdb0sa.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Cezary Rojewski , Jaroslav Kysela , Kai Vehmanen , Liam Girdwood , Mark Brown , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 22/39] ASoC: intel: 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:57:09 +0000 X-ClientProxiedBy: TYCPR01CA0128.jpnprd01.prod.outlook.com (2603:1096:400:26d::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: 7597c36b-ff35-4574-1eb2-08db9862cbeb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PxfaSMBQ09nX+tgSe++oSlPxYGAjjDs9JczZiYWw4ErYra4amR3UKZJWHn/3eTwqNG0+kkI7XZ6h9C38WQ2VZomQMWtoajr2kFPct/W+qadV1F0bd+iqIhapO28tN2d+frLann9AtT1NeV0utQ8vZaoVVmv5OrOCUEKKxdbnYEHy7SvhqrfsErHYZEbuepq1li82018xcPgYBXrRNgfMXYji8PXc0Xo3DgUqbuJT3fZ9WOUO0Iplqxvv9NlEvHAQBCg0x18mJtOBJHo8BdFfb0+Kg+a3eAEj9noxnxyPM+W+K6zdrlg7Xet4gbIc9U5ZHXbp2/Dn0jhCmYPOA1gZ6xQnVIisbZDhlkwcvr9Bg0v/1V2Z0G0ys1m4wV4Pj8IK8Vcgjy9W2zZnFWZf02XaKD/q4fxDpQK7AVJ/mgqSMaYgkJN2DSpHuXsFgL07hD4UHCXZVRNRM1oADrRtaWcGYcU1yJExeO0X1eh1lEOjjL98AXUXGRld0xpdQku4cptZXvfjHqXoBX/ofStvx2LHpP87GgOSKLvw49v0ziDoA+CTOYU1b5mLHO/CineUI2uiIgLTDaKC2UI/ffktjv2Jw4tli2xtBOjjhIZhsaAhbsfx9mduDkIJQEB8u0VKBVfnysPFZ6hddlFXMrkqOcemPw== 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)(921005)(38100700002)(38350700002)(2906002)(86362001)(2616005)(52116002)(6666004)(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: sHFY6qHJFdUWHSfjq/wYXDx4X4r0bQOdFA+o4Xux283GzL8WgiWwUik+7RXUQS54+uxjegaPzuAmFtF33RJpkIbJEw4RYQDGHl1abgWQ6wAQWyavBVQrQhI5ckMvlQj0eo4Iwp1XJQUqtWHiXq4abHx70yLsphnYPfsjDzO31X1T0qClmeI801WyOIbSIAtgqcsWtmWWMvpfN8Pjm0RWcn4sAUOVleOgWPlsbB+Ar6FwfrbPzqeSH3swnhMmr82/leuAJJbf+XotDa2y+nAfTp7ZNsonNvE8H7a7FCfAtVGqGJmV31a/Paba+D04CbHMMNIr4Lh/OdrY0KX7N4xzIkiTylABS9zRLIPUJs7/Nmil6a/6TUsv2J9Yvxpz+u1QNrjLAiDwR1YpL+g443JCP4fpr72OsUlMIbKxKhhcfxxLhebmS7LKGJqnq75a3zi8mAbBE/PvdI9MmL9LBth+s5g+7F+o5MHC2ng2gY8bewv30PDIsbZbYaIvVCjiUnjNXfGqW/UaritcY8D2AWyBXODpTjLueSGEkomuKeuLI9Um2/Edhm2VVUeblUaxcMQWhVZDng0e1fd4H+Rre8O39tXmT/MLqnxlUtesJsGSsaaG2ele2TZd4ChVdXj6ggVk8L7+rhYt8o0uBZ6v5ZOjWpjPPd2HQbNLlNrloU3/swktxBxVx5iUnpLI6pWsmDCI10xTclQ12/pN99q92Q0USiVnvYmGiuLk9QGnwBFlNbaqg0eRwOrqGhRqNc/IB779S8a1PHr1PmW55cevXwHNdyX3tKzYzk1slQ24Q4WJGEbuuVjPz41xEenlkqp65f22Su3sXsoUBvC9uxvzKQ7U14wVBmZFQv9XuqACImGZ3b1rRU+Bw14XJwd8oW7p28wyH65b4sPRGNZx6ROG1NYukESbF5EmCcecWBgG8E8P4iUKuro01vpgDe9qvTSYW4JPngNN+HoCEG4RsN1WYs8QNy6e+4ME0iHCavsprqInHSLfZsOmVK6XwBd3uuEZBORRVOIGasm0ncoY16FJOkfcnKMmgYRp7zFJLPkcMnFYg79HeQS8QepzaTlE5sB1GMN/b3RYnA4WVNqEKnlsl0Y3lRMxfS6LJb6XCzvOQzW6zrKXbX00U56w7JL4mHF7MdxA+EjxoAbag5kv83CtG5srCPKodjn7cI++eatpnJvRG0PV+tlwuTFuSJxGCgSUrP2COgI0pO6MorG3g2V9tb/BDJss4kTVerSGDPFDkslIdW9tobQlFlRHQWD077fyPtXXleq3Zj1WQf+SH8oM3ezoElKjeD7d42B2KIcBeGQTUTozTKnuV76PiQ7fkq7vilh/GWE5yb90RPcxCeJ6ioeuB/NrD2fIk3yFwUgCMQ9fQN8dZDZ9yb3hYAIJPx6PXs6xuaGWFNQywuLmC38Lkhs8FfQOHDTCySHu6VwxocOSAv1HpX9l1q3uvhG2DDMqqP0Z2FGUtArPAKUUvCATwtsOIYkytKSFjXEAyNN4X+c4i47lOVJFO6Czn1t65M2NO6LHRT0nQUGjdchqfIadlFn66b+wqVQ4Ul1Eyy7ffWHgcuYFfgvXA5N1VIr09U8tHFDjAyILgOFxdNSxjxGEHak9DdZfBKsp2P5Ef4PdR4vTBQk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7597c36b-ff35-4574-1eb2-08db9862cbeb 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:57:12.5041 (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: 1O9Ma4SOHaDvFl4JlqsV4hVySn62v9otFwyNUbTBZBQtXBwx/I2nfieiLVaChfsxQiB8GxJfzDOclgdb+ZRZC03BelHZXrcaxSvEnkMoteiPpLQvlIdB1Xj6zBR4TLh4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: I3HUNPECLCJRIGBBKSL7NSFGWIKVHCAM X-Message-ID-Hash: I3HUNPECLCJRIGBBKSL7NSFGWIKVHCAM 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 --- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/intel/avs/probes.c | 10 +++++++--- sound/soc/intel/catpt/pcm.c | 8 ++++++-- sound/soc/intel/keembay/kmb_platform.c | 4 +--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index ba4597bdf32e..6f986c7bbc8b 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -467,6 +467,7 @@ static const struct snd_soc_dai_ops sst_media_dai_ops = { }; static const struct snd_soc_dai_ops sst_compr_dai_ops = { + .compress_new = snd_soc_new_compress, .mute_stream = sst_media_digital_mute, }; @@ -510,7 +511,6 @@ static struct snd_soc_dai_driver sst_platform_dai[] = { }, { .name = "compress-cpu-dai", - .compress_new = snd_soc_new_compress, .ops = &sst_compr_dai_ops, .playback = { .stream_name = "Compress Playback", diff --git a/sound/soc/intel/avs/probes.c b/sound/soc/intel/avs/probes.c index 275928281c6c..4cab8c6c4576 100644 --- a/sound/soc/intel/avs/probes.c +++ b/sound/soc/intel/avs/probes.c @@ -249,7 +249,7 @@ static int avs_probe_compr_copy(struct snd_soc_component *comp, struct snd_compr return count; } -static const struct snd_soc_cdai_ops avs_probe_dai_ops = { +static const struct snd_soc_cdai_ops avs_probe_cdai_ops = { .startup = avs_probe_compr_open, .shutdown = avs_probe_compr_free, .set_params = avs_probe_compr_set_params, @@ -257,6 +257,10 @@ static const struct snd_soc_cdai_ops avs_probe_dai_ops = { .pointer = avs_probe_compr_pointer, }; +static const struct snd_soc_dai_ops avs_probe_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static const struct snd_compress_ops avs_probe_compress_ops = { .copy = avs_probe_compr_copy, }; @@ -264,8 +268,8 @@ static const struct snd_compress_ops avs_probe_compress_ops = { static struct snd_soc_dai_driver probe_cpu_dais[] = { { .name = "Probe Extraction CPU DAI", - .compress_new = snd_soc_new_compress, - .cops = &avs_probe_dai_ops, + .cops = &avs_probe_cdai_ops, + .ops = &avs_probe_dai_ops, .capture = { .stream_name = "Probe Extraction", .channels_min = 1, diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c index 30ca5416c9a3..f1a5cb825ff1 100644 --- a/sound/soc/intel/catpt/pcm.c +++ b/sound/soc/intel/catpt/pcm.c @@ -684,6 +684,10 @@ static int catpt_dai_pcm_new(struct snd_soc_pcm_runtime *rtm, return 0; } +static const struct snd_soc_dai_ops catpt_dai_ops = { + .pcm_new = catpt_dai_pcm_new, +}; + static struct snd_soc_dai_driver dai_drivers[] = { /* FE DAIs */ { @@ -764,7 +768,6 @@ static struct snd_soc_dai_driver dai_drivers[] = { { .name = "ssp0-port", .id = CATPT_SSP_IFACE_0, - .pcm_new = catpt_dai_pcm_new, .playback = { .channels_min = 1, .channels_max = 8, @@ -773,11 +776,11 @@ static struct snd_soc_dai_driver dai_drivers[] = { .channels_min = 1, .channels_max = 8, }, + .ops = &catpt_dai_ops, }, { .name = "ssp1-port", .id = CATPT_SSP_IFACE_1, - .pcm_new = catpt_dai_pcm_new, .playback = { .channels_min = 1, .channels_max = 8, @@ -786,6 +789,7 @@ static struct snd_soc_dai_driver dai_drivers[] = { .channels_min = 1, .channels_max = 8, }, + .ops = &catpt_dai_ops, }, }; diff --git a/sound/soc/intel/keembay/kmb_platform.c b/sound/soc/intel/keembay/kmb_platform.c index b4893365d01d..6b06b7b5ede8 100644 --- a/sound/soc/intel/keembay/kmb_platform.c +++ b/sound/soc/intel/keembay/kmb_platform.c @@ -733,6 +733,7 @@ static int kmb_dai_hw_free(struct snd_pcm_substream *substream, } static const struct snd_soc_dai_ops kmb_dai_ops = { + .probe = kmb_probe, .startup = kmb_dai_startup, .trigger = kmb_dai_trigger, .hw_params = kmb_dai_hw_params, @@ -755,7 +756,6 @@ static struct snd_soc_dai_driver intel_kmb_hdmi_dai[] = { SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE), }, .ops = &kmb_dai_ops, - .probe = kmb_probe, }, }; @@ -787,7 +787,6 @@ static struct snd_soc_dai_driver intel_kmb_i2s_dai[] = { SNDRV_PCM_FMTBIT_S16_LE), }, .ops = &kmb_dai_ops, - .probe = kmb_probe, }, }; @@ -807,7 +806,6 @@ static struct snd_soc_dai_driver intel_kmb_tdm_dai[] = { SNDRV_PCM_FMTBIT_S16_LE), }, .ops = &kmb_dai_ops, - .probe = kmb_probe, }, }; From patchwork Tue Aug 8 22:57:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711595 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 F2F55C001E0 for ; Tue, 8 Aug 2023 23:02: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 0017CE96; Wed, 9 Aug 2023 01:01:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0017CE96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535749; bh=JDIMT8mpdIsj5OTO6awkWMN47ZjwBkh2olQvCeiN+UQ=; 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=BoAgMW0bCrf9IpPqg1qS+n4zNEOqkLHOzcHMWkWFFJBK5frDBgvO8yxpdIKxa0LZl ah7B5nahqzqIZs4fc1yvMYhzeLjgEoY2SBnf4xoTnLV+kwAoj7m3/EtwxPPBRuNmo6 /oKmOtGK+Xyao8qHfZLIdaAvn6xnp0R0Lx/06KRM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0898FF805B2; Wed, 9 Aug 2023 00:57:33 +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 6FBC4F8065C; Wed, 9 Aug 2023 00:57:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F1858F805C9; Wed, 9 Aug 2023 00:57:29 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20708.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::708]) (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 5C3FEF8055B for ; Wed, 9 Aug 2023 00:57:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5C3FEF8055B 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=Kwyd4LjE ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ih1Tz+2DkDBOy+OIt5Yak8OWuHR0XoISP5qP3r9UmtyPxzsokjQ59BSnop53cDb1CyDF3frsMjprHdJu87xfIILcSvS/aEbHwc2j7BPnM1djLKe8zPIIq5VqSxj+yMgiitczebXCgXoAljQwmYoyy6DAz3mddBunZAOwuBHpKp7vrXfM0H0kLhc6VVpxGb3d1ncrClM1wM41hFwo2nAIRbFS096Dj4sUsCqcaOJoVVdDRHnvV37+IohWWTZpB5U1Iy1z3FW4nechVg1BdNN5XPUQQK+Y5byeeBPBIQNDTLxIToBD5tuaDG3mPGd0ILbNw4vKY3/VVXBiCSDe2CGk3g== 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=Nfh/GNuCIbo+K+TB6AKmwAfvtjtzgFjclGajRGMTVxw=; b=Ep4M+NyQi1MStYPct9GXaipARmdIyxDVufjwqP+OmPAkkDWZgeHl9v56fUbLXux0S1DyWuLfYmjSyWRsWUUqJ27Le/WCE879nHC+ZPG6i0GIRluXxDzbspG0KkiFpC4EdL9jFhUeLCmWNKM8qjlzmxHMHvczYJbV2DB47+H1Ruy7kY4I15bvUwirfD020a3JV3Tm0v4H0A1dzERDvB6zxFVESUYczkT5ISIzY4NV2wlLXSTwNADznD3H78cOYhOVJq2TppmTyt/9q4BbSTgCcgA9jaBnB33pDmqxhhDw2PhspFoonP93lsvUDzJS9Uu7n0TeeAg4R/aQ+3TT2aimOQ== 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=Nfh/GNuCIbo+K+TB6AKmwAfvtjtzgFjclGajRGMTVxw=; b=Kwyd4LjEfS6+8nMaCQ0E9PXinmiboWwWYWfCnBGBqsGOriorCF17AH2C3V/JD1PF4+UO9k2jc1PFb2JFBXXqbWDcEpYuUcabJ81yTAP8DHx+h9oFl92URJ7bhSjo0p3GW5Q7HxzA+wEdacjrd9i9LChZ2WziP/+HdJiN9uwlwew= 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:57:19 +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:57:18 +0000 Message-ID: <87zg319m7m.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Jaroslav Kysela , Jerome Brunet , Kevin Hilman , Liam Girdwood , Mark Brown , Neil Armstrong , Takashi Iwai Cc: Martin Blumenstingl , alsa-devel@alsa-project.org Subject: [PATCH v2 23/39] ASoC: meson: 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:57:18 +0000 X-ClientProxiedBy: TYCP301CA0051.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: 7abd862e-1201-44a3-05fb-08db9862d122 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9YZnKfZr0dFXlBS8PEMvjm6eOFHXT6mFjMQx/qetGKY/u98fgG9jhnVp6Ym8D6Y8em+Ax/sVIvaffhXHlh4YTUObBL0uSYrETq9aLgXtBYlzr8Zsu59JJknMrv2Ap5YOdA8CKP8Qvm0cJU1FZ1HJcN3ayG98QaVRPSl6PkUz5750hvY6mMZB/9HQwGhXGqvTcd3/wHTsYYSLiNMld/oBWxPRKBE7fthp9TDU9HUlwJvtelOKfXXyqYkYZWsCnahbh1nWnCrotESGJrEym0pmXtjjBeyYyKlHZwM3tRrd7scEvvx7f6mBR/PG0Dvjt5rFYWf3H1ifRHLA9VLqKYKyV8v0yAiiGdsY/u9aAP5e8Eu8hJZEHAjlZQAMf7hhz1/NB7kHhUYx+CslhTTbws9ClzVVAXgu43uzSxPAzjxa5c+iQTI62A0yNTyGgejqYEJzTxFtNEj5H+TDxdRjfgt+0xq0Qb7p67xywtFwMy8YNtU86AL0YDZL62SmtV4SNIvwp1+YZN3z0eC+dhZG0M4UYXNZMCDbAOx2BcDvKrwVJsk+isUza2bmhJAiA6C7FNyQWahsfgrRsFXiIXhP6wlEFNyTGcMuqAYv7vWqpiI9Q5Xde6T6K1wCMGP4Rgxtp7mt 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)(30864003)(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: DnS440/BikAm0cX8jbZR4wLMPhjGL0puDTBEH9YXkHBwX3IQESn8x3mJpWnL+swVG/UMiQYc0E2AL4Sbtl3MKNuMc1WZlfbVwfeDQZ7IUUSU7asiNpANnMvdb5MwzfiT7WRZ7yG1s/YE4aLSeF6HP8Lza3qgiwJTtKo0wV5GaGP4FIrcykUEkn98fUleLc3JND08yKx1xEo/aPNkYt2lSf8vXFg/0Mo6HE9B1nKfi19cWHvKdo28nF4+xT5zomxMCCD6MyLSEs9pNEQ3A/hGMI75NWuica75Acm0mAFa0trSOqyKqIKLSpJsK+znaUvz5/8Qfgp7zTHM4CzQBSQPIEjxvV2zaJGN6A+w9lntOhgO/63Q90hxv6OAZvX5CpHaqFOR4MkhFs/6uADnI5+O93/fH8AhYjXphEVUY81PVbopRL+Gk/5XVUMBsVEkok3YzQwYEvwLKhpTveOnothU/MgxNWgGJm0BjwrnnY91i9WRIdmykxkBHYkc5PHhXVJobxLinzYTU+Z7uLRNS8hUBObya85frhtYoSStBpnbSDuQ8fEBP08KQX0bfOKCRX7j3eeM/qZFQ5AZeq8ft51SVzhdN9N+U3JphcVi6XzsIjJ2taWvaldUXR5NOyOBea9UDfhG2g+SjQfH10+PtVAkZ0jqBPuzG+05wyRKrixCi99ZpcLZS+qkC6XaMqgrmQeKbGdVKoWCHrknQZmZXVF1/RtV2fzZGiz5cHHOafcWNw8vDfEpx8z5utn929VbVJ6XosdXO5iT9EPVi1QicMGm/0ScSnjJXCSeUo2MrHaeVBmfbIY/Ilb3dxblcTRPH6Ymvosi3G0qVdJBuq2CgiisgQZ1VEqp9NzJwu+hcV3xzb3CqsyvWGnmx9GaBrrq732bCE0VFbTOLrkewvA5W/sXhrG00NoiQfhA2+FW7lOZfmoeyx9h1GV5RX7vmvjIQFu4+9/NNR5goDqIr+Qi8PHSj8TUjOlcwSuh3+iIN3QQeuyuOGxl+H1duwXSH+f0qGoYa0b7hyScMLmZl9DDhsRmXoTwS/yfbbi8nQHNV7Vp5VB066CGm7JhcVTyKuKYphR4hwc3C9ikeNwQ8VPletvdqY7x0MMQnvAfbtiV0rB54fdEPflUHdmuxEgDkSkjMaWds62LTFzP+CFoin+UdotCVNyoS84Z8AVgjLjp8n2N+gdn0W3vb2CAzYZ2S1eCsrwwPrDex9CCMYRpib+c39DSTepnurLqsMrVKeWPrga9nu+t4xbn8AuRupov6ltRtf+flqU25pNj+uryuy8tzHVGYY/cJH7rL1TckonghkwN8tAUSz3MhBGilDu1yFJleXlfCL3DCNa3NAtUJ+ZMCroqRXO/DGL88M07mhNFewuE+gPeQ/fpHbsKKGADKAF1kyfjp0TG4h6LJlsZ3C2haQH0qRpNzVJd3Cn1mkSyBszD5kjixFLyr/HiG6TyluWBuMN+J1saSJtuaNYlxKlXhfsI/We4a2I8TfD7MAfJnRBdvgiRr6BDOJOvq63Cpck9ApDNZhQ+MGycmMnF0Pl29SERDUfP0UZ3QqYJ6CM8d4vFjx74gadkUm7Xp30LTFQ3ACu7WVm6s6rcjCtnRWuiwRnkd5756SDuqDbjXqFvsgGtcjA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7abd862e-1201-44a3-05fb-08db9862d122 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:57:18.9126 (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: FBoaxxGQL/qHecF07pds68VIWd1HLR2gWR1MritBsWT1udvnZzy3hJzPq15tuqxyku2Tso/ZhnUdYOqEWLSTgcMcu8iS1T68FldRfFoJ0pUW/y7EhAnr/qAtasK8vIhE X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: 3FI2PSVVTJREQXS65FBXMTYNLFSPLAE4 X-Message-ID-Hash: 3FI2PSVVTJREQXS65FBXMTYNLFSPLAE4 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 --- sound/soc/meson/aiu-acodec-ctrl.c | 4 ++-- sound/soc/meson/aiu-codec-ctrl.c | 4 ++-- sound/soc/meson/aiu-fifo-i2s.c | 3 +++ sound/soc/meson/aiu-fifo-spdif.c | 3 +++ sound/soc/meson/aiu.c | 6 ------ sound/soc/meson/axg-frddr.c | 4 ++-- sound/soc/meson/axg-pdm.c | 18 +++++++++--------- sound/soc/meson/axg-spdifin.c | 4 ++-- sound/soc/meson/axg-tdm-interface.c | 6 ++---- sound/soc/meson/axg-toddr.c | 4 ++-- sound/soc/meson/g12a-toacodec.c | 4 ++-- sound/soc/meson/g12a-tohdmitx.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/sound/soc/meson/aiu-acodec-ctrl.c b/sound/soc/meson/aiu-acodec-ctrl.c index d0f0ada5f4bc..7b04b97f7b41 100644 --- a/sound/soc/meson/aiu-acodec-ctrl.c +++ b/sound/soc/meson/aiu-acodec-ctrl.c @@ -103,6 +103,8 @@ static int aiu_acodec_ctrl_input_hw_params(struct snd_pcm_substream *substream, } static const struct snd_soc_dai_ops aiu_acodec_ctrl_input_ops = { + .probe = meson_codec_glue_input_dai_probe, + .remove = meson_codec_glue_input_dai_remove, .hw_params = aiu_acodec_ctrl_input_hw_params, .set_fmt = meson_codec_glue_input_set_fmt, }; @@ -130,8 +132,6 @@ static const struct snd_soc_dai_ops aiu_acodec_ctrl_output_ops = { .name = "ACODEC CTRL " xname, \ .playback = AIU_ACODEC_STREAM(xname, "Playback", 8), \ .ops = &aiu_acodec_ctrl_input_ops, \ - .probe = meson_codec_glue_input_dai_probe, \ - .remove = meson_codec_glue_input_dai_remove, \ } #define AIU_ACODEC_OUTPUT(xname) { \ diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c index 84c10956c241..ee0ef6301010 100644 --- a/sound/soc/meson/aiu-codec-ctrl.c +++ b/sound/soc/meson/aiu-codec-ctrl.c @@ -75,6 +75,8 @@ static const struct snd_soc_dapm_widget aiu_hdmi_ctrl_widgets[] = { }; static const struct snd_soc_dai_ops aiu_codec_ctrl_input_ops = { + .probe = meson_codec_glue_input_dai_probe, + .remove = meson_codec_glue_input_dai_remove, .hw_params = meson_codec_glue_input_hw_params, .set_fmt = meson_codec_glue_input_set_fmt, }; @@ -102,8 +104,6 @@ static const struct snd_soc_dai_ops aiu_codec_ctrl_output_ops = { .name = "CODEC CTRL " xname, \ .playback = AIU_CODEC_CTRL_STREAM(xname, "Playback"), \ .ops = &aiu_codec_ctrl_input_ops, \ - .probe = meson_codec_glue_input_dai_probe, \ - .remove = meson_codec_glue_input_dai_remove, \ } #define AIU_CODEC_CTRL_OUTPUT(xname) { \ diff --git a/sound/soc/meson/aiu-fifo-i2s.c b/sound/soc/meson/aiu-fifo-i2s.c index 59e00a74b5f8..7d833500c799 100644 --- a/sound/soc/meson/aiu-fifo-i2s.c +++ b/sound/soc/meson/aiu-fifo-i2s.c @@ -140,6 +140,9 @@ static int aiu_fifo_i2s_hw_params(struct snd_pcm_substream *substream, } const struct snd_soc_dai_ops aiu_fifo_i2s_dai_ops = { + .pcm_new = aiu_fifo_pcm_new, + .probe = aiu_fifo_i2s_dai_probe, + .remove = aiu_fifo_dai_remove, .trigger = aiu_fifo_i2s_trigger, .prepare = aiu_fifo_i2s_prepare, .hw_params = aiu_fifo_i2s_hw_params, diff --git a/sound/soc/meson/aiu-fifo-spdif.c b/sound/soc/meson/aiu-fifo-spdif.c index ddbd2fc40185..fa91f3c53fa4 100644 --- a/sound/soc/meson/aiu-fifo-spdif.c +++ b/sound/soc/meson/aiu-fifo-spdif.c @@ -155,6 +155,9 @@ static int fifo_spdif_hw_params(struct snd_pcm_substream *substream, } const struct snd_soc_dai_ops aiu_fifo_spdif_dai_ops = { + .pcm_new = aiu_fifo_pcm_new, + .probe = aiu_fifo_spdif_dai_probe, + .remove = aiu_fifo_dai_remove, .trigger = fifo_spdif_trigger, .prepare = fifo_spdif_prepare, .hw_params = fifo_spdif_hw_params, diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c index da351a60df0c..7109b81cc3d0 100644 --- a/sound/soc/meson/aiu.c +++ b/sound/soc/meson/aiu.c @@ -121,9 +121,6 @@ static struct snd_soc_dai_driver aiu_cpu_dai_drv[] = { .formats = AIU_FORMATS, }, .ops = &aiu_fifo_i2s_dai_ops, - .pcm_new = aiu_fifo_pcm_new, - .probe = aiu_fifo_i2s_dai_probe, - .remove = aiu_fifo_dai_remove, }, [CPU_SPDIF_FIFO] = { .name = "SPDIF FIFO", @@ -137,9 +134,6 @@ static struct snd_soc_dai_driver aiu_cpu_dai_drv[] = { .formats = AIU_FORMATS, }, .ops = &aiu_fifo_spdif_dai_ops, - .pcm_new = aiu_fifo_pcm_new, - .probe = aiu_fifo_spdif_dai_probe, - .remove = aiu_fifo_dai_remove, }, [CPU_I2S_ENCODER] = { .name = "I2S Encoder", diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c index 61f9d417fd60..8c166a5f338c 100644 --- a/sound/soc/meson/axg-frddr.c +++ b/sound/soc/meson/axg-frddr.c @@ -100,6 +100,7 @@ static const struct snd_soc_dai_ops axg_frddr_ops = { .hw_params = axg_frddr_dai_hw_params, .startup = axg_frddr_dai_startup, .shutdown = axg_frddr_dai_shutdown, + .pcm_new = axg_frddr_pcm_new, }; static struct snd_soc_dai_driver axg_frddr_dai_drv = { @@ -112,7 +113,6 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = { .formats = AXG_FIFO_FORMATS, }, .ops = &axg_frddr_ops, - .pcm_new = axg_frddr_pcm_new, }; static const char * const axg_frddr_sel_texts[] = { @@ -175,6 +175,7 @@ static const struct snd_soc_dai_ops g12a_frddr_ops = { .hw_params = axg_frddr_dai_hw_params, .startup = axg_frddr_dai_startup, .shutdown = axg_frddr_dai_shutdown, + .pcm_new = axg_frddr_pcm_new, }; static struct snd_soc_dai_driver g12a_frddr_dai_drv = { @@ -187,7 +188,6 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = { .formats = AXG_FIFO_FORMATS, }, .ops = &g12a_frddr_ops, - .pcm_new = axg_frddr_pcm_new, }; static SOC_ENUM_SINGLE_DECL(g12a_frddr_sel1_enum, FIFO_CTRL0, CTRL0_SEL_SHIFT, diff --git a/sound/soc/meson/axg-pdm.c b/sound/soc/meson/axg-pdm.c index ad43cb2a1e3f..d59050914d3c 100644 --- a/sound/soc/meson/axg-pdm.c +++ b/sound/soc/meson/axg-pdm.c @@ -294,13 +294,6 @@ static void axg_pdm_shutdown(struct snd_pcm_substream *substream, clk_disable_unprepare(priv->dclk); } -static const struct snd_soc_dai_ops axg_pdm_dai_ops = { - .trigger = axg_pdm_trigger, - .hw_params = axg_pdm_hw_params, - .startup = axg_pdm_startup, - .shutdown = axg_pdm_shutdown, -}; - static void axg_pdm_set_hcic_ctrl(struct axg_pdm *priv) { const struct axg_pdm_hcic *hcic = &priv->cfg->filters->hcic; @@ -440,6 +433,15 @@ static int axg_pdm_dai_remove(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops axg_pdm_dai_ops = { + .probe = axg_pdm_dai_probe, + .remove = axg_pdm_dai_remove, + .trigger = axg_pdm_trigger, + .hw_params = axg_pdm_hw_params, + .startup = axg_pdm_startup, + .shutdown = axg_pdm_shutdown, +}; + static struct snd_soc_dai_driver axg_pdm_dai_drv = { .name = "PDM", .capture = { @@ -453,8 +455,6 @@ static struct snd_soc_dai_driver axg_pdm_dai_drv = { SNDRV_PCM_FMTBIT_S32_LE), }, .ops = &axg_pdm_dai_ops, - .probe = axg_pdm_dai_probe, - .remove = axg_pdm_dai_remove, }; static const struct snd_soc_component_driver axg_pdm_component_drv = { diff --git a/sound/soc/meson/axg-spdifin.c b/sound/soc/meson/axg-spdifin.c index e2cc4c4be758..d86880169075 100644 --- a/sound/soc/meson/axg-spdifin.c +++ b/sound/soc/meson/axg-spdifin.c @@ -267,6 +267,8 @@ static int axg_spdifin_dai_remove(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops axg_spdifin_ops = { + .probe = axg_spdifin_dai_probe, + .remove = axg_spdifin_dai_remove, .prepare = axg_spdifin_prepare, .startup = axg_spdifin_startup, .shutdown = axg_spdifin_shutdown, @@ -429,8 +431,6 @@ axg_spdifin_get_dai_drv(struct device *dev, struct axg_spdifin *priv) drv->name = "SPDIF Input"; drv->ops = &axg_spdifin_ops; - drv->probe = axg_spdifin_dai_probe; - drv->remove = axg_spdifin_dai_remove; drv->capture.stream_name = "Capture"; drv->capture.channels_min = 1; drv->capture.channels_max = 2; diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c index 5e5e4c56d505..1c3d433cefd2 100644 --- a/sound/soc/meson/axg-tdm-interface.c +++ b/sound/soc/meson/axg-tdm-interface.c @@ -395,6 +395,8 @@ static int axg_tdm_iface_probe_dai(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops axg_tdm_iface_ops = { + .probe = axg_tdm_iface_probe_dai, + .remove = axg_tdm_iface_remove_dai, .set_sysclk = axg_tdm_iface_set_sysclk, .set_fmt = axg_tdm_iface_set_fmt, .startup = axg_tdm_iface_startup, @@ -423,8 +425,6 @@ static const struct snd_soc_dai_driver axg_tdm_iface_dai_drv[] = { }, .id = TDM_IFACE_PAD, .ops = &axg_tdm_iface_ops, - .probe = axg_tdm_iface_probe_dai, - .remove = axg_tdm_iface_remove_dai, }, [TDM_IFACE_LOOPBACK] = { .name = "TDM Loopback", @@ -437,8 +437,6 @@ static const struct snd_soc_dai_driver axg_tdm_iface_dai_drv[] = { }, .id = TDM_IFACE_LOOPBACK, .ops = &axg_tdm_iface_ops, - .probe = axg_tdm_iface_probe_dai, - .remove = axg_tdm_iface_remove_dai, }, }; diff --git a/sound/soc/meson/axg-toddr.c b/sound/soc/meson/axg-toddr.c index e9208e74e965..1a0be177b8fe 100644 --- a/sound/soc/meson/axg-toddr.c +++ b/sound/soc/meson/axg-toddr.c @@ -122,6 +122,7 @@ static const struct snd_soc_dai_ops axg_toddr_ops = { .hw_params = axg_toddr_dai_hw_params, .startup = axg_toddr_dai_startup, .shutdown = axg_toddr_dai_shutdown, + .pcm_new = axg_toddr_pcm_new, }; static struct snd_soc_dai_driver axg_toddr_dai_drv = { @@ -134,7 +135,6 @@ static struct snd_soc_dai_driver axg_toddr_dai_drv = { .formats = AXG_FIFO_FORMATS, }, .ops = &axg_toddr_ops, - .pcm_new = axg_toddr_pcm_new, }; static const char * const axg_toddr_sel_texts[] = { @@ -217,6 +217,7 @@ static const struct snd_soc_dai_ops g12a_toddr_ops = { .hw_params = axg_toddr_dai_hw_params, .startup = g12a_toddr_dai_startup, .shutdown = axg_toddr_dai_shutdown, + .pcm_new = axg_toddr_pcm_new, }; static struct snd_soc_dai_driver g12a_toddr_dai_drv = { @@ -229,7 +230,6 @@ static struct snd_soc_dai_driver g12a_toddr_dai_drv = { .formats = AXG_FIFO_FORMATS, }, .ops = &g12a_toddr_ops, - .pcm_new = axg_toddr_pcm_new, }; static const struct snd_soc_component_driver g12a_toddr_component_drv = { diff --git a/sound/soc/meson/g12a-toacodec.c b/sound/soc/meson/g12a-toacodec.c index ddc667956cf5..6c4503766fdc 100644 --- a/sound/soc/meson/g12a-toacodec.c +++ b/sound/soc/meson/g12a-toacodec.c @@ -162,6 +162,8 @@ static int g12a_toacodec_input_hw_params(struct snd_pcm_substream *substream, } static const struct snd_soc_dai_ops g12a_toacodec_input_ops = { + .probe = meson_codec_glue_input_dai_probe, + .remove = meson_codec_glue_input_dai_remove, .hw_params = g12a_toacodec_input_hw_params, .set_fmt = meson_codec_glue_input_set_fmt, }; @@ -185,8 +187,6 @@ static const struct snd_soc_dai_ops g12a_toacodec_output_ops = { .id = (xid), \ .playback = TOACODEC_STREAM(xname, "Playback", 8), \ .ops = &g12a_toacodec_input_ops, \ - .probe = meson_codec_glue_input_dai_probe, \ - .remove = meson_codec_glue_input_dai_remove, \ } #define TOACODEC_OUTPUT(xname, xid) { \ diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c index 579a04ad4d19..f7ef9aa1eed8 100644 --- a/sound/soc/meson/g12a-tohdmitx.c +++ b/sound/soc/meson/g12a-tohdmitx.c @@ -140,6 +140,8 @@ static const struct snd_soc_dapm_widget g12a_tohdmitx_widgets[] = { }; static const struct snd_soc_dai_ops g12a_tohdmitx_input_ops = { + .probe = meson_codec_glue_input_dai_probe, + .remove = meson_codec_glue_input_dai_remove, .hw_params = meson_codec_glue_input_hw_params, .set_fmt = meson_codec_glue_input_set_fmt, }; @@ -172,8 +174,6 @@ static const struct snd_soc_dai_ops g12a_tohdmitx_output_ops = { .id = (xid), \ .playback = TOHDMITX_STREAM(xname, "Playback", xfmt, xchmax), \ .ops = &g12a_tohdmitx_input_ops, \ - .probe = meson_codec_glue_input_dai_probe, \ - .remove = meson_codec_glue_input_dai_remove, \ } #define TOHDMITX_OUT(xname, xid, xfmt, xchmax) { \ From patchwork Tue Aug 8 22:57:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711971 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 73F31C001DB for ; Tue, 8 Aug 2023 23:02:51 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 71010E7F; Wed, 9 Aug 2023 01:01:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 71010E7F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535769; bh=IDkJ3BBlg2dVBe74tVaTcM1cVJA6Wb9n+XM2hfp2zTY=; 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=tORJ1hDr0K/fRBnhCv01LtATMB0Oyodh37QuIpRDNT/3S00gxVva7HYt9aj6Se9mx yMH55FOa13cX8wG9R0/UtX8yiFBSS1ERrYLFFgGl7HkM8HLuKNoWAYriimszhTUXAe MYvwyWtAJ6j82t89Oh8XIFKPhGJAXN3hkh4XH9Bg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 64669F8067C; Wed, 9 Aug 2023 00:57:36 +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 DAA7EF80677; Wed, 9 Aug 2023 00:57:35 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D52FFF805C9; Wed, 9 Aug 2023 00:57:31 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20710.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::710]) (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 58E65F805AB for ; Wed, 9 Aug 2023 00:57:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 58E65F805AB 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=nNBDp98o ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OJdtJHNGFq/pXTjG9ThiFD/C/PLHW4rVYlhIzj6sxPIXjvXZUM6QeJ2TRD/wS8Vj2xScoBzIp3pfcDYRSdTDcY/kEOKFFEixzaOv/nsMyNzVa/BH+kFjsfMUr3bsn/8k4IZWqXkRq+USmiB2MF8EtXDgol+TO9jZiZP70caAqx9AD46jEnfqf+o1vPqdSfalNEX9R4iNnJobDPxBVBCRnIrAx5dRvZbOBmqKH4jFbKBfx745I32YZSBHMbzSAgPCWZBsb0nvBdpD1flqd7fbupxWiXRCgekBbDrqaMf8jtB2LF8HEsCeGwPiQfkD/088ORjP+GaH496B8Fp3ryvKEw== 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=weJoLN/sYOivloAe/dO5yQ2N8Te9dxGvAib49+3Y2JQ=; b=jb60Z5xQCFR4nfZwnax1sI0+2cfs9KNH7uBm7F7x3LXL3jmGM61GY2gLBH1vyULDuLJIjJVTNNTF8MZVFZFaKq6TwhOH8o4AdDBztJnYnTO+htgVFiF6/yitBAxGj2i1aQtqXzpRMM42ON9z+fecO20MNlEY9mLUGbMS64DsP/DmDS4vQlz6aa1BncaD+H2ApF/c8jK0zD/psyk5oH/z5h/uxB0UnpGeQ2QNw2QVjTTsfUzRjLr2dHMatCGKhJHgnfFi2qzCw1fB9hQb/SAiTTKtm+nuPA+7ZJH+VKfX9fAPTSsFqH7Q4GCmFtJ4Tmiuppt+fT0qXytbf8FD1wn4vA== 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=weJoLN/sYOivloAe/dO5yQ2N8Te9dxGvAib49+3Y2JQ=; b=nNBDp98oILG6uv2Vq7lAlctQWnBfQaxivje4jv0KCBL/gHo597XqYK4v9DamUlmoGh3mB0TcXvOHwq9XTON3Nkw6JuVM74y5d4c/Dvl0KQ8RluyKSWMIXnQVHRvj9IijUwGQLw4d7JXEEnOCRW32XaiXOdnHqFqm0o1rahVMZzc= 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:57:24 +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:57:24 +0000 Message-ID: <87y1il9m7f.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Aidan MacDonald , Jaroslav Kysela , Liam Girdwood , Mark Brown , Paul Cercueil , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 24/39] ASoC: jz4740: 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:57:24 +0000 X-ClientProxiedBy: TYAPR01CA0098.jpnprd01.prod.outlook.com (2603:1096:404:2a::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a3a2742-2f54-4dd0-ebaa-08db9862d4be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 64+SRcx2wa/Wo5KJCn4W/2Nr8MBjszyXGhpPSZoGX31uNta9wFeCxM2mIa/KMA37Gm0aZ0U6FhbioZKjFvfGLvDk88UnVdFVF4N1eTGysCqY6Jg8MtWCPDJ8RYNYEDqd4xoOgzMVef0Im6pystwXvm+C2cvDTSbeshYK2l7Jwb1yNb3qADGThPVb2giIBr79cgvQFMVAro+ObqLuhWtAnZhWqFxevWjYbXN8vbaByl1rZSdLiPxln1KPKUD5vG6Zh/gftKSQ+qgyf0MLfFMH/OJRcBO//FWsQysO9YnAZZMkVitCyz5FJBvvBZQwRmkGeMg5b/gGC5JcVbozrRRNdyfvpvef+x2yyzUHku8BWZfU1r7mblJApbRXWKA/epc4mZsJ6PFio2V75QYLqDfCHNtRkyDSWQL5g1fFe887Mtcm4On41NKiN8dXIRMubzhSh5LACtsVuE3YzVi9GtBgTSkoxjeBkeLeyVs22QqpL4pmSawMm9HlqPp2oG4deBMsbWMMIJCKGnBzLpiFzNBNCQqbP0a+eGxrrHBuJt6Z8xB3RrtYeOhFSagoC8Yehdt/hhIAwtjenQFboUsMIHQbYPESARvmnUhfimuHwk6s0QHSkvbqtUZZAT191UmdgYVx 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)(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: 8gC9tFYmzDl1gOKKvAoM8dS6Cmpu+MrLRUkjkoZkY/Pwtdmmab45DY4zR4AnS1wbpm0FkbSBtvUjdG0Gtp1p8d1+892iQayXx4J4SaLpapFuWXz1W0+IvTNbx437BBoDT818Rgpl7o5+vQCy9rSFudhuXulK0h1XXLLf4J0uAdd+md0BpzqXL12ozImi0JqKh1Rp068FbSl+NWWBlN2hHon9GNh8W20TCiqcbHn3LWSKg6YFLLJ0FM+I2PGDyeSz8t0RY6HC4aToYS4tJCRJHY2DH4hA0oldaj9SoIh8NYYrl8NJpft6IEFPrTSabGI8PVrA9wvzeikZgXPDHzrJQi/4A18DUGPpxJSypA5g1FrHDOvRSkPdnmrDxOac38bK07oLpEtYJ8/wqL6gDPMQpmsiCgsKCLhBBy7ZQgOETY9p6sHHsZfw5f7T63XNCsB/ajA+gHa3zR5QB9IU1jVodFgYa6wINEi6FDeSU8TCOiE+TZ5nez3mX+QZ7B56XhoqoV5XYCBY4h2PW2wJOxDvr06ofD/5F4JE6BQim+88sRbGfefUqKsyczwAa/XqOYofWayVbNrMHa1eCqsI5EWmLJ+UHhoNpieyOcgsBkFHvJRwZu10Y+7T83QMQaXxB4hyeQ8TqbtnAQ2tlov3sF6cuFKEryPxzxhBwTEQH9Nwfj9DG+AfsU31uZZiB+Fw2Bu6SN59z/CclbR37mtudjs72tNkxrX82ctqumF4/On7cFGg5Bn/VUPpIACRENf/n8H6f0beI+ZYiT6CRtDL2F3T0qhRqme/J8domjhZLKQscISyP6FtvS0vdpw6+0UcEfyxnokZYT9P3gq0dIQJmp3mN/53d8TPxCHcEek0mnoh1P1rnGSmd5loUY/3ilrgJnDgIRSKxmL6YrOcYQ0b/SGbfF/PlVV4GQPh3IgVHt5rnmab3HDvzmRdX5IkRSYf8M1keYx6Sb3wKv5+Fcnbt191CQf7dp/QZfMG6VkE5kkEsQGKEf8z8ssFy3dKt35uPZi9wQrgDBJ60uMAdPkY9xjoTi6tDHE4Nu/HMCD00rV7/TnurrDFibE7h5x6BCfktw6PnN8dlCtAa/xr3VOZ0UiIJHJcr5jW7WkKERiEQRuhWpa0CjAgJ15ZEI9bT/41CWBvKT7zplq7vn+N9aFRCmIjuGqatQA0CLn0WZSGBfyv8mwQm2v8RP8xs9zhY3LGxFtsiIGcN+RCTs2L0WFUFIVcI4PkCEwycO1fvGtJVizs8EypdzygPlN5lD4pfSs8GAVGwDRARBRYQfP7d2Y9ybyTFq+sV0goHriLIj0OKtfBB5J+PL/fEgTZIOgsoZI6ai3BoqbMMdvJ03JQvUyN669XrsD2LUQKCjss+sZd4y1dNxgEzlyjbsUTNPebEVMYZqvXi5xKLz2IoZ/WeR8NHwXpiCeGAhtzbVPLmbHUSk4mOG22wcskeDcqKOGsRQ6PQxd+ATGykIz2ywBCkibnk4agX0HWQNJZFYSeknOwv75rmh5FFAhkfv8D3M0sd3NPn0uyT//VRLJwwmVStqszpT0lkhcFqxCiNCF1ycS1il7afJgsdLqbwLc0aw3SVo29YR091jkhhoNhcAV9P22y1KFnbBTpDk/irMgCby3TGwED1M0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a3a2742-2f54-4dd0-ebaa-08db9862d4be 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:57:24.7197 (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: HYMRuea75hirt9qV7gERvJjIQcou4k5ROemztCk4rm4fsAIdpKkgFuc9+vce3yg3JHVZZUZ+bi/qjc+2FZlVIe68rlvlGpJ+T4ZqCn+0zLcV8seY96QMennkEPSQAAkg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: N7YTGPHHZW3RH3QEUE5ZG2NEASNWOP5A X-Message-ID-Hash: N7YTGPHHZW3RH3QEUE5ZG2NEASNWOP5A 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 --- sound/soc/jz4740/jz4740-i2s.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 578af21769c9..517619531615 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -328,6 +328,7 @@ static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = { + .probe = jz4740_i2s_dai_probe, .startup = jz4740_i2s_startup, .shutdown = jz4740_i2s_shutdown, .trigger = jz4740_i2s_trigger, @@ -341,7 +342,6 @@ static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = { SNDRV_PCM_FMTBIT_S24_LE) static struct snd_soc_dai_driver jz4740_i2s_dai = { - .probe = jz4740_i2s_dai_probe, .playback = { .channels_min = 1, .channels_max = 2, @@ -384,7 +384,6 @@ static const struct i2s_soc_info x1000_i2s_soc_info = { }; static struct snd_soc_dai_driver jz4770_i2s_dai = { - .probe = jz4740_i2s_dai_probe, .playback = { .channels_min = 1, .channels_max = 2, From patchwork Tue Aug 8 22:57:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711594 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 43BFCC001E0 for ; Tue, 8 Aug 2023 23:03:06 +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 CBE15A4E; Wed, 9 Aug 2023 01:02:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CBE15A4E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535783; bh=jNsZunAATjABojKpRxLkHtTHyXX4G8JWby2srSXSL6E=; 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=T8o4RI9JiJjaHWDtnBoVxCAWnmLFwX66G+Qacjwuimw4UQGv2NBfB9BbSsytd5wER JlJJDDrTO39GvTKMf+IfE9lOievlCHsdlMbOIZWW369MMC7zHgGBCaQ4QDvkMUbV4b ib/3ItbT67umTcAuHcbpnVaiduFfY3/nXL44rqx0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id CEB0AF80558; Wed, 9 Aug 2023 00:57:39 +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 7D9C5F80558; Wed, 9 Aug 2023 00:57:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 051A4F80677; Wed, 9 Aug 2023 00:57:35 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20710.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::710]) (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 15742F805AB for ; Wed, 9 Aug 2023 00:57:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 15742F805AB 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=jc2129Pl ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jOkMq+UJGWXR/OEN6+x8LXoF3Z+SP8i+UiWupNL/r8hb1mtSes1p8Ln1ldFLrargLkkrIiaZIcVy3CQtPgkQ3LTCDiX4ZGCbYtzEwm3jYbrTD6Aito7r8XYgXObJDDsQ1s4UIiqnpZ3XDFOiNl9SssblqyFaTlPqsNEmWtoQxvW6bxxpIcUgMTDWOUgWn06srnUQp5DZraP1hIPbCAqfap5BRJzmCqE2gmdfL7YU/qcTKFZ3mGGDYy58C0U0b6gSzdfqUM2bq4+e6t5Tmo0AW53HfwyZd20LzKKMmqewJiHEe8CTbJ10nOILlT5Eqwbz6AvZY+qeKYsKCJRmRMfLVQ== 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=Tos+f4z0cyXQdOzBTPA3q8VHnbg0F3VYLIbBlJNirvU=; b=Ygzb9crbtsRt4haog5tBk/4Zna6IDMW+S/5yWE1vrEKiKEvfCuzTmGks3NupPxzrAyndEWERDfpqDvy5c5GenHOGH59HnA0A9fzX7wkELa6AQ3VAUaSejp5iVfWlfSLAz0SiHvMISykLk4rRdrmp1UWI3qHjwQQkloTJVn0Sgnpd0R3Uo7sN0AUHgOGAdT+XDVs52bGDGNell+6A+lrIkhUGOBIEbWbWN1Scv2lRLpsBG67MxrJw5I3qety/YVStBDlXPHm05G7UWpLcDpJPeRLJ0z6Ws+QJ4ElAsY4Uu2WTIZ9C1CwBLKD1qyPn/DNbYYQoy3oBdE8hSHbhU2+hzg== 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=Tos+f4z0cyXQdOzBTPA3q8VHnbg0F3VYLIbBlJNirvU=; b=jc2129Pl5rXFR4AbDlA4gdCZyt1IVOiqlSMCvcAVpoqLMlUIBFwPqxbLUN0pZkhvoUrZoHuveu7VJxoWI2V8e8t315hBY1pRYi7GIfetOIBbk69M0tVS1Zd6Js8w/q1a6hIYBWVDYLrQYc02G+wVIsPgyQJ01QFYX3XjIcwj74o= 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:57:30 +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:57:30 +0000 Message-ID: <87wmy59m7a.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Alexander Sverdlin , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 25/39] ASoC: cirrus: 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:57:29 +0000 X-ClientProxiedBy: TYCPR01CA0095.jpnprd01.prod.outlook.com (2603:1096:405:3::35) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b8eb1ef-9ca8-4427-7a83-08db9862d7dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7MqmP64rt6hTd9Kjv3e8w/htkJ6XIIIbjYROp0KtZ6BHbMi+CMQaZSOq/CyPsHbAQSIFJSJhWOAG4UVi1PFgFSHh2eU4lDC9mUQ4kQRX13Zvk/SQpxVjpYEZN39LNfhb9JpqV3Gr+ELChWXKm0aNh7a5k0Tmy3JJkvj54mPpO9D5sAEKGmgl2aAmGKWRtCzqVPdmZQAIb26khRiKfgJXzdCykYqcvxU9h+oiw8S7pwRB8aPvDQ0F+K2qjGXjZY6HLLmSoCY9BJFysUIAlHNj4KXBSbx8hamRCxA8PI9Pl+ZaklOXHazbp9bUiUtaisjIFyYSKeK3GnE6dDiOi3kr7/9kFiXG642qjY6IKmIhbIS5NLPrh1zjQTcpTMgiQmFC05WIizsRAMIBv3kTB8gfUh0nJ2U97S+FFsqbDyOLGrTsX1ycF6L9SNGMDzQk+6ld3R+SPBTz9u7tqokrhr3fCEBgjyntjFJbmCV5bSJBrJHDiyu7C6+yvEAhtFOORTQgoUy0wcYnP5PMMLqWy0Pngk5NCCR0Ww7eqGOoS8nVsGBvAUJQIiEoGpJQAEuQC5mjNuy8xAmt3b7kmlohdbgtB3KAnaW3iJgfA5wCMjCt3jeSHujuULm41GouT0XUJgLh 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)(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: ub6YgotzA+dnQ7K8iP6TI/JvCQpR974nLTTHuM1OGgJIaa9uDaKncsB7n8+0RWYVdKYZEHuKC+KJREE1kM5TcncfrX8ySg3EL9GqPpZY3uicKEKvy3Ev2FaZ7/21xBJrKNXTHt3VyqvBXvr08ifHq5h7UeAj+QNCiwTCBAxN9ZwJwR3/aKAAbQqMmplU8ojmOqp+0lA7FSJPpY16c0hc27NR1uyAUtW57MTAscb2lq9hAzxFU69WTSFChw5b2XOCTsDG82DKOEKWue7Zf0trARGaE56qpz9kHEDDlXxJRTLsVdfSa9FCpc0821oDHsI0GDO8ylp4q68JQmqQwVX2qqo8q4hfsvx548Qbzzptv6bFIYngfXp9ZhCSVyNlhMmM1DJ3YbL1awG/R+Vgbh/ecgePqdMS81TtMMsZPwD5NNKTrS7pdMlcKuBAJRjrchdEh3rN+P5HwP0vD0AzDvqofT69FHACAEXVUvS0bpkqVQz3D9f5uWrXtij9xooPNNuQfTZVpYgXDDLRB6gOGBwzjg4hrtr/It+Lh6bYvw30nJA+jITGikpDU4olh9+cHFZJ7guahIhFaY+IHksnvMhF1kInyfFuVlr7W5SCNpMlHSND8gRTJE0Dr4R1dSWvFc2/gawUwM/h504ogJqhmd82jRjX/OUU0aUznuHtsiPHN+hHDyC2SXQKfZ0kbZah/Jjrw1vX3/5mLGx1LQFsMS2PugXGGvroY3EYv0wKVSXwPAmzg/n5bFZM3zgKo39bZs/4Tv7OyHuzlf0uUbJs6Qym5usYNiTUI3nZNleW1M10DsjimlP1l+srlLiqLssrf8zh1PTr36pwMPXOgkIMbpSIdl5WIb90Or9iAMMdGQjZj6UIYSM0LrSCRgSAWqYB1GCGe15PH6PiCqTrGaqasX43yGncrJdPoLtUM/N6K/cxuSB10jwchvbBYDd6wWF68sXKnRYRIEancZDTks/HHM839KC+m817hH+fLKO826R5iJtjvTxbS8Z765g3Qvr/yslK/jZN7gdiFDNn1RVSb/7XPkZsNYmMOLf/FRnFh3T2Cx3VvYdIZ6cFyVYKfHzW0d4k3ReX5PWvuG5OvEClXHhyRX5WPtMvx5H+MkojfsIfniGgbF6Ie9TBK7RerQ8oYfN2KeZJt5n0SdbuOIEq38S/ke3IwGqTBTv27Dj75knobiWnt3FKkcb58HhJObfx1K1yz4JJ9gqHsir1NasES93cRmAuL5uiOoKhnC7tUYqcAVJUrTqioDDZjXCXmkaoGzayGBX/oaK7m47bFCSTsFxgN0QLzei1T+6PGVUEsxMxrSxmap9drErsafjgcGbiPjY1bGbiLw4kaprjy4gQWlFE//uU6LWGa42CUIC1KHH1DGHBf5FX/Z6dsmc4SvxEB8n+MStGPmWN6LMArmd1VqNtl4UO12/Z9m3YNekDBtK9vatjV7r23chpnixc5+07BU4cMmysebI+cJ04fLUYt9hH34yGcpUDZ9N5TjcOBjYcI0UcbQbUhgpqFkLkHRXeK7HfRy9SAvaBfGyOSTBE7nbJoeHWN/00QnxXj1FgmjMMXNc4S9JZPdQ4YWwdjZoyL8r76OgiFsUmY8+fZv6k38ILxSb8BMN+ilpTBggTp8ON4/U= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b8eb1ef-9ca8-4427-7a83-08db9862d7dd 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:57:29.9935 (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: V4TMp/thBRGlPb4rzN71cNbUh+9yKOwRY6hSa6EtCt6gzjq/DrcLfroBUFzgtBufBs7I4mmoKwDsrYC8j0K7eHBRVExTLGzO086mEQ7Cms0RoeqOzhmoS6N7O7ajPGaB X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: IIRKKDV5UVPT6FDZCTVHGV4J56NLMSJV X-Message-ID-Hash: IIRKKDV5UVPT6FDZCTVHGV4J56NLMSJV 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: Alexander Sverdlin --- sound/soc/cirrus/ep93xx-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index afc6b5b570ea..522de4b80293 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -407,6 +407,7 @@ static int ep93xx_i2s_resume(struct snd_soc_component *component) #endif static const struct snd_soc_dai_ops ep93xx_i2s_dai_ops = { + .probe = ep93xx_i2s_dai_probe, .startup = ep93xx_i2s_startup, .shutdown = ep93xx_i2s_shutdown, .hw_params = ep93xx_i2s_hw_params, @@ -418,7 +419,6 @@ static const struct snd_soc_dai_ops ep93xx_i2s_dai_ops = { static struct snd_soc_dai_driver ep93xx_i2s_dai = { .symmetric_rate = 1, - .probe = ep93xx_i2s_dai_probe, .playback = { .channels_min = 2, .channels_max = 2, From patchwork Tue Aug 8 22:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711970 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 A1E5DC001E0 for ; Tue, 8 Aug 2023 23:03:23 +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 BE1BFE9D; Wed, 9 Aug 2023 01:02:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BE1BFE9D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535801; bh=e5KPUnTBnZxfLODXJighw+DTr3CFKEQh8KpJoB7oK28=; 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=scTYFbMOf8jWVxnkuWA5IInBzNeXT3sbZ8+7r2as5z1CdTd2/aETuI4CZ3+T10g2L F/IJh7X+7YUh1DQOcnDRoe/XvqCcAagcXinzG5y7b8G9RMnVLOaWrTeNj2N83Lde/C yjHvzaaDyPtIuUGWIzjbptExmg2gYscKpvQn0ppw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5CC90F805C5; Wed, 9 Aug 2023 00:57:48 +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 D532DF805AA; Wed, 9 Aug 2023 00:57:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D4E35F805BE; Wed, 9 Aug 2023 00:57:43 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20705.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::705]) (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 18801F80116 for ; Wed, 9 Aug 2023 00:57:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 18801F80116 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=S6HwzOrE ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XjusSmKsiobdzZ21HL+plMGXzGgPEOO1rtt8+br/UPO3NLOFtZhi//MXxYHHH0vU+W/7ToophnEpxJNtVQ9f5mogepnSaV3geBxewBC4FJOy77K35ttR7tCJYkjUhIngMtmDrNEW8zhyI0E2PxsM2mDpcBGRE7CIkMXdDwy4fg/nsoWlEfz7ZWTRsKuPCwe7C4sP+B+JBZ+2zYAPIWsWzp4m6XdBl4KLVKkJAU9BnKq7FHlmHYqMLUMsSBzgxgaDCtfIw/fSR20WyYtq4nh38Q9FMU5gRnN3aZr+pAnpCW8vYJTmorU+kHF1rKf4Rh3wWBhKpLA+lRzXlDkjQdsp6g== 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=VvzInMlr1rkSucTh0geroIxjAMA2WCay60ZviUVmtLE=; b=m5gDYIufbEsC/KKPgWie+Tri9OkIx1HVBOSEx3q6bD49FTkOiEengXfVut+H9/VELfqvOgp/BeDMTrdTD7aHGvg8IVETAffAevopEzWEnqkhI34snt5pEeP7tNRkcjAI91f8dvM6bzmwOsBRwsQ+ZZb7wc+zwZXlLgzprk06dNdv4PNDAXeVsuMEuysydEMpF0SpOZbirtHa7jI6LkF8JVCeh33U0G5N9Z5JiRy+KVLVczryCtVGpuBVYoO7JbwLKZ4uMxFKKo5NUj7CRMrfHCq2SjNUCsHn3LU3YVlHldUGtlb3Hn9fTTu3dDbgTRzwfYt3nTi3KOriZ2DChu6lhA== 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=VvzInMlr1rkSucTh0geroIxjAMA2WCay60ZviUVmtLE=; b=S6HwzOrESlQx+FiW2Yi0gxi3KU/61bmzWXYCrHajx+4PP+x6+io26oJtD7JzJMZqVXeToTOGvvl287XP1aTihXP7E042kcA53kKbhepyhjuPVt6HWThlrpP8pKsuBpv9pNvhwnnZBC45Qck+j42RJW/2ZSaCRjJyUqkvDafBPCc= 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:57:35 +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:57:35 +0000 Message-ID: <87v8dp9m74.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Daniel Vetter , David Airlie , Emma Anholt , Mark Brown , Maxime Ripard Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 26/39] ASoC: drm/vc4: 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:57:35 +0000 X-ClientProxiedBy: TYBP286CA0029.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: fe2b6bde-e456-42e2-512d-08db9862db48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uS6IDbKChNGFMxJHcs26dOXZsz76vvS4ubSxrlcLqCr+qDX7UeqGgkGibyCg7yU7/Mz+SIOZ1tFtL2bWPHn8MowGSLbOLC6Hwjx5MejU/fZHuwSUNa0b7kfJiSm3b0GgDHcAtaTgsBPyjULEj12/HNE0SCdOcdFG5uao2rw0KyWUK5DdE2JwnquWh0q3aLarAQO24/nhbD9IiVWZSnwi1thxioFU4Od1KUDGqvG9JvneopFiNkDI0Z+AG3NfIvE8+v25zeiIoDqwXvW+jOgwKIfOjnUW7b531SjN747RfYktl/Y//gXNAwwlehBlgz+4g0O0Z+cudvBfheK9Lr58/oI22iElc+s3bJh7VkS7uFeiuuyadHoOq+sodzYzjVTBIrHgDFAvx9/fqPnJO7d6OYT1Wps9CzkjIHrvDYh/gQm8H1QJZmk4xRWMY6usP6/XeIwMkUWpzA28uWzAhN5WUuyGOQyDUwdkd5uZbxHYCTSI9qfpJeQrkyyVHTccb0cxT9FiqH0iNpwyAATcgQVrbX8nToAiCRbRBJOH502wemcEN/jVjjkfEmYRy3bHbXfkei02vVqrPtGXdEybcXhV1uWv7sXwgLdlzxFx4vyVqQ3NAIIBKZr4QRNmSMK9pUJP 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)(38100700002)(38350700002)(4744005)(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: sgaV6xMJO3uE9SRTsUq969GxvnyVNJdkB0gDhvyXaMiHppdlZS/jNYeIkxnYts/1zg3vYH3w+Psd6gjvgbkLEz+gYE3Qzuk/UcJfhb52cidaKCy3E5vQBLpp3hQe4G+ioSsyv6UCk/tJ55GxZxzQXw28hGaYoqwEKZfLRCvfWyy6edCq6qUWjjZHxiuthon9lblhEDVEq6ynOt8DG/FWkN8ES1Jeimn2VFSCl/68GEgZYcqwML2/syLlMWBRjGG6KsK+TsmagQMImA7lAmgwVDyjs5MIgJS7L5YwL7zuViBxtWcxv6ZO47ZQUoBnsMdsm1Uxorwz8GHI9sVy+3+HakNIn3IigYGhteeEjqFmDxiZ8epfT+HFq074Wq80YtGOZqNlDOJz7TYBI9XQ8cnxJY66dN963QwSPIQdeHw/rdpEKrhgZ4u/uePRx1hPDGoQ3fY1QPHAgLih3zZq/slji6zJEuK6DFnZRGf59HLowAa3Ao6jlZOfc9cdH1FAF8xx39x9RwuWaS6+hJNQhCWQ6R4dQ4Sx8sdJenbS9dEbpAbVFfUirChNIZUPm7L1pyKnAKCxUEf9LQV9lpHCYm3Q9hlpsnA1jyRIBDLLMiTydL6uXPhLEMlmZ6WUQaH8NfSl+dq/+DvoU+r/Z50KASuI+spg8HDrHNfnjbAUeOewk6e3eiCeMWySCY8Abb+N39sLpiVnBizAWP7trUsnj3rPdwor7OvueorDj57vMEef4RUtfVXlPunUmjvXWVoxrB4u3Zvk6PX3sFW2YTARv7SCqYlB1KqlMbUa30dl9+sERd65lq6vqn5IgyJhmora2KzEo1cntnxKfVC3PBYYaAWRfGrq2E6edbLj6hG49GSaSekVXJPwsra8sgAXdG15WTTpEflZMC/tR3yP6yG+syMneQd19djU3g3VKtmdzXSPGJIpzGcvw7xBaHTM94PpLk0zcph7lTGh/nSG+4Mz1OZKXesOzfIwoKizJNWnPqnvyTwjhgcEYs6AvlQU37eSquvrZxMLkRBrhxEms432RJoRw2qY1Rj7g8g0vSCRWfoZhMubaRXLQ2GvZ9QcC8C9x8ePPCnMK8/EGMpwACPHKJcSIR2lZAYL3Qoda4uvFFnphec0BbgaNrYUH81YDUz0POSAcS/zA76jV6uAZvOqpihpesc6Y1Nk59tjgLFxkRjOvkvDTdvfkLH6ZAlVOy7p3NTVknGKdJXf4o2JB+x75OL4aXSFB3P/dK3PzNZt5DcBQvD9XNiljb716sFjXavg9TZi2WELb4CGQB/vcphKAyBH+sntpjQVksSgRBTSQOzZhjOpuvLJh0XSdpOaaGmzF9Bz5q7bZEt9R5nzv1tmqFxRv4eDF5LA9BNu5XyBS3Dqa946Lj6gZVe8v6Ut/iPR1c0yM0BlVvTgWsf3DqJei1hyv+1jWMXa9wRjW0F/zoNf3F7laU935znUzlo516ZdGTpFmtwgg/hiXRcjRRm6hS5MuZPhyYJ9FllibzfGDv+lNj7To2tb1uWRHJW8D6ZKxN1hs/6rGr1oh+srAknbdGBhHlrsgHuDvlNa8CFbrdVPrDchcyx9xlpp7qgOLCtcYPfD3O933hhjMJ0c7zysfrUEDIZ/IXZiMvwJRq8VseUyj1E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe2b6bde-e456-42e2-512d-08db9862db48 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:57:35.6863 (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: FieVm7aWu44WawUjNQXLoKQzskiJTERnkZ8z5M1SCrX61PRpa+oR4mjKoHqC6HjxkVsP9rql9jAaurVZBCpYGYHqsRsYsg0caIOtAYJ0L21N5yT/32uks/O3ev3lW2KL X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: 5WJBVAQ7L5TM4JETPIJNKAQXKLYP22UO X-Message-ID-Hash: 5WJBVAQ7L5TM4JETPIJNKAQXKLYP22UO 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 --- drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 5261526d286f..a8dec24b146b 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -2615,9 +2615,13 @@ static int vc4_hdmi_audio_cpu_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops vc4_snd_dai_ops = { + .probe = vc4_hdmi_audio_cpu_dai_probe, +}; + static struct snd_soc_dai_driver vc4_hdmi_audio_cpu_dai_drv = { .name = "vc4-hdmi-cpu-dai", - .probe = vc4_hdmi_audio_cpu_dai_probe, + .ops = &vc4_snd_dai_ops, .playback = { .stream_name = "Playback", .channels_min = 1, From patchwork Tue Aug 8 22:57: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: 711593 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 756D7C001DB for ; Tue, 8 Aug 2023 23:03:41 +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 5E36AE9C; Wed, 9 Aug 2023 01:02:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5E36AE9C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535819; bh=mmdj8CwR4VtCcYckifZuyJ11acs2hcV2GO64oRWFPcg=; 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=jUh3KnQoBjJy1MY2Xm6dFwzb8nTzaV6+hRE05lOi6U6rWhhum39fPZYWcVwUNRTmM UTYpXfbUl2slerAMNF8mEB7CJXhgF8xFsx5UM5uR1TnhMjQRpaILeOSGxt4dstKu8F DjSSDlqdtDMNwhJUAWcBv/8w4S1UsqPuPtMhVBnM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 590F2F805E6; Wed, 9 Aug 2023 00:57:53 +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 934DFF805DF; Wed, 9 Aug 2023 00:57:52 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6C35EF805DF; Wed, 9 Aug 2023 00:57:49 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072a.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72a]) (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 93DD6F8016E for ; Wed, 9 Aug 2023 00:57:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 93DD6F8016E 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=hd3zpwvi ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X4ZpFpYD3Zkwr4SsWzXq1x7Z21KTbDxsBHysLRKDGz9W1CWX8E5m/ih/SaB0WJR7V5ZN/gc2u/8+KbkG3A5VW3vyWMUKIVhWHMNF24FWJMRuzPh+nMGSMcodRhBA+ehHFLRrhdLEV2cyAn7eHZYgAtV0TNOsdc+s64UjsvDjYe7b48YCkGBFJa6Pk+i6CHQSiXcjk6GanHbsRKpluIIrTkSmCXad1diketDrdTynaxGv+MG79ZkIq9I82zVjnryy4q64g8FKaLjazRkHNu/rcJZ3SWdrAadbYeGvxIMv7HSi2UDMbZUnSUEoySs7n+6RBt37eS/wH7lDBuKjCPPIXw== 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=NpN3bGHjjyvhawnaJn0eT8kDrHcxSncqQv6+lFhPqjM=; b=NzckaXi9CjkgdgKvT/OzOg9L+WGumUt6WMCEFlSo6ic2OrOAzl7AkY3dKdyqziHuv6pgL732LdhMhI0c3Vsue5+2YlTMFNPu8TIG4goXUC4wXqx+dnwPI/09LrBiCJhc+xjwkEO4co8ohCJ5CijDS+5fhWpb8BQdZw00iaSx6KFAcEqqBgQrxRDsfGgUbqSitNIcSPKy4L270ump6DY3c8/q0SCZqKM3aX/yux01iXdQlkeKZx/du14nmvuMMdgw/VRRR1RVVMmteSl2yz5InccRVnwmIMNlk3CUwC/Vu+IGu0QRNBHBKd+yhF+XmnL8aklRYZE61ut6Qttk7gITVA== 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=NpN3bGHjjyvhawnaJn0eT8kDrHcxSncqQv6+lFhPqjM=; b=hd3zpwviQighMhzLY6mm/0fTeAPHRRO1+R2QFvZeMdpftbGFYrTk/Fg/adV1dywRaYwiZXY2h3kK9HD66ejlvrtiYauiWOcL+JU2VNfQweoRxRWUhSgBvNnG8QZxy1qh4niMHPHg/jKRxJkK9EmBKbgdtTZqhxX8ID/fQyeR4NI= 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:57:43 +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:57:43 +0000 Message-ID: <87ttt99m6y.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Sylwester Nawrocki , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 27/39] ASoC: samsung: 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:57:41 +0000 X-ClientProxiedBy: TYCPR01CA0156.jpnprd01.prod.outlook.com (2603:1096:400:2b1::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: c4865b26-8d01-497d-606d-08db9862decd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pdMf32JvbOJkdrhVPV+lIQp/OSFqVkzGpqAuPESOdVPuv6iXjsUcRASwSLtrdarbIjdLlxc8K5EgV9AGVzdhGmwim3Sxm9sB7EyfWrE62K3xGWDe9lYKd6nI4/gowpPoLa8x41qLSx15Hn3szZ5PGWtdrOdb+b7/pIlVohcXjvXj+qS5PXIi+S8EOq0cuhgLB8hJJ7pB0WOeIZ3SV876kdXb4whitjJ1b3JxjNEFZ3wx6ZeIY3J4NiqVqyYBvA6j543DWFH7enG1laNol8GpFJpqKKL0oqRmaIhlel3VPwnQSI2HXjlu4ev4xzz9ZDxK4LVg/r3GUD5Qx4PFqNPaDlkhtA0VX+tTvI1ephfMCiliYxlrdSHnYfyrf99OUaa4Pe9IWa3czVhot4oCrIct2g888ZUU75ogqrqmMbLCpHQe2jiFhM2DKx5bYU2rV+FrX41W76P2lREeveEX+LD6q9Egb5d0ywPgmIbswBuyqPvBpsKn2ng4u/+ERmRITxkgGznXn1HNuojozjgaEQ/D2+ecfaBIomMqp2MxzNBQn5BNkeJ0DDujMaEIco6RMwkLOnSqfDsRxIdVh5b2J05/6GcPk4MAfelmSYrLNLbTI7NyE1zOMfenlR5q0iaxv/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:(13230028)(4636009)(39860400002)(396003)(376002)(346002)(136003)(366004)(451199021)(1800799006)(186006)(5660300002)(8676002)(8936002)(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: T5gUPqMJNa63BVRkXIqj14Ag+YD+x8DuxiqCvB3yl7b+WM5ITC6SvT5zrDJQYDSi3EEcl6lAg/ID4U2mrKLU2+O5+iTMC/fA4JiOn6MzIKYMF9vTIWaV9ubSl62kR8rGJj19XbgpJcljs//kZN3xviXWxEgnU2LSF8q3+vkXWI12lz+HeRhfKEbSmilJKBUUayIAC/2jyoOp+BrmoV6MWAxaT8hysEEDrbKExX5+TZSMkUy4evap9nFM1AWVeA4TVFIjvxE+wv4ZEH8xuqcR1KxT5krBvqDj+Sdg3ValdaepzMy0QyZLkirf0LSeFrLjxGnnrCOHRnR3vjHjCLfKibg1ZYlAOU3deKy8r3XfiXgMct29mC69sWLqQ+SNc0VSvMNQdFqnjRWnNVG6IPYpb86m9aDBKo2CbSEUk+6lfHiuofpWvscUeDAJSAPzWS+jE0xfQRUPDgaOBRFVwZTD5q4OxLy1kBh4P1JkMrm+/nwYNkKIu9ogZjWjNvQOXwHySBwZ/iKnmYU0P2LUJfpHsf2MithZotMvjh9f8zGNbL9W9RvorV0XKHdejoJn7ewtz4oMTcQX7uuaJwa3auTmXM4SQ/yJgpDGq0V6htHIBGnJVIXj1okGpF2AyCa8b2fMiOfVKtskht19c/sTqP1PXgQD8lh30bu5Ki5QMOxTREue29URHPjKat5p9v4DfaxgAAoyJQzsAvRtLQYmwm899FEdtZPXLgZ8yiO8lNO47iJ/lQgFH2FqVea4Alj6r0RdAc95xBIw7WglSorIbDFgZKaGOz2rt+BsGVS1GTIB1696ppbscLSR/CWb30dSVrDkbzWo/bYqVbLl8bgWqRYZtGq87FpNFd4YrjGjtYEMOiG3I6OCuSdRP/PWKDWg/tCxuYCdsIB5qt6UI46PurMeEBYdhYtKJHq8adPNyDZlyZ6i1R9YQfWLtfWK9tT0nR58JpxoFuGfBQsoTRlu8oKpoW/HfK+7C0ZHUB9Spc8pzN2sgZ/g3lQjBge0fyAQBUsNQc3R2LPdFaD2fgm2oe0Eft6YyIJBSQz9ngz28XhKk3lcbSD4coXNdFaabZjS+RwNZErz2hPPkaYnAWE+yy8EmQukuumtch29Fr5/pcK68J0uol9btCI29jtmYT0PB+zPyxCOIoxJ+6HWbrzboyUenVZ6ATYPa2Q7zXdabRcCZ6IIIJd4E04hw9a9S5AgtC0VbEoId5Ujk2HfeqZOxU4yRD//HezJsAx1MdByI2ytnlCVzZQjgTpuqXDemJrXYB4RiEeaDUMSec4HkqJhE+MTrBJSAD7u/JG/G2tmZMaKveoRvokjaIOFw4IeFFxAotMwvAxIZb+7rICLnW5PY5NCNu0XTDinxcB+ymntmwbFphn3QH7X5dx0+uJ7tF1NRdPIrcJ3PxXmsJiwYKLkYx/9zdr3b+gf6ymTA1nS4+3lS+nSVrbrD5MWbBSlZxCar+QDWAYcZd6zEIHDBg73EhrkFu+2khqgX1nEtjrwNyYYdRFdrVXydxYYkhLSau04xaa6dvXcBsJereawzdGkeHv5MjFOSHq2ikvI9hjX82cnxneHaIv8d+CM3H68PPfZ2j8wP3ZqzyI8IzX4D3MlkCLu0mvWOAAwSBGUFMgnGf4Z0EE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4865b26-8d01-497d-606d-08db9862decd 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:57:43.4071 (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: KOo1QQGUrDiZUHJLoiRE6x1qQrnRfv5wiKEPY5QHK3lso5cRKb1cPBs2o/rAQ+K7Brsx/YpVv7XzNnq9zwSJmu6hE9u8RMAzURlUrbKPdBUHVRrr6Yh9OoNlaYELHrA3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: Y5IDNZZ7NTQMH2PCIJNQNGVSJNZX4TCU X-Message-ID-Hash: Y5IDNZZ7NTQMH2PCIJNQNGVSJNZX4TCU 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 --- sound/soc/samsung/i2s.c | 5 ++--- sound/soc/samsung/pcm.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index f3d98abd5f0d..3af48c9b5ab7 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1120,6 +1120,8 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops samsung_i2s_dai_ops = { + .probe = samsung_i2s_dai_probe, + .remove = samsung_i2s_dai_remove, .trigger = i2s_trigger, .hw_params = i2s_hw_params, .set_fmt = i2s_set_fmt, @@ -1188,9 +1190,6 @@ static int i2s_alloc_dais(struct samsung_i2s_priv *priv, for (i = 0; i < num_dais; i++) { dai_drv = &priv->dai_drv[i]; - dai_drv->probe = samsung_i2s_dai_probe; - dai_drv->remove = samsung_i2s_dai_remove; - dai_drv->symmetric_rate = 1; dai_drv->ops = &samsung_i2s_dai_ops; diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 335fe5cb9cfc..d2cdc5c8e05b 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -432,14 +432,6 @@ static int s3c_pcm_set_sysclk(struct snd_soc_dai *cpu_dai, return 0; } -static const struct snd_soc_dai_ops s3c_pcm_dai_ops = { - .set_sysclk = s3c_pcm_set_sysclk, - .set_clkdiv = s3c_pcm_set_clkdiv, - .trigger = s3c_pcm_trigger, - .hw_params = s3c_pcm_hw_params, - .set_fmt = s3c_pcm_set_fmt, -}; - static int s3c_pcm_dai_probe(struct snd_soc_dai *dai) { struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(dai); @@ -449,11 +441,19 @@ static int s3c_pcm_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops s3c_pcm_dai_ops = { + .probe = s3c_pcm_dai_probe, + .set_sysclk = s3c_pcm_set_sysclk, + .set_clkdiv = s3c_pcm_set_clkdiv, + .trigger = s3c_pcm_trigger, + .hw_params = s3c_pcm_hw_params, + .set_fmt = s3c_pcm_set_fmt, +}; + #define S3C_PCM_RATES SNDRV_PCM_RATE_8000_96000 #define S3C_PCM_DAI_DECLARE \ .symmetric_rate = 1, \ - .probe = s3c_pcm_dai_probe, \ .ops = &s3c_pcm_dai_ops, \ .playback = { \ .channels_min = 2, \ From patchwork Tue Aug 8 22:57: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: 711969 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 87A2AC001DB for ; Tue, 8 Aug 2023 23:04:02 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 59098E93; Wed, 9 Aug 2023 01:03:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 59098E93 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535840; bh=RIgt5zsqTEOi5M3NeqqDJqODYmdRxM0EWGcbn0+UxzM=; 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=Bie6om9TbU0Ry7wONku8h0Nb79XoGotmutHETUbPDtuj+TDSWPO4WuxDKsNGEKVlc 5bg5mbMdGwWrTuu31YrjLKoPzV0dj40APf2qi95pXOiYjOHLhrVGacoYiIpVgEH4NI h6gdOMcq3M9ali7CgXvjYBO7RRLhESkMiBO6meYg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8D606F80689; Wed, 9 Aug 2023 00:58:03 +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 1EEE4F80689; Wed, 9 Aug 2023 00:58:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 47549F80690; Wed, 9 Aug 2023 00:57:59 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072d.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72d]) (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 7FBD8F80688 for ; Wed, 9 Aug 2023 00:57:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7FBD8F80688 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=LgQx7XzU ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ICXd52+q6Ehs5yByO6nDFmIZXS5SE9jmP6uPxJYhRofPpALZAd7n+7uYA3+9xzwjSiW9grw/tBLo8ozedW/E3S9MMTanBkIgMmkL5YeRnC8ZLRblPwb1ypUfL52fX/XJQs76LqIR0JOfUPPfZDCIPovD/V/ncGqpR6tEKmHljxlcBxff2e69pV8swoUJwmzrgbz1zrzsb12QG5QrS6aku6QT2NyLCqrdWvXKIRl/W+C2NBWABfDY9HEsvvW/TuqJViZPq6SFCUCTcsPPhWv5g9HZ0B/+rjQeEupN9klVmxWulP28w/xzjBvuSLHoNAjOCa9cuuF0HHl8snufV7v/Ug== 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=pYOhQ3AgeNrny/ti4KpDd95kPNC6d39R8HOb7uhsw3Y=; b=ByIoFEQrGr/PezQl9yNgjey+OGmmhIj/y46Qxt/sAeZaaxK8ykI5RSZXSGAjAP7xcJcOg/wgHvIcgxf3b2X8Jo1+fYv2lYfeKq9HDvwiP3OP/5gwKOeBDhx2hUnAeUzefk1V/kCMyq+EKJ5HNptppEs4Wyt0zy7viUoIIyi8//C0pnT9x2Uvl/OTWI+vsT4YJI2BeJsl4BpZCLQc+40sc6cBVX2uOPfjRHuqLuBTaWwfk2GiKrUx6x5ioCvhAMRTD+E5+A8aZ06nPlLr18CfciASQFZmgARZKmv1l6QlzO/wwHa733QzGSaJSkNVxMmamI6lfMMKuHNLvwq85NKFAA== 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=pYOhQ3AgeNrny/ti4KpDd95kPNC6d39R8HOb7uhsw3Y=; b=LgQx7XzUITtC1RZP9zsB+L7+xU8RqI3q55pq8VovniJKucOsZa8oHJVCcJepAslkefVx8BfqYIcyWfbAVxi8YBPGt1Carv9IMiqMhqKowYlYSxsFdMrPUrYmOu9nwnhWXZP/qjC1hAmKl+IboxGaJzyYFQD4Kj8VGRqY5J1j5jA= 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:57:52 +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:57:52 +0000 Message-ID: <87sf8t9m6n.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Matthias Brugger , Takashi Iwai , Trevor Wu Cc: AngeloGioacchino Del Regno , alsa-devel@alsa-project.org Subject: [PATCH v2 28/39] ASoC: mediatek: 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:57:52 +0000 X-ClientProxiedBy: TYCP286CA0305.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38b::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_|TYWPR01MB11379:EE_ X-MS-Office365-Filtering-Correlation-Id: d269f096-bc91-4e0b-4c1d-08db9862e57f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZpPm5DM8wjuXBxR7rbdB1ttW9ySeQzC0FoQ+uOqthbAwm6p+EU2KfZJF1G3q1htcLiQ4r+N5c5Eht6P+l+FuCJ6oSacF0pUSAQ3FMyqRd6tsUzr0fCx5PSahIY3M8cgFDlaqMCC6bwTf1HGIllL6RuoguokviljQyUjMQEDJPjKHYTW+j6saW+bbFEdv74qWdP1Ro4bp2loe8FdUOlveSl0bSau19SfNN2xj87Sz8F+PbUxp98ZsT5hiyycSHEo9YBBgWzTsF3j2V1V/oI6y2BeEQoUKsK0QakPr9PD7V8Ra3VjW6KuyF9JVgobkqZAEzWYOSn52z7Np0jAF6cZ+C3x3vp4Z/4oSBXBE+9i+T3+kOajBSi75wr6/btT4lnSpz07xg+SzhXw0P1pcowVRHUMB3fd+9l/kwBTQ9BKQ2KSEwjs4Fkss2xCXrsN4KYhhx9qtVsTWkLLE5EFZDttRcT1b3zKgs03O9T+nIAat83Q7LISKpnYZbbt0zZWkCzQsGqSln/3dWs5dooZZfm3FYdHKtvNGItiZ25VARjK2FtDiOpU9vUirY8c65d5r7uA74KR9ctuZZs4HIrFMsTeO0aSN1hhLPf+0ClKdNTxzASTLwaaLaLKqM6d4fx5WSS/z 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)(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: Pc/zbTfcgBmWqTpc2CWTalLbcImmFfSDEwAlkNBrDxHHoamX7ZjjnjeLweeQu4Y5a0GpOo+zPIK/BFBXC5CrlSE/1i2on1LeVQEPxaXHsnI2+yY+TKt95AfSGUGFlP8xe5WgOgJLqFnnrjkZVFYnK52lGEZTSJ9hCBz5nxvlmABW/VGw9eRkkfgphtuGWj9zDLOejV0XKYtNrVRiA/xDh4o5VV/OmpuJRnKNx/2ymiaQCxuvnYIcyZe5l1Z9f+CQv5D/P8FH1l+y0nmQ3B9ColTcD+2Y3KRb3DptHfMWncC4kXqcJj2y6+e0jnIzJjXNk8StU3ijOY9F1kun11jucBrtmfvoj92f3oUTV50kXMKmesEkOeu5HU+LzyBW80CcXtSjcTaTuiPeEHm4VMZNQbdpziO0HshI3pzsQPSC5zx19tDmNZM9IKPEJRBmnL1hBhyha3/ChR4rvic8pfQCoqqUfpgAUB7z9ZflHKYPcCF70bayYuvlLs9kgsKYz3/qd1KI84lpF2fGkgqgjuRpgGltxXWF+f5a+nS+1OUwf5iGV6wQ91Wuz6dTAbbV7WxhmEustXfy3BBJkDy3cPz63k0CuJwkdKENP5iI6K/4QYVi+kNheGwOffQfvWLevr3dLRWHIcvxjtSQMxLPxZC7XjiJ/UteRHg0hr8/Fdw1YXhHjBcbwu1thbC2eCp8zBtuV9mzWEkiD8AyOY97dywqsDBa0PWH5YRyLHU6U4AiBgIa7513NfrG/AEiokRtF86gqFfTM87pHwA2d4t3mKzz3LvW5EyuSQKHLVsIKI0UcridKosENCjdV7SYQzhLuMij/r/tz/RIczra/JLqShzVQGVhgARl4ZdGx9tQ7oKlmvzSEP2zrVUfiIu8xysxubGN6OvxTuS3hYXvFqoT6N56wG6g5R0U4XeY4yMK5FJhSqw7E4aTzb6GclfVHeZrpmT1zcw/Tf0Sm2Ix8ghVSBQqfUlwbWPaZ3XWas+5Em6khVN2L372JSnVczDoDIpYtVBW0tOeR2kIEFOVBQmCDjPcFMwTh4b5o291Gg/IAb2QM5ORPL9tLymab1cw8ROlbEWRDYn/leghcafNP0mVx+61QPH8aa8mR3ZPPBfkwJmcyfP80DcUwSp+CN9b1iIQ9ah8LQfUcKtWMNEAWgpLUSn2tj8gb+UzGaSXwG7GYzS0w2X/gU48v2KZYBhVrsljk682t9AhEImTqPs5BAjt02OuxeZz9r4HVIWof5H/Tst/s8F/kqdh1jYDXThF9j6oOyZdCwUQxpYBpVhli72jJ+ba4o18wOPiOeSOTzAmGB80FpdK6xS3wAZ4saSEmwCPivDtfU46zlYo56XJSsIo+4Z8dUtvndoJbxO4nQ9DtzfyQoSbXyeeHgWQz0pd9g/ELyrICscmsqcpjf/S/Ms3dsdTdnGUyVEDXjR+6jlHqa3nMkROwQR+UPSKRi7WhYhxLz6RwYlRMRbLJMHu1+tMb0gVI5Wprs/9iiGXqPpfePiQ+MgJ7oRbnuRYaqRkSFtGO4nz1I1hmsxUXF5ir97c7jFFKecGuRhG2jN6drMMoTmWOawuVWaKUbkpi0/MEEGHNpuY82qoehFyCf8JgEmNSQlBsQLpwTUtVO1pdmc488+FidY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d269f096-bc91-4e0b-4c1d-08db9862e57f 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:57:52.8812 (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: 7J2/ioB+uApifyu2r841jzE0q91HGviTGfO2qlv2D8TpJZDhAKyeWNM0TKbYz/988LaWBIN4Ck68RZa5dxS6P4OSAua8zrSjAX3ZDL28QB4UKAUw62S+Z3ELPG/Mna6J X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11379 Message-ID-Hash: CV5HAXGNOCBNUSOZVDXUSOBBOF6FCWOD X-Message-ID-Hash: CV5HAXGNOCBNUSOZVDXUSOBBOF6FCWOD 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 Acked-by: Trevor Wu --- sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 56 ++++++++++++--------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c index eedb9165f911..fd4f9f8f032d 100644 --- a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c +++ b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c @@ -2456,25 +2456,6 @@ static int mtk_dai_hdmitx_dptx_set_sysclk(struct snd_soc_dai *dai, return mtk_dai_etdm_cal_mclk(afe, freq, dai->id); } -static const struct snd_soc_dai_ops mtk_dai_etdm_ops = { - .startup = mtk_dai_etdm_startup, - .shutdown = mtk_dai_etdm_shutdown, - .hw_params = mtk_dai_etdm_hw_params, - .trigger = mtk_dai_etdm_trigger, - .set_sysclk = mtk_dai_etdm_set_sysclk, - .set_fmt = mtk_dai_etdm_set_fmt, - .set_tdm_slot = mtk_dai_etdm_set_tdm_slot, -}; - -static const struct snd_soc_dai_ops mtk_dai_hdmitx_dptx_ops = { - .startup = mtk_dai_hdmitx_dptx_startup, - .shutdown = mtk_dai_hdmitx_dptx_shutdown, - .hw_params = mtk_dai_hdmitx_dptx_hw_params, - .trigger = mtk_dai_hdmitx_dptx_trigger, - .set_sysclk = mtk_dai_hdmitx_dptx_set_sysclk, - .set_fmt = mtk_dai_etdm_set_fmt, -}; - /* dai driver */ #define MTK_ETDM_RATES (SNDRV_PCM_RATE_8000_384000) @@ -2505,6 +2486,36 @@ static int mtk_dai_etdm_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops mtk_dai_hdmitx_dptx_ops = { + .startup = mtk_dai_hdmitx_dptx_startup, + .shutdown = mtk_dai_hdmitx_dptx_shutdown, + .hw_params = mtk_dai_hdmitx_dptx_hw_params, + .trigger = mtk_dai_hdmitx_dptx_trigger, + .set_sysclk = mtk_dai_hdmitx_dptx_set_sysclk, + .set_fmt = mtk_dai_etdm_set_fmt, +}; + +static const struct snd_soc_dai_ops mtk_dai_hdmitx_dptx_ops2 = { + .probe = mtk_dai_etdm_probe, + .startup = mtk_dai_hdmitx_dptx_startup, + .shutdown = mtk_dai_hdmitx_dptx_shutdown, + .hw_params = mtk_dai_hdmitx_dptx_hw_params, + .trigger = mtk_dai_hdmitx_dptx_trigger, + .set_sysclk = mtk_dai_hdmitx_dptx_set_sysclk, + .set_fmt = mtk_dai_etdm_set_fmt, +}; + +static const struct snd_soc_dai_ops mtk_dai_etdm_ops = { + .probe = mtk_dai_etdm_probe, + .startup = mtk_dai_etdm_startup, + .shutdown = mtk_dai_etdm_shutdown, + .hw_params = mtk_dai_etdm_hw_params, + .trigger = mtk_dai_etdm_trigger, + .set_sysclk = mtk_dai_etdm_set_sysclk, + .set_fmt = mtk_dai_etdm_set_fmt, + .set_tdm_slot = mtk_dai_etdm_set_tdm_slot, +}; + static struct snd_soc_dai_driver mtk_dai_etdm_driver[] = { { .name = "DPTX", @@ -2529,7 +2540,6 @@ static struct snd_soc_dai_driver mtk_dai_etdm_driver[] = { .formats = MTK_ETDM_FORMATS, }, .ops = &mtk_dai_etdm_ops, - .probe = mtk_dai_etdm_probe, }, { .name = "ETDM2_IN", @@ -2542,7 +2552,6 @@ static struct snd_soc_dai_driver mtk_dai_etdm_driver[] = { .formats = MTK_ETDM_FORMATS, }, .ops = &mtk_dai_etdm_ops, - .probe = mtk_dai_etdm_probe, }, { .name = "ETDM1_OUT", @@ -2555,7 +2564,6 @@ static struct snd_soc_dai_driver mtk_dai_etdm_driver[] = { .formats = MTK_ETDM_FORMATS, }, .ops = &mtk_dai_etdm_ops, - .probe = mtk_dai_etdm_probe, }, { .name = "ETDM2_OUT", @@ -2568,7 +2576,6 @@ static struct snd_soc_dai_driver mtk_dai_etdm_driver[] = { .formats = MTK_ETDM_FORMATS, }, .ops = &mtk_dai_etdm_ops, - .probe = mtk_dai_etdm_probe, }, { .name = "ETDM3_OUT", @@ -2580,8 +2587,7 @@ static struct snd_soc_dai_driver mtk_dai_etdm_driver[] = { .rates = MTK_ETDM_RATES, .formats = MTK_ETDM_FORMATS, }, - .ops = &mtk_dai_hdmitx_dptx_ops, - .probe = mtk_dai_etdm_probe, + .ops = &mtk_dai_hdmitx_dptx_ops2, }, }; From patchwork Tue Aug 8 22:57:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711592 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 2D71FC001E0 for ; Tue, 8 Aug 2023 23:04:13 +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 30A05BC0; Wed, 9 Aug 2023 01:03:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 30A05BC0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535851; bh=0pLJD2IrAFT2AT/ngf8Y7BOJkentP+fHxhePgQL8QYo=; 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=ipjPDeS0md63iwfReMK/MUaG4S8mUPOOwsm/6rpncQI3/b9Ia0C4cyZ8b7DSamM+U gw8LA6iSler7Y3Bsb1mmX3Xhh5n3+RZlm0ovbBIjJ2ynJGUceEZUOsXha+2cqWh8cw hxqPP48prPmo949gSvpSC8AGQRu4igmv23qkDlnU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id EF1A5F80696; Wed, 9 Aug 2023 00:58:13 +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 8CF74F80536; Wed, 9 Aug 2023 00:58:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8635BF805EC; Wed, 9 Aug 2023 00:58:09 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71d]) (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 2A608F8057F for ; Wed, 9 Aug 2023 00:58:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2A608F8057F 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=JdaxFO84 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=erSsyJI/A9n0QBcW15W7G51rw06aV3rnEmN4WguNjoK5u6O/aN7BgtMqnX/LfQFvp9SnaEhpvdw1HbhfHkQllUPYGwaKTvwwkJDU2sfDfCxLkjw3akDyn0uGLcB0l2JA1dFdBYmTkkn03ABcJ3j1hXvwH4Xsu+zw9mpc4eY4VNuRjURDWzmH0FH1lbMWSqwKTsW9kuTD0bhNqJR3dqV3xEwsMEeZ6OqDQ9tHR1OEqGlnzK334ywrs5MxqowtFBHv7bqmKPlijrtksfi/4DSDMNoCXJFFM8j+veiYu0cTK39+SZAW27LA9W949gt9mpJN6hpeocFVNJzMCnPqoAW02Q== 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=rUqi7Q2b+o8tA2mzivN7N7UsqRDu9nkka9XJ+o7GkME=; b=afW37CfrVJbMJSZQVvn2Ix2+MLaW13WCf4HDfpNXtuURYNdYoS5MAQJHAXmmoGcE89KUHj8LJ7vReakLzNh3eaNKUp10DLObWBrDDiUBSlc/jfvP0JhawTxfeDYn23cY5Q0TMGhoCo61NXZtaZ+2NG6tU4Rodac4kr1TI5v1Gb4wIcOZSMJHNf5K5hDC5MMbfclX0rNLuB4RfMsG5jX6+Gwgg0zYVG/+/CS2QKZdkuYcwe4x3NrLi2+Lzt25enAWNrfcUwMZyqNO0JcJXKMJ/9yvMFgr6vrgko8dX6gPvbEMT994gKy8grcF0HJIiGdwuvDuCdcz6BOLyger6bm+VA== 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=rUqi7Q2b+o8tA2mzivN7N7UsqRDu9nkka9XJ+o7GkME=; b=JdaxFO84iY9dJdRpktDBbR5Ovej9cxbW7G1AmV8cSOJUpUVk/P0M5JgIcKjHZuztU6AP6e7Go7kmJfvMRB8eYbl0m2hlNekIKdSgj4h2KdnolSf+lvtOm3ZFBRg4vag2rVdRKBVJvmrkS6HYOJ297HtBkkQZ85rGjIdx38Qvr7s= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:00 +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:58:00 +0000 Message-ID: <87r0od9m6i.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 v2 29/39] ASoC: rockchip: 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:57:58 +0000 X-ClientProxiedBy: TYCP286CA0147.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e5955e2-c314-4bec-84f5-08db9862e8ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eVKCPqWcvElJ2KVSXtomSiJxbY/xKnTPZLJdJ6sNnEKPJgvFy9L6F627kmfPrim4JZ/BuHsp9tTESd6a0pgkJKYNS9UNelOZDRjcykV9jfzbUwnicwsaCkAAiDKEEFm4sBaMJfemCPE/FZsJu5RYRyrOsNDgNWh2K94DRmfz/dYJ30vjqNvtPjUeNw7cIv8/2Heuu+iJ6bVB9a+EcdZqotIYTUnVWfm2FMaVDrik0AkqrK8SCBGobIafwCFvg6JmkindgxvS81HucdWf9MwF6oZKZss/Agt4ThNxwyVa+wLX1XQTy6DtOZ5c2iy1Mo2fzLnqfhOLh6byaStxbMQuxQ+BsxpxYXhLxqCfvRL86Z4gsZ3N0XRfNdqh9GpiZFffFTmeyl5bKIMVMGYsilVAniCLFnCbBCjuZRaYf3L46c30pUpu0x4jc/U1sYJCVet0P+XaDOi1v6YEkvj2GrT6gyC4v4BfO31BZD9zkxVmDhwKOTtEql/vtyBZsGOYvmXzV7YOOvkyixIBJSfogIl884BnnRkS2MWR8N+pyM4fnAgUavXF5xaMSAYyuE+80AYOJQd7mehMcCQ8dRzNFf2Cnkw1l9FR8rZR3XwsBT70Wb4PAw2F5bU5A6c/cssPtqYO 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UxAeJltnFHAK35GRKEGS95Vr0ZHKgZYWenAR9QU79cwratFf8eeDGdoOY4mwQ6WFvn5CB/T1FZJaOpL1O05aoMUFw2fcSVhUJqyRPL45NcFooHR6QHWpdkZ8HGE2W89XY450SeS5bHWuMKYmnZrvqk3HykM7MjcVvvVEs/8zKJMpdqsX0ed7nSf5vyvwVL2vl6j6d2DvKHiHcnpyTOIe77g4Zh9vWCVQCe2vgw+Zg+a9DKLsumeLe9b4TCeHXre7yb/bMVIsyPu4y/0j2QndnCmwvQeUHoEXFAqV8vhrH1YEV72LNZDkOXha3WhD8wJPZeZfk3kVkRqdngMWVqLlMXwxSqxmx0oNZoPDYz2n5URF7f4zEIpcfOV7ggKROx3hyNrh2l/vSiGTuOKqaPtfg2lXYHhx+pFdmlmQ2sfXB4Xoa+ieN/APSP265YkygjoTsSmv4YN0sBK93LRoMhEIh43sYaBpbWCABmWIS40K9DKiAiXWY9bJ/f6JDncbPnOoqDn4JU164emFpOU0QBOJg/eQUAmcqyO7RfSPC9/PfVnIVZW9we2bj1as1MVlFE6dDxY0plCPB3Os1miabz5dyhox9Ut/SdLPeWU9j21XG2kMeXIUVFdUfogYmZDPvKNQe8Q1jLBg+TJFfxbfaUdBfQaEyECnMP7MW5E1Blz1lSIzpvIA4PvQCILxF5FcjkHOyz4QcnujimJzIzzU4MP7qqIVs/9Z4JXYrJOpptEnT7hjr3ku0DQZmIGymuoRBy/QOhQgyx1JELiCxRXodlZhfbNC01T9TYqicncyiFUMw39uDYABmjUTnlmplSl3hV3OIuQo7iE5ydQcuS8SKHVX07ZELSTiPeJM3Na0dT78p0awUpxmmU/SZk7RLigkdTzh6lJl4zz09Lx0nEzUIRwityuo1YWsItkZ0+i210BzOO1CtR8uKic1lsaEZyvCYHRxvgvEjPjhC486ybZRwmTrDqqlYZPv8U5n4rn+mnrlmnyl0L0fFPICwH8jElirxv8tieHJzYyRXL2p5t7pFyY1bcSXlthg1cZ6d9b12PipbdPPHO3+/bHb8rrg4PrgojpC+WLnsDR6kNf2//Sn6T6Qo8YX7ioQcEHZY6X6/rSclE8N1Xs93cyplRYHgbD1PZdWcbCugo0bgT0zC0EtVPDqDyWElAF1bJIvMDIcI6cDc3e2vhGqi44yFcOdo+g3sYh6ZhkakXWNFXTOg7ebM6UQB84+ld8o0vRetTo9HygQqMY/Oq4dV6eSCvOtnhScIJ8dw7nn2Uxr93SqG9Q7NAwt2O7h8RFelenI+J261YpaXPQYSuY7FlF4WHKTBFw7w0Yrb3mj+1Ix3E39jsZTa0GoUbD3dtgB2ZleP8dLvFf8zFJ1GBAQ1c9qRQOmyocEGG8zf4QuBd35MT+9clN7+loll2/4aoXZpDO5DggdDlozvG8k2P0aD8xYz1O2xtSY6NjfFs7zqz82lhnqgiy1JUt+5XKQd0qMTy7R4OQ61Zf3zNLGzm8oYGqrwnuU4h5NUtXpKwM3001vHTUWl1HoXcBtRugbGBSl4NPq1FKt8wk5weP77qRVJpu6tUF7NNuPeLINfM7V9j0gHIjAYSYG2DCU8RNfw6V4U7qfxF9OGtAerK8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e5955e2-c314-4bec-84f5-08db9862e8ec 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:58:00.1681 (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: h8hrvYBxEnrt4WRA5SUEGkmPvjk9Ckm9CMN+XxVIv9uCHOWuSvsdf7ZElVkceHjvDGTk2ov8SO8J9sWHJFW1pOk6S2jvpXtqOfiGtMM/OgJmpQp+5M832JqVwFXgdITB X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: UPARAUWLS6HULJHXCEJUUMMAZP33I2GB X-Message-ID-Hash: UPARAUWLS6HULJHXCEJUUMMAZP33I2GB 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 Acked-by: Heiko Stuebner --- 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, From patchwork Tue Aug 8 22:58: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: 711968 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 4B29BC001E0 for ; Tue, 8 Aug 2023 23:04:31 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 781CAE76; Wed, 9 Aug 2023 01:03:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 781CAE76 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535868; bh=Qkh1c8453OM+KXw+Q/vDMo3LEPOqPHH0DJLUa5H1ah8=; 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=JgmDQHs0pcBKAT5KHMij9jBJOv4l+EF6L5K2NcM4dnyPaf6Kiw+yhtOCysC6AzoYL +hyZVrE1ORxrLm4JJMVar+UF6QDK6oRqTCrtXI6rjC4mqexFGWpYDmAbaGQSeLuUvc J7m7zkf4Km4VOE4ykE632yMoK3IXCicoTOcp4kY8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A7F0EF805F5; Wed, 9 Aug 2023 00:58:28 +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 351A4F805F5; Wed, 9 Aug 2023 00:58:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CC30DF805E9; Wed, 9 Aug 2023 00:58:24 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20728.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::728]) (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 1966DF800F4 for ; Wed, 9 Aug 2023 00:58:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1966DF800F4 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=p4r1bVF0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eJyWyCvWoYWwdwSAir+aAaBcwcis+E3nTkpENnxOdPIOEOust2BYs0GCnwkAjQ4CztcUZlO26UgFFJZB1OCbcuTSBtfXKrZVYRyVqKvBLJQ7yuC9ziwMotG/SdY/wmMti6WN70S8kR8YpwT5wQ6nwO/M26xBdH5lXJZ3SUzmxUgCC/3oeUP7CIUFe1d9DDk0carXBAKpBKr+fTVh/6q5ozMefUbpBf8An8JRFNEfA9xeSYE0f7JXwdxD+6AY/S8in7GkwEg0x08FqgsRSHLNFFjwM1jPK9cPb0ayBwwySqQTLiGTSPRHWMFUFwVqd3X8x9Wj25s5OmLJ/CdDlaI8eA== 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=WKxmwBZcYUaB85lNjGOBG6/oIi9lvoKXQ6kVHZp5g+M=; b=Aw5YZXN5nJDi/LJ5JH5OOJ7p2KaOP9eJzHE1dpzCCG1At0dt8H7yP3XQ6r7q8DW++RCYAOQleiicTNcSkl4FGidpU+JVABp+6irGwIv21Wgzyz9TpyiNBO5kl4DYzes7tW6Z+6PSBLdQ8OBgGUOZfUcDPDO3mnk/6ZGB3BNWexeTOoVTrVc1vqpbtQR2a3RwIjcPbpa57f3I74DHwqP38KxXoQImgWGtecu+mTx7+FXyFAWNB1TVeDuRUudWUvx9xhGAQpHGontVwuZ1HTfcZrWW5IaTsRTIQx19RXRaKlPFXCZjhflRAEmi7Jfa7UsFWPI4adMK6K0H3pgDyJJR8Q== 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=WKxmwBZcYUaB85lNjGOBG6/oIi9lvoKXQ6kVHZp5g+M=; b=p4r1bVF0pkE8FM0EKuPzOsFccQUUdLV+koqe3AdMtA5PejrCN2NujE1rkBiKYkrQoPkC14qEBQZDNw9aoy3LpxG+VTjkpWLTZpWUDmlRF0/WKZEK6rBcFAWv/cmk3bF50gBelcF5Nl2MsUpIUsQ6G2PufD/Ic2oTYrzL1ylNlEw= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:13 +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:58:13 +0000 Message-ID: <87pm3x9m62.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Kunihiko Hayashi , Liam Girdwood , Mark Brown , Masami Hiramatsu , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 30/39] ASoC: uniphier: 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:58:13 +0000 X-ClientProxiedBy: TYBP286CA0031.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c1849bc-bb11-430f-72d9-08db9862f205 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5iYOQrnD+0RhnXKFBIdfedxAWzJVj1FqqIi/KfUAdRqcuICbfCpSWCzFvT4h2DQSpbCX333GjVvvhF0Km9K5oNSlI/FyWvkcOJVz7V3UYLFn3yhuKkKEt5rr+XbopKib3pJCcFFVkVMGjqi4FuS8rEozH3eHRALPR6JspSDtZRScWUedkBoqzAZ9Nhebk4TRz8k1G/XnLPWNfxMnXJH03QwkENBXkV8s/NWmY/mtehMd+/GvBYvmAjFi9ZhvgT+iPTFzjK4YSeBKu4omTOlzy75orheJXb8avySNTFlSn9jaEQL1K9T9xeXbyB31hygU504XBhtK68PnVpTldUN5ax+VZMw7G5vCKFh701HzA8TIG6CoYrYgtStBbFsh0chg4e/cKqiNN3NOMc/hO9WOR5slK8h/9+VueB+GtjjrONmsv80mB1cHNkxy5Ef5F9toPjQK7wyKQFLc1k9migInF+WoTW264uphNVgRCKJjk+bjMziZ0jj1O5/Ljha13Oge7iaRo7THz38X9Bfh6U/Un+qW3sxu6D+etFt/p2oef0JUePzkGiQR+x2tj7LYgZFRPEPP0QLq+FBIAKJQ10R8bic5XDwRCzniJrc+LIWakq7glMAiwG/0oEbCPcuuxk1n 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(30864003)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m6xOS+GvjMFSUCC7ApYfeelkCV/mR4xUTkXwSGHKPwdKrn8VydIxaKAbunK41GQ+B3xkt9zXByQQjs1/a9Bpe4VnGruvZamaBhUAFkYxNC9mo0Mk/BqC+bQylQrxWYr0mUDAG81kZQeqEdPDyXwhhzPSMFzdWAJGTo/PNgoq1wD/n1O4yaFT/6EV4RMmn+9MyWtZpqyOXvDtKFBCfrg04zdrqthQYZ6ktiTQfvTT+k/J0UoRUzEwndpfe3lmRAMdv3XymQEecY0epTgn8wm9d0wRZx2VOa0sB+DDuKb+ZrPqD2HxFBs+FsSQYhIxSj+0rt+U5NRbxqiEfMY/ZgiQTd7cLDk9qeyEe5S7AeEW/BvfrzAtsKDY/3OjIMSCUz9dD7qDKKhvG14udX8gWyLjfVyEVrp+0ZAax4M/chbxvBs7PY0Rzw7vsO9y4J36trl+uMVtfQfCjxigq8YQwCYrqa2hx9AIh1Zmjng1aa9TReVN0nNlCzKCmYE5DwC6KWhMR53D6KvjwC2qKnGBtA8Mfm8TFhoyc9M7+RH0I3kpn9JdOUWihWga0vopOgj1RwziPNAjQdYn0zSakD6wg/EMkaB+hji+H6KtBdCt0zVWKee5hvhe0Bzl+Vq7EU+bXL+YfQl8QI4n0VXjCJ7bCNPjRsmziHPo+3CwKSu/gO9IAMcbil0n1be03PQ57yCRuvN/fQMibK6jTK7S2lg3GHISJiYHdmFuW2a8XuYkjc9wNC6DheWpZ4C2XTL4zSA8FJk8F0/hGAtTlbkOCrc59cVe6d0lJhASrva+5YeoRfg6yqzxpZ8paDEmo93lfxom1fdvyK03uulc7oQAn28m9D4soF9wDi0lHAhjbeXbLkFOKhLpTED5dNptHGHgephaN7Tp6XvdfkWeNcFLq0u1t41YfC2fC+7toNhrfDbjWE6f6tha+etPCaehTEcCtMEfTmhzlrxSqW98095mSPViqyvleQNvSGn62bDAkP/bM3jV5eMymdySwDLdRtc5in2fb8VxMyQGsh1YVnq+0grZeEEAy9tg1ogXucoz7sjwKl8IXmE4W6+U+69HlmKPS2IyQyaEr9pIacWD9z1ooW2CKoojE7gO2W3fvg/ws+7efliIQ48yRFvGo6z2kCAoT1f5f5Tg6U1zZ57VOnvDpJj0vQt8sJiWIzSH7DQ8e32kvj5nq2cL4XloDIXuxHnDSc6E8K/xCaSXOCLA+Aeq5zY1nFmUVmcRIMzTEFGa8phAXxQo2KWsB1NATJRjMRPL+cxbID6YcCc86mfLHAr6T4GPM+czYtAHwsyxdV1mEvsioArvErEMydBH0XXTlosbV0ENKkbpErwUCxri6LuxPH0m4E5mkBiT6gYP5RZi4pJk8aWZzLnpLxxEPUfIE1qZuk3n3HfM8EtXnGN+B8iPN55JT22QINiTih1QgSgik+CTYUrce5pwrORt6K6zUzhOqyk4v78Ebp11Vl46w0FDJZ6O0go7x+lPJcokfRG0nWa5zuC4twbN13s8jVXil5ulBoQcDcHRscN8U7qKPdbqqhArrUGSBBR4YoRpoRpc1qjlLJGYst0X5kbk75C4UUk6snztYGI+FBmIdDkE/5/7QlfSdxMYlmzxT6NHdNAdBka36JhlkWg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c1849bc-bb11-430f-72d9-08db9862f205 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:58:13.8602 (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: V0GflEW7wUQLkEIxJY0Yx+Ag7P0cyGMuDbncZE7rYlLlwxcwYFbi/yk6AWVLEgjfujCFI0yYYbAkzaG0cF8el9ilY3ARzL+KbaCAHpKXSbeBZBjkRu61XXb6smGvUvGi X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: FPH6S5PO37TWJMOSIAPC36W44ZXVM4HI X-Message-ID-Hash: FPH6S5PO37TWJMOSIAPC36W44ZXVM4HI 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 --- sound/soc/uniphier/aio-cpu.c | 161 ++++++++++++++++++++++++++++------ sound/soc/uniphier/aio-ld11.c | 62 ++----------- sound/soc/uniphier/aio-pxs2.c | 55 ++---------- sound/soc/uniphier/aio.h | 10 ++- 4 files changed, 156 insertions(+), 132 deletions(-) diff --git a/sound/soc/uniphier/aio-cpu.c b/sound/soc/uniphier/aio-cpu.c index 4e8d5f7532ba..7c5188477b7c 100644 --- a/sound/soc/uniphier/aio-cpu.c +++ b/sound/soc/uniphier/aio-cpu.c @@ -355,30 +355,7 @@ static int uniphier_aio_prepare(struct snd_pcm_substream *substream, return 0; } -const struct snd_soc_dai_ops uniphier_aio_i2s_ops = { - .set_sysclk = uniphier_aio_set_sysclk, - .set_pll = uniphier_aio_set_pll, - .set_fmt = uniphier_aio_set_fmt, - .startup = uniphier_aio_startup, - .shutdown = uniphier_aio_shutdown, - .hw_params = uniphier_aio_hw_params, - .hw_free = uniphier_aio_hw_free, - .prepare = uniphier_aio_prepare, -}; -EXPORT_SYMBOL_GPL(uniphier_aio_i2s_ops); - -const struct snd_soc_dai_ops uniphier_aio_spdif_ops = { - .set_sysclk = uniphier_aio_set_sysclk, - .set_pll = uniphier_aio_set_pll, - .startup = uniphier_aio_startup, - .shutdown = uniphier_aio_shutdown, - .hw_params = uniphier_aio_hw_params, - .hw_free = uniphier_aio_hw_free, - .prepare = uniphier_aio_prepare, -}; -EXPORT_SYMBOL_GPL(uniphier_aio_spdif_ops); - -int uniphier_aio_dai_probe(struct snd_soc_dai *dai) +static int uniphier_aio_dai_probe(struct snd_soc_dai *dai) { struct uniphier_aio *aio = uniphier_priv(dai); int i; @@ -403,9 +380,8 @@ int uniphier_aio_dai_probe(struct snd_soc_dai *dai) return 0; } -EXPORT_SYMBOL_GPL(uniphier_aio_dai_probe); -int uniphier_aio_dai_remove(struct snd_soc_dai *dai) +static int uniphier_aio_dai_remove(struct snd_soc_dai *dai) { struct uniphier_aio *aio = uniphier_priv(dai); @@ -413,7 +389,138 @@ int uniphier_aio_dai_remove(struct snd_soc_dai *dai) return 0; } -EXPORT_SYMBOL_GPL(uniphier_aio_dai_remove); + +static int uniphier_aio_ld11_probe(struct snd_soc_dai *dai) +{ + int ret; + + ret = uniphier_aio_dai_probe(dai); + if (ret < 0) + return ret; + + ret = snd_soc_dai_set_pll(dai, AUD_PLL_A1, 0, 0, 36864000); + if (ret < 0) + return ret; + ret = snd_soc_dai_set_pll(dai, AUD_PLL_F1, 0, 0, 36864000); + if (ret < 0) + return ret; + + ret = snd_soc_dai_set_pll(dai, AUD_PLL_A2, 0, 0, 33868800); + if (ret < 0) + return ret; + ret = snd_soc_dai_set_pll(dai, AUD_PLL_F2, 0, 0, 33868800); + if (ret < 0) + return ret; + + return 0; +} + +static int uniphier_aio_pxs2_probe(struct snd_soc_dai *dai) +{ + int ret; + + ret = uniphier_aio_dai_probe(dai); + if (ret < 0) + return ret; + + ret = snd_soc_dai_set_pll(dai, AUD_PLL_A1, 0, 0, 36864000); + if (ret < 0) + return ret; + ret = snd_soc_dai_set_pll(dai, AUD_PLL_F1, 0, 0, 36864000); + if (ret < 0) + return ret; + + ret = snd_soc_dai_set_pll(dai, AUD_PLL_A2, 0, 0, 33868800); + if (ret < 0) + return ret; + ret = snd_soc_dai_set_pll(dai, AUD_PLL_F2, 0, 0, 33868800); + if (ret < 0) + return ret; + + return 0; +} + +const struct snd_soc_dai_ops uniphier_aio_i2s_ld11_ops = { + .probe = uniphier_aio_ld11_probe, + .remove = uniphier_aio_dai_remove, + .set_sysclk = uniphier_aio_set_sysclk, + .set_pll = uniphier_aio_set_pll, + .set_fmt = uniphier_aio_set_fmt, + .startup = uniphier_aio_startup, + .shutdown = uniphier_aio_shutdown, + .hw_params = uniphier_aio_hw_params, + .hw_free = uniphier_aio_hw_free, + .prepare = uniphier_aio_prepare, +}; +EXPORT_SYMBOL_GPL(uniphier_aio_i2s_ld11_ops); + +const struct snd_soc_dai_ops uniphier_aio_spdif_ld11_ops = { + .probe = uniphier_aio_ld11_probe, + .remove = uniphier_aio_dai_remove, + .set_sysclk = uniphier_aio_set_sysclk, + .set_pll = uniphier_aio_set_pll, + .startup = uniphier_aio_startup, + .shutdown = uniphier_aio_shutdown, + .hw_params = uniphier_aio_hw_params, + .hw_free = uniphier_aio_hw_free, + .prepare = uniphier_aio_prepare, +}; +EXPORT_SYMBOL_GPL(uniphier_aio_spdif_ld11_ops); + +const struct snd_soc_dai_ops uniphier_aio_spdif_ld11_ops2 = { + .probe = uniphier_aio_ld11_probe, + .remove = uniphier_aio_dai_remove, + .set_sysclk = uniphier_aio_set_sysclk, + .set_pll = uniphier_aio_set_pll, + .startup = uniphier_aio_startup, + .shutdown = uniphier_aio_shutdown, + .hw_params = uniphier_aio_hw_params, + .hw_free = uniphier_aio_hw_free, + .prepare = uniphier_aio_prepare, + .compress_new = snd_soc_new_compress, +}; +EXPORT_SYMBOL_GPL(uniphier_aio_spdif_ld11_ops2); + +const struct snd_soc_dai_ops uniphier_aio_i2s_pxs2_ops = { + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .set_sysclk = uniphier_aio_set_sysclk, + .set_pll = uniphier_aio_set_pll, + .set_fmt = uniphier_aio_set_fmt, + .startup = uniphier_aio_startup, + .shutdown = uniphier_aio_shutdown, + .hw_params = uniphier_aio_hw_params, + .hw_free = uniphier_aio_hw_free, + .prepare = uniphier_aio_prepare, +}; +EXPORT_SYMBOL_GPL(uniphier_aio_i2s_pxs2_ops); + +const struct snd_soc_dai_ops uniphier_aio_spdif_pxs2_ops = { + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .set_sysclk = uniphier_aio_set_sysclk, + .set_pll = uniphier_aio_set_pll, + .startup = uniphier_aio_startup, + .shutdown = uniphier_aio_shutdown, + .hw_params = uniphier_aio_hw_params, + .hw_free = uniphier_aio_hw_free, + .prepare = uniphier_aio_prepare, +}; +EXPORT_SYMBOL_GPL(uniphier_aio_spdif_pxs2_ops); + +const struct snd_soc_dai_ops uniphier_aio_spdif_pxs2_ops2 = { + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .set_sysclk = uniphier_aio_set_sysclk, + .set_pll = uniphier_aio_set_pll, + .startup = uniphier_aio_startup, + .shutdown = uniphier_aio_shutdown, + .hw_params = uniphier_aio_hw_params, + .hw_free = uniphier_aio_hw_free, + .prepare = uniphier_aio_prepare, + .compress_new = snd_soc_new_compress, +}; +EXPORT_SYMBOL_GPL(uniphier_aio_spdif_pxs2_ops2); static void uniphier_aio_dai_suspend(struct snd_soc_dai *dai) { diff --git a/sound/soc/uniphier/aio-ld11.c b/sound/soc/uniphier/aio-ld11.c index 7b3cf5d751f6..15dbded63804 100644 --- a/sound/soc/uniphier/aio-ld11.c +++ b/sound/soc/uniphier/aio-ld11.c @@ -188,36 +188,9 @@ static const struct uniphier_aio_pll uniphier_aio_pll_ld11[] = { [AUD_PLL_HSC0] = { .enable = true, }, }; -static int uniphier_aio_ld11_probe(struct snd_soc_dai *dai) -{ - int ret; - - ret = uniphier_aio_dai_probe(dai); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_pll(dai, AUD_PLL_A1, 0, 0, 36864000); - if (ret < 0) - return ret; - ret = snd_soc_dai_set_pll(dai, AUD_PLL_F1, 0, 0, 36864000); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_pll(dai, AUD_PLL_A2, 0, 0, 33868800); - if (ret < 0) - return ret; - ret = snd_soc_dai_set_pll(dai, AUD_PLL_F2, 0, 0, 33868800); - if (ret < 0) - return ret; - - return 0; -} - static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { { .name = AUD_GNAME_HDMI, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_PCMOUT1, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -234,12 +207,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_ld11_ops, }, { .name = AUD_NAME_PCMIN2, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .capture = { .stream_name = AUD_NAME_PCMIN2, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -247,12 +218,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_ld11_ops, }, { .name = AUD_GNAME_LINE, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_PCMOUT2, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -267,12 +236,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_ld11_ops, }, { .name = AUD_NAME_HPCMOUT1, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_HPCMOUT1, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -280,12 +247,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 8, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_ld11_ops, }, { .name = AUD_NAME_PCMOUT3, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_PCMOUT3, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -293,12 +258,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_ld11_ops, }, { .name = AUD_NAME_HIECOUT1, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_HIECOUT1, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -306,12 +269,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_spdif_ops, + .ops = &uniphier_aio_spdif_ld11_ops, }, { .name = AUD_NAME_EPCMOUT2, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_EPCMOUT2, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -321,12 +282,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_ld11_ops, }, { .name = AUD_NAME_EPCMOUT3, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_EPCMOUT3, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -336,19 +295,16 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_ld11_ops, }, { .name = AUD_NAME_HIECCOMPOUT1, - .probe = uniphier_aio_ld11_probe, - .remove = uniphier_aio_dai_remove, - .compress_new = snd_soc_new_compress, .playback = { .stream_name = AUD_NAME_HIECCOMPOUT1, .channels_min = 1, .channels_max = 1, }, - .ops = &uniphier_aio_spdif_ops, + .ops = &uniphier_aio_spdif_ld11_ops2, }, }; diff --git a/sound/soc/uniphier/aio-pxs2.c b/sound/soc/uniphier/aio-pxs2.c index 899904f7ffd6..305cb2a1253d 100644 --- a/sound/soc/uniphier/aio-pxs2.c +++ b/sound/soc/uniphier/aio-pxs2.c @@ -141,36 +141,9 @@ static const struct uniphier_aio_pll uniphier_aio_pll_pxs2[] = { [AUD_PLL_HSC0] = { .enable = true, }, }; -static int uniphier_aio_pxs2_probe(struct snd_soc_dai *dai) -{ - int ret; - - ret = uniphier_aio_dai_probe(dai); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_pll(dai, AUD_PLL_A1, 0, 0, 36864000); - if (ret < 0) - return ret; - ret = snd_soc_dai_set_pll(dai, AUD_PLL_F1, 0, 0, 36864000); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_pll(dai, AUD_PLL_A2, 0, 0, 33868800); - if (ret < 0) - return ret; - ret = snd_soc_dai_set_pll(dai, AUD_PLL_F2, 0, 0, 33868800); - if (ret < 0) - return ret; - - return 0; -} - static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = { { .name = AUD_GNAME_HDMI, - .probe = uniphier_aio_pxs2_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_HPCMOUT1, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -178,12 +151,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_pxs2_ops, }, { .name = AUD_GNAME_LINE, - .probe = uniphier_aio_pxs2_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_PCMOUT1, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -198,12 +169,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_pxs2_ops, }, { .name = AUD_GNAME_AUX, - .probe = uniphier_aio_pxs2_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_PCMOUT2, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -218,12 +187,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_i2s_ops, + .ops = &uniphier_aio_i2s_pxs2_ops, }, { .name = AUD_NAME_HIECOUT1, - .probe = uniphier_aio_pxs2_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_HIECOUT1, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -231,12 +198,10 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_spdif_ops, + .ops = &uniphier_aio_spdif_pxs2_ops, }, { .name = AUD_NAME_IECOUT1, - .probe = uniphier_aio_pxs2_probe, - .remove = uniphier_aio_dai_remove, .playback = { .stream_name = AUD_NAME_IECOUT1, .formats = SNDRV_PCM_FMTBIT_S32_LE, @@ -244,31 +209,25 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = { .channels_min = 2, .channels_max = 2, }, - .ops = &uniphier_aio_spdif_ops, + .ops = &uniphier_aio_spdif_pxs2_ops, }, { .name = AUD_NAME_HIECCOMPOUT1, - .probe = uniphier_aio_pxs2_probe, - .remove = uniphier_aio_dai_remove, - .compress_new = snd_soc_new_compress, .playback = { .stream_name = AUD_NAME_HIECCOMPOUT1, .channels_min = 1, .channels_max = 1, }, - .ops = &uniphier_aio_spdif_ops, + .ops = &uniphier_aio_spdif_pxs2_ops2, }, { .name = AUD_NAME_IECCOMPOUT1, - .probe = uniphier_aio_pxs2_probe, - .remove = uniphier_aio_dai_remove, - .compress_new = snd_soc_new_compress, .playback = { .stream_name = AUD_NAME_IECCOMPOUT1, .channels_min = 1, .channels_max = 1, }, - .ops = &uniphier_aio_spdif_ops, + .ops = &uniphier_aio_spdif_pxs2_ops2, }, }; diff --git a/sound/soc/uniphier/aio.h b/sound/soc/uniphier/aio.h index 0b03571aa9f0..09ccb47337fd 100644 --- a/sound/soc/uniphier/aio.h +++ b/sound/soc/uniphier/aio.h @@ -306,12 +306,14 @@ static inline struct uniphier_aio *uniphier_priv(struct snd_soc_dai *dai) int uniphier_aiodma_soc_register_platform(struct platform_device *pdev); extern const struct snd_compress_ops uniphier_aio_compress_ops; -int uniphier_aio_dai_probe(struct snd_soc_dai *dai); -int uniphier_aio_dai_remove(struct snd_soc_dai *dai); int uniphier_aio_probe(struct platform_device *pdev); int uniphier_aio_remove(struct platform_device *pdev); -extern const struct snd_soc_dai_ops uniphier_aio_i2s_ops; -extern const struct snd_soc_dai_ops uniphier_aio_spdif_ops; +extern const struct snd_soc_dai_ops uniphier_aio_i2s_ld11_ops; +extern const struct snd_soc_dai_ops uniphier_aio_i2s_pxs2_ops; +extern const struct snd_soc_dai_ops uniphier_aio_spdif_ld11_ops; +extern const struct snd_soc_dai_ops uniphier_aio_spdif_ld11_ops2; +extern const struct snd_soc_dai_ops uniphier_aio_spdif_pxs2_ops; +extern const struct snd_soc_dai_ops uniphier_aio_spdif_pxs2_ops2; u64 aio_rb_cnt(struct uniphier_aio_sub *sub); u64 aio_rbt_cnt_to_end(struct uniphier_aio_sub *sub); From patchwork Tue Aug 8 22:58:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711591 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 3E9D2C001DB for ; Tue, 8 Aug 2023 23:04:41 +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 38CC9EA0; Wed, 9 Aug 2023 01:03:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 38CC9EA0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535879; bh=uKfQyNc5+62XEquTEF2+VBOVmFrTfXLXfXLlhKy3QUM=; 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=IBXq1ItYuWNg+0RvD5rubdeF0hoAOZW3wIXoqm+mmsV0hC8R4g3WuKN6SvAmSnKwa XOwXPi4d7a+1BBmqUYKQsKlWV3ZZjEFFPlTPD2D+mzmVBWx10UVzdsdW24G/9xFOB3 PpuyBU8J4/D7mMfH2DcgSqFh3uZnPT2R6oO/xf3o= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C7CB1F8069C; Wed, 9 Aug 2023 00:58:31 +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 E7DD6F8069C; Wed, 9 Aug 2023 00:58:30 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 28BEDF805E1; Wed, 9 Aug 2023 00:58:25 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20728.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::728]) (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 EC2BAF805C8 for ; Wed, 9 Aug 2023 00:58:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EC2BAF805C8 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=V+Dpqqy5 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qcwtk2jYXJz8+JO0X+slNRyZ9vVahNgJ1N7A2NBEVaQUwlEBoCNW0kzWeMjqW/oLxHvykqnolCjwpOh9P3Pbb30wh16F45uiBkKXonaZZR6g+E7/0TS/npSz1N3eVXj6BpirR0xMbhfMOO3h4tnnzDhvDiVlVKyES6wz085knNcjqXW0gNPpFSesZR2sCKPzwO7XLEICdq/eQhCtvSOxEJfv/wZjYHvhY3dtAzUzV/JrA4SWldydpO6WG57vqszPCEGIjbEMJB7oTSBwyGBcGWIuy522JB/R6m9a6+JOm24HqRl7rJCJXtOcm+/MQlHLVgpHCXenftJXaz2qgJ4xzg== 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=Zx7A86ORWQdai5Gxgnq5CDVJExNDHfiIR5ac/Zen4FA=; b=I0GkPLpPMilpAS5Bl/0PUNzDpMhu7Gji50k7CLNFVKs7TaO1OJ2DKXJB8899V3cU9WxuQGJY2ZmDweEmWkWJ9tvnVvMNJGYow5keJgnelJrY2SLpkoN6QK7wMCq+s+jJ8IA7PYX/T8dGGXQgSjr4ELJ0j1W3AmeABphDPPm3/CoQYYDrWFqoSQBVTvmi9wAwakMn2lQkHaDNBAuG+7Cgzuj65QKiHlmXOQuWU7HsMLHehEmQdDcXw56YEb9Phg7IFHvLkYpQUjT5ZQ7LX4srjKfypZLDaxnpFGMWpOir4r8RvyvNa9XZLm6YIy64W1k2xIFWFv7OfSySwKwOFlcy+Q== 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=Zx7A86ORWQdai5Gxgnq5CDVJExNDHfiIR5ac/Zen4FA=; b=V+Dpqqy5PalPgGiN68ebJWIqMvApSmjJgpdxpsn6n+mKh9Bf4V903+r1Awu0SvcnjklPY7tG2FjKnYR94KGrVyVpv37DA46zT7Htlm6G8VKex2lC4U8xhs/XRnkNiiC0lDWlV5yWx4CXVooWAe5zMTm9RzKccKvZcqvjoBWvdj8= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:19 +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:58:19 +0000 Message-ID: <87o7jh9m5w.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , Yingkun Meng Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 31/39] ASoC: loongson: 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:58:19 +0000 X-ClientProxiedBy: TYCP286CA0080.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 67f9f4cd-9485-4c7c-5b77-08db9862f583 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lEhUelKTX++cD7vhjoE7nWEgdo0eAbDrjJO+Advr89tvMgRlFiJlQJ4mUVtO6sp2VVOZzUSAi0KyBTb/65DmlXD7ZzkaGbNDwzukBtgU6B3G4CJY5+oKyQRjq7NI18CFeCDYt3q6AIP3GVbnsfatUv8ZdxvTUdWft04dgKKBvMPCzItVLUfcPkdeUX9PGZ7CVEccb4sMjCSoWVJBVdTlfryR9dLA5tB/r7Kg+wsQFj+zGwwRWzkMlUhzDky6vIwsry1YU9kSmythT6Qbw4DzPcIJvzYpNqhX1Ilk4w4bc+wo6a3ByKPBdcUV05rdy2PUUzDO8mVAGof4Gk/zNDHr+Ms8v5lZiT9ceKuHONQQAGibLZL6dMekXGqTNNZhBuj/is1lsFTtWE/TQFtWay4QsbbUhm9+dHZ8sbUvRTKPPu4PjrlGcWRkDBjTge0deXX7GtZUWVrZxzBEF/0u76P+nnxrrnsHbCTXzrN+FsEZCPnQIGB8rJK/vhLGDPQnRdzfQuCyISTBJGhhtKf0CeNJbNR+gWIah/GCEFLNi8vHC+hrg/Q56WQInJRbG0hzm4JnA4ibnqCBCHogyM3UsbAtha5I4gjdBlYrUwIt+jtFuJv7puH6KecwUzEX22j+nTIG 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QSBtCBBorTQE66i+yHeIxB4b1DvOQH07mAzcBQ6WV6MaNAR1tJV3cvp6Au7QqtKvm6avRHVO0LJ6eenOq1JYLtvb4UFj/Tx7HU3Uo6Vfmcw3Fm49Wk2YYje99G3bhpaslyyPQQk4brJR2Oh77gJN2+seGymqDOuMc5H9pCZlPytKj5N1tBqGjOvIGO6rbNWogN42csmc/e4LHvTrEiMhcQvW+AJvhHypIGraRGuNTKXExxIrE3m9sGbtXTXMFei15N1BNOuksA23gUf7FDiljzdLkakjnJB4Getq6E2GMbQip3d8w3FIno5gKXM3D7rjiA+bWAEcS+z26euNKEywjq0MBHJfQtKQVRv4TKVs8XY928tgDr7RNGROFsNBEgjf91Eo1JG7ZqM2R7OmuxLy2yv8Io1cDTFAPM3jnfyLQjJ7zXP7tNw4J99CwV5KBy0DPDh8I2V850B8+eOO8z7/3i1gKV9D8czWv9PlTZpMfqT9OYGMHCO8BKSblbaAhmaSd+Mp/2KZXHkvQ57+omVvtdCwD080lKkK2XS/XvQpUenlMUjWEjQe/4ECNZgO50z0omqGvfKu0z2NujCO1XVirJp+xIBWRORXAyr6u6zOS0f2C1HWYhZhER25QE4s73e1O0/y68BTucKd2EipOjx+c1YOx+rXlYx/S8L6NgZqraYRWXMlTmyQCPoSh59wq9/8Y5NmwAv5JgaSnQcb1YRn6dnDMwBPzoOv7fsdJIqYtkYHTTNF98bnwbf/KexjiSSZwjfhRBd7pBHktD+QqWmzxvKwAHBuBMVXzIUkc3kTnWer5+kUW48SVHEP6oKeCBAYYIGVgKvTeuUYbYrLWmy9qvPCu04F6h6fQ7E0wdJ7EVz7f012jVyTfbx8IOd/4cNWE+FWB8JxGQldP7cHI506k+66eRllCOTDqqxLlvvvDpkFVtiwf1o9Zs5rms+u1gT+EKp7T7zUXDwOp9fBU6BkxJAwy4mNe6fvM6RWt8ymTHAA0iqIeyvuyLYZ6s2wtaESS0dhak3sZ+7ZzDGpPQpFFzpXdLib6kxq+u/wU+nS1JOZTYGK9E9YP/imWepRwbTs+SfsHZgUKeKeBaKKrW0VdExPsKeU06+eGRozYsZVpBJhR+ffh7Aqp0N71w/9qN8gLbFoMvXQrzinLyM6TfVcKCfKYK+kiTU0JaQtjalz8aBxUdti/h8aBr3cgPicPTIrRuFR+XWOHPaJz/rlLb61dU7xLHwEb86LGWgUrgJWzRpFxhCr9mPWPnMpdLcutiACuF/Rt1MTUtKPWsFCB26qC+K/ApIVhmgirkbH+hkbenl2mdc6n4/gAN1Tl6tMXYrpoJcoV3xsTrSo/2KX0pkEAow0hqrHwWIl/43zm/ocSJUnwrVwFs9E4wIa0oz+nAy26ndvSH/X14fpFsFXHXXBUGpu+m+RZ5oem4EAVXbF3MvwbiFIDidGHkZinI1f3l1ZbCZaWlg7RXXaEJ2BBlyIFEiqpBxuc5MbInVrEMpsA6bnVTiJsjzuGG9ykDwZSnkyLW08YWtZ0kzyf+nvctY1/xBEJH6hArxlA9PEcKDL0QEZYpKcWn3j/h77iJljc6YxMf1zSPxcdM1YKZfFrvm7qM9/Zo3aNNdWbGx0KaIUs2E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67f9f4cd-9485-4c7c-5b77-08db9862f583 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:58:19.6979 (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: LnDuC49o6nUe6d5MaZNPzQ6RYr659AdusPew6uL6rF22/p/2PQUGZnCkN4aJwk8rP9PK9KSWb+rcBWR/ULu2Er3KBZhdq3BrYrJ8ufbRdLIgiRBFmnkXeFBPvHju3Lbx X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: QMTW36RGJ6MIAV66JAODT5TUA2BWHRE5 X-Message-ID-Hash: QMTW36RGJ6MIAV66JAODT5TUA2BWHRE5 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 --- sound/soc/loongson/loongson_i2s.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/loongson/loongson_i2s.c b/sound/soc/loongson/loongson_i2s.c index b919f0fe8361..d45228a3a558 100644 --- a/sound/soc/loongson/loongson_i2s.c +++ b/sound/soc/loongson/loongson_i2s.c @@ -204,13 +204,6 @@ static int loongson_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return 0; } -static const struct snd_soc_dai_ops loongson_i2s_dai_ops = { - .trigger = loongson_i2s_trigger, - .hw_params = loongson_i2s_hw_params, - .set_sysclk = loongson_i2s_set_dai_sysclk, - .set_fmt = loongson_i2s_set_fmt, -}; - static int loongson_i2s_dai_probe(struct snd_soc_dai *cpu_dai) { struct loongson_i2s *i2s = dev_get_drvdata(cpu_dai->dev); @@ -222,9 +215,16 @@ static int loongson_i2s_dai_probe(struct snd_soc_dai *cpu_dai) return 0; } +static const struct snd_soc_dai_ops loongson_i2s_dai_ops = { + .probe = loongson_i2s_dai_probe, + .trigger = loongson_i2s_trigger, + .hw_params = loongson_i2s_hw_params, + .set_sysclk = loongson_i2s_set_dai_sysclk, + .set_fmt = loongson_i2s_set_fmt, +}; + struct snd_soc_dai_driver loongson_i2s_dai = { .name = "loongson-i2s", - .probe = loongson_i2s_dai_probe, .playback = { .stream_name = "CPU-Playback", .channels_min = 1, From patchwork Tue Aug 8 22:58: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: 711967 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 A5051C001DB for ; Tue, 8 Aug 2023 23:05: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 973F51E4; Wed, 9 Aug 2023 01:04:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 973F51E4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535898; bh=8DDA3ZsEcpUYfitnGsBG1GKt3dHMydxb6pRV33K9gJw=; 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=CNe8NqoDwHMCJFXHT9gbB/0EnHAXhqf4uhrSpZNDVuOr0Z3oOCa1OzJEDsAYMnUHn c0nQIuG6vJb7sLIIHKnMMtQ+78zh5TWknjiGf/KQShK6+jT753t4Fh+GwXqIo7m+8d Eg0cuPjiqYRReZ4Il6N21pBEsbJOOgN347LVkRZs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4AA00F805F0; Wed, 9 Aug 2023 00:58:36 +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 D6093F806A4; Wed, 9 Aug 2023 00:58:35 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A6063F806A6; Wed, 9 Aug 2023 00:58:32 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::702]) (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 398AFF805F3 for ; Wed, 9 Aug 2023 00:58:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 398AFF805F3 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=GLHZu3Io ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PDZKrKyFSaGqI9yGIr/6/5F1KQvuOTAk2bqkWNi+4I7L5LjREXD1aLtfc87qdDqXOkget3RuKEK+95FO9DqxgJ9UUkA8T/6X6jFDeBqhFriAXc4shXsRoG04Hm9LzzcM/artnH+s7VyIzV1B57q1zVif+bzZppU75IIW/Yjhh43HvcvgXVC4Q2ynd8vcOM0K9+YyZjcmNnlgiihaMQYCIMv/nmN20L1smZRMapO9lJt7zkdIKzToUoUF1kfQbvhiNv2h9nFt6Yz6lpoS7HpwEMGysYoGANdFAXCEKKdLd/W98+Iq5nsh5CA4XDbA3hhXPFU/TfcV0zqkkuejtpyHcg== 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=dKq6T7FRjRttJRqu1BgCjKuUzmLPhsJ1iq8fEzEzPZc=; b=TUkjPmDaYtrKxeWWd1Qzyl1Gok0RdXJ0SGBAgrze+fPoO0TQy3hPw6ITpGW3ir9P5PKm0DPVhpnnG/7b7wYtOUvdyRU7DU/9t77ZQvSGfFmum54UIerbpXZnDMJ2sYenho/jRLuH0dMwOTRK92bDSuOAkQHciekNfsXoG1WRpgLa2D8INhFmo312PVJIdHT4fVH3A9lISFWt09QmujABjFDoVuTibx+fhyUm6K3+fJ2A759rVvDBltIHHY2VOICVob5g+aP+JLEswZsuo0ynjV3pwQ0u9w+AD/DaB4yjz9hSFpy0PE6H230zVqCRwdi5VbTjsWH1A9ieSBK1M/lc2A== 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=dKq6T7FRjRttJRqu1BgCjKuUzmLPhsJ1iq8fEzEzPZc=; b=GLHZu3IoaJ4vizHWHRQHG0NStZMVUPJrj5W887HIB3wt40/3HemC15XSxCgVyDLMry5Q7HKxx+Ipg/RMpTKiFO5RVkM9ShCCXNPqLpPgDmIPReg/KncKykrv3Zpvpqh0JtOFnoCZVpJu1Jkf0aCkYJPb3NcNQy2plxs8zWfEBSo= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:25 +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:58:25 +0000 Message-ID: <87msz19m5r.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , Walker Chen Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 32/39] ASoC: starfive: 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:58:25 +0000 X-ClientProxiedBy: TY1PR01CA0184.jpnprd01.prod.outlook.com (2603:1096:403::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: e776f855-db00-4c3e-972c-08db9862f8d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I/3kztJ71K/E/nx/P4/G5nckj35k7NPJ+FG/W3LHy1vRi57x3oq8ximX9UwYYpOaVzYYM5N62iTAS6laXN9J36c8q3YSimQc5UjRXyX//95iprG6c1q1EgD7NlU8nWDivUVN8fzl1LdFSMVtaDnvdrd8R+sZTJI3WwWsLBnr1z7J1EWo31otO+bkyr/upp1tcwEoCUi7sUK46MiA4RH10wZOiwK+OVHgmXYkp4FvO5/aIQsmO9Uc2q1O7xnqnOBBe45OaEyQVSfYtbYCuwO0yYheceob1lB3PttynfVlmcuX8EB0pTafgEvJhk4dnETDoEarXU9ww70KzSqfhcFAQu5OR+1HvAk/NDc/5sVT/Irbmv9PAYzogYq6dWyv2swSuShloX4/Uwo9Q+nJSXndNlPE29OXA7NreZLKTHPo3J4m6zV+2S0qbwDcZPuV8Ee7LmA6kA5PJnw5B/MvXQUTdIrzFDP+BtvY13TZW1qkDK+dxH410UdrxRS8H9y9a5tBvRBpfW9L8HzpXzWNlXeX1MuMJfxGfNKs2OF0jQ4OZuQ/h1D1kBq18RBO31fQnnzNWNJFWoJeuPJMwfqepxkKH9zYjp/cdV6mbYYvgoo53HD6OqAUbMzHNYK6EDsjTYeu 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0A4IPGraFfgC/ZgPCTw6JXfCPbc0dNvujH9A/GrawBfjerOrISrsHFd07CvcKStNyyFczrzqAXR39Kow6T1r1C39AIwKKAYsmLBo8wQcmuNUT6jgw6sUW1uZ+pWO5foVXNGyuP117KaK3MM9TGZ2OyCKrfMBWcxDxT73OKZKaO7zXHtW/ZBnfZnAGVt3m3GkuMUbKfrChlA8JLj+1krGqX0GfKNJDU3indBLJRX2e/23pa9KK8PBXTjeFCPI3VN5RkkhgQH3NfIZ1zVCJ56aXXueLH1ZbAHK2KbY17aM4AFwVsuKZPHlPENSf2oG7At3I7FgXSJbIxvsD+IGGnrGktZwYRJIxdbYiDreSY16EyRqC0Mua06lSvsSQXabMAdNejHYo491At5k77+KlsGQH7dH/Zey4QUH7tPf46zcBZuNMG0t/lI5hi6tQUvBjlH8P/IrRQ4A9hkxzbDsbG30AY1XqS3iKDHiqlv45MTi4Vu8UHLv8lm2lIf1qlNLGKkTLn9eXzn96zgZt4cP/LVAe+FcmiMtt1aOvB2bktdwCwkBKAoHDheUodUbMh9ZFWCNWlinsd640jOi3D3WZPjjshgRvoeF5aHUvK0ROx9VO+SO3nFloQtCsJo4oy7n0e8Wv/GRuMSsU0cY0UDfG22xcHZnQfSJL4w56p+8iqeigFZXDJvpPsQC5Bo9ZvXzVzAfY9dZ4CVdXNZRSPdNLm1NXkLcHAgcNjx2mh1/liaVYezgdkgCgWSeBSTQtutxQPuv+46yRJmjeGq9GJ6t8bjBTwBB43tYZYZX6QE9LHunVOMRlCuXSpPPBa8DRQC0o9qW6s0entxWXB8NUZrX8Z0uKkqaw71k6I1yJnaDB9KYtotqzhrt2dU0Dmbqhe+vtObH0Jcc23+IDi7nt7SksZX5RFoZkZ7HPhQTgcCl/6ouiWgTbVEUIqPDkR+L/KkgWDOJg0Ok5mQ4tJu1Efg9B486GkWsjVgDiuatzNUx3/Ec829Jzym4NGRvfE07yD8Eb3wMEN7D+1+ctxPbydrJRwFRn4jDJrZhbTwigc49kce1sMoTjHKhDlNxZZffaJm5AWjYZsA8u1EUoOqnMs9T2VtehGHLDZl7yM59ju/LUSnIcrZRQHNHyDNj6BY+PjNBDMrtJHQxqE3M/IdYRLZuZMmeiaFtxOXSeUBeHm6UMnsvtNCN5IDaBL0oCYIPz7rvyQW28pude+GiDMM8U6yUTufzax1WKwMTI81Xt8taZUWra2oh8J9G5DJRfcU4n2l2lmAHleSh4f2xrdGd0tIMb1fPG0zNkZvvE+rDzCHO0C4fGdvzQ8iqZ+qnBe3yjX6e3yG2H1LcfJdgAaXthwjvgdLtSjBiY3R/xsty7PmsgGPug/PdF67R79dKobNNBMgUSNE0IfbP5GWu9ganoMQEYDvY3/1tpD3zuv/3/tXYnqSdV7p8SpmUAKBRzBuIsBvTaI0VqY1UizagF7fj8nYzcPf6g7PufHYL/IOXq+bQZTqx8Jxd9x66xVhFqk/2Vw7Un+VSvYoC+K859zQm6HsOawLA5jqo+QM6gsxVXy0tWeD79KJEfuiYPWkD/A7s7pIbWcEw7wDq/peBGh90lYt8hi29INwU+hx+eXt/DuN1HRC3qgg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e776f855-db00-4c3e-972c-08db9862f8d1 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:58:25.2523 (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: 7ghNDLznbikPhfRQB83Kt8nCApHeXqCys57vBK2t2qWrg3yzosgzp5UYCKE1BYiUxsiEgiFbpTUetaDKuuSJ8oUURYkNUIW1c/xv4/BztFMkqVrdSiSFh07wyp29YG8B X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: EFFCHW3T7MTEUNXRM4WIKJJSGK2ABJZP X-Message-ID-Hash: EFFCHW3T7MTEUNXRM4WIKJJSGK2ABJZP 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 Acked-by: Walker Chen --- sound/soc/starfive/jh7110_tdm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/starfive/jh7110_tdm.c b/sound/soc/starfive/jh7110_tdm.c index 705f1420097b..8c117794b028 100644 --- a/sound/soc/starfive/jh7110_tdm.c +++ b/sound/soc/starfive/jh7110_tdm.c @@ -463,13 +463,6 @@ static int jh7110_tdm_set_dai_fmt(struct snd_soc_dai *cpu_dai, return 0; } -static const struct snd_soc_dai_ops jh7110_tdm_dai_ops = { - .startup = jh7110_tdm_startup, - .hw_params = jh7110_tdm_hw_params, - .trigger = jh7110_tdm_trigger, - .set_fmt = jh7110_tdm_set_dai_fmt, -}; - static int jh7110_tdm_dai_probe(struct snd_soc_dai *dai) { struct jh7110_tdm_dev *tdm = snd_soc_dai_get_drvdata(dai); @@ -479,6 +472,14 @@ static int jh7110_tdm_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops jh7110_tdm_dai_ops = { + .probe = jh7110_tdm_dai_probe, + .startup = jh7110_tdm_startup, + .hw_params = jh7110_tdm_hw_params, + .trigger = jh7110_tdm_trigger, + .set_fmt = jh7110_tdm_set_dai_fmt, +}; + #define JH7110_TDM_RATES SNDRV_PCM_RATE_8000_48000 #define JH7110_TDM_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ @@ -502,7 +503,6 @@ static struct snd_soc_dai_driver jh7110_tdm_dai = { .formats = JH7110_TDM_FORMATS, }, .ops = &jh7110_tdm_dai_ops, - .probe = jh7110_tdm_dai_probe, .symmetric_rate = 1, }; From patchwork Tue Aug 8 22:58:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711590 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 4CF9BC001E0 for ; Tue, 8 Aug 2023 23:05: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 80AB1E94; Wed, 9 Aug 2023 01:04:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 80AB1E94 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535918; bh=2pEQHopeuU9Y7nDeCsOU85jN82H4WeP4ub6trDG/C1Y=; 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=XrPZSju0b8Q7ppTHcbfUhhmHOmIfxlFISeKOuC7XxX7JNhdwCrSbwTT72cvyjvLU/ YElEnomrqEykmC5OcpPhZdhcJ0QQ9BKyCPGs7Y4wKkXujTzS1NVhDtQ3HQLVN4Lx96 HQJnWUz2nYYAPPBaeaiF+labFn3/uXFBUUm+OMxY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 00ABBF805E7; Wed, 9 Aug 2023 00:58:43 +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 8E86DF805E5; Wed, 9 Aug 2023 00:58:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AA066F805E7; Wed, 9 Aug 2023 00:58:39 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::701]) (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 7B62FF805F2 for ; Wed, 9 Aug 2023 00:58:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7B62FF805F2 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=VOWe+T+7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HOUR7UJqYWNq0l1BzZKHj/eB60NG03RiXV4+uxrJs9yMArhMJV+gLkBWSy2mU11bGlNIRiwUJsBkXImsGwCGfY1mWuPhC7nWp0r+1cQr5ZGuN2VZAUSrhsVPmevivluhfT3F7ibBIsD7HGHPKrHPO1S59QWaO2nt2EvAmzg9C96Y2tEgSsxxuf9ARmvh8B14AMAGm22tOUfA/GLCFS6A08SbltZt4cLiKibxh8SknIaDXQ0rB8D7sxes471i+DeFDwYJEWIRK6LB3QIeVjnVYAPc06Hfmjhtg3p66Pz4v1s4tjSHm2iq33ZA00L8c8RhAcn15LnuaquJDEUSE8/agw== 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=39sKBHF3W+R1Hb50KD2+MC6AWxkxd8CDJ3zPAkda5Uo=; b=dPs31UixBs2PA0p+JpGNvbZSr4opGFE9NAoCVqk0sJAbdRfyqA3OP6qlVnmd4TXC0apCZ+EZqS3u/6cqFpj4yAM1gAVy37A/SNnMVcZIRAqypGm7krQhkpEXRxfz/238sdYFAxjToSWAO++uwOJXy+wEng7qicnZPNQGTwQbw0XRXIGPnYH15FK52i7Hmi86BKrTfH40DcojF8alqQ2k3VDzUENTcLW6eGqVI5r+M9rF5FwQEAFdP1fdCAgXtd0W7ZOUz5H/k0Ro0VAxS/bnTcfioVCPC4LtO12geO/bLQOTFIp/UvUoGWCaHdSs4diZtQ5T/Ua/4PiOLG5nObtHxw== 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=39sKBHF3W+R1Hb50KD2+MC6AWxkxd8CDJ3zPAkda5Uo=; b=VOWe+T+7eY5xnFJSn821W+s/qXoKxPfF0COamq2opYu7ip9Oakbe9JVRnkeTC4+TmCash5lvOEMcKgq15Nvzjch8wgseTOwnJm2gKmLTbvW9ttEepFbz1gPkasTkIx0x6o7foyyDF0nS1ias0US2u++BpuavEs66N6AkC7WbjI4= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:31 +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:58:31 +0000 Message-ID: <87leel9m5l.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 33/39] ASoC: hisilicon: 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:58:30 +0000 X-ClientProxiedBy: TYWPR01CA0016.jpnprd01.prod.outlook.com (2603:1096:400:a9::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b69da60-0528-4e46-7fc8-08db9862fc4f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qvcv/ARUdfmRrHjxW7VrLVQ+GlEL/QLJk9rQeEY1c3aU6GuY2JWuSAgQBIgVsEAAzst6KqXXVqXsqMwbSp8BQPVgdAk93kL+erLftY2DQxB9gGyLYL4BT33MJ+PnkL3L/We7YqlWascyNmg1joUbRX5oj2EaQ15wzu30eMqS5f8JKj8LweANzRDzsXjxB52lp1ZqBimoQW8KhElRGjvPtefK57wJiirrSuz/LLdZqlSHz5mRa8LB31LajA8gY4smwVw6KSs1VyGqKoXQoI8/k4yyt04O1EXnyd+mPXa91zXShWyIoS6FkBA2GXnpIs2USsFpU+So0qZIR6nRGQkYVqoEpdCxQb0I+vS3QUpqkSPZW1PC/TmxMhYsxRuFLWdCebSp0c94gMO91kzmccHdme4ByPCwMj69DXARmnLqQq1rAA80GFT7b0/1WGeKdk+AIXDH29ZH/rMCFwozjFsqyN4mdtTFFybZcIKpmHoiPjGDDiG4HMS3XL4gU/IE5MbeLR9hEGUZGtgRkkYFJ3AaYCMFvcEJGoOjYcPCV43LcxxHxB38UsJYukddsAXj/HUy/I6dVo9LjjKNVgc8puqvI/1L0IrpqeSkGu9KjphRKrOvrEFxrvB7ZxnS9ZbPULqF 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(4744005)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F/MK2E58/DDOwYSE62jCtZ7Q9PKhFlgFB06ixZvu3Z9bH3GOn2ZiPh7kQ8HjRT9f8x6N3DgD/Q5LiQ+S65VR278l3fRXQprRcru6hIQnMPMwFKOPuQY4VXRWhNpHAhjkgsyl7p3/OBUFs3H6mABErvihcFdFwwvpPc9oAdvgs29MSd8+BgXKqxG+zQRM06aL7q1GrhiRQgBcOUQ2r8/4I53szv9ZCNv+YsPfvychu3eRmuaRozvP5rHcCUJMU77LdUAmIFnUcWDnfJbvFx+xdb5/11qVf5IJPoxkw1ciOabadJXqo97Ku/KbfFkOvo8XAGxOjJd+IBWqZlN56mDphuHwv8d9csrv3HLvhlHADcom1iPTiiNvnM7O5MPGfUKPAp1YEA5wOi2TDyvGrFMgHR/h8iu6aZBMU/TFK5HnIoow09nOdfj5zHx7HUifuKOpONkEq5davoJAmd6D0AzEpGYxC7G6924u6PutGR995xjalCsVpCEQR9GoILqqA/J3SoiDMZfnIIPCjyEcFMwNos2hZ+iA4VdFde4wGK7E0LpLs6jbCoXEBEX+f6uWgiuB+a8SrvJSPaiiAzZY1sRDEn0zVX5WTTbBBKSAKUZeMihShjXiSBIgbWyCzbdimObs83J/hh1GvXOgs23cRi9DsvS+T06p9l3D3ZowBv/CETvS2RJfBbBVwHW69sUCpXOPNDuU3k+/SMbsYOPJZ9OhUXj+uxJWP4YRZXO2Mg9bfFsszz+6YQHdVpslL4cdcmz85nsJ+keAaYBpHngK+9GCDX/kchJZTaFR2N2IhZy5F1/seX1p8JnuqbnehKP13kz1a6T7bpTZZ/UIemceo4qtT9tSfq4tKO+y2KcK0tTpx2+/WLvle42ePkq2ANOQNy+BlSB5tLSgnqNnbx+Pfn4jTCEohKJOgQ1PWL/jaZog/1WHn2+84rw1OLIdcvjcjHzJf/IlfVDqSZR7lyZxJroiU8WMGFeynrdH7PULv8LrhH6wpiGCmSXuF4bSkf/pWqpXSaZq4alh471lZBLo787J8zmW1pWove1x7ndpy6kIoZOy/nG0dNaVpEga6LBeeJxneL+aQj5R46ZnfQsJovRw996aSIH8KPzmaC2MjdMQ03CP7D9zNfQi1iizid7NLr/GmyFXGZNM+7Hc2XMyAzNt9PSlPWlfcPg7g0V5KHbqtIOrN/Ozo2ceOqV/NP3JHgUX1NujCex7M7JEIQ5pJY63iAza/BHWPAxAfGjMopAZdGl1yFxdiPg7Ix7stO3TFEIPkyNRH724pO1AW4gRQJ5a+7wJQ8CM/f94GTeJVE/CY1MJALL/LSONK+nWuTnJ3yreTWC5FnIdu+kCvgqe7pi3DzboGbkUDHKCWj5ojT+G6n2FlGUMQWPgzwgzKUEDuEAtOhEUCj6SyTgS0WduEVrR3Dw4NnR481HkX9KXeWQtqxbWhS/W4aK6dHY3S/i77uLq2KzCqSOK6FThAz4tDTemVcQCJn6unFOkRt6IQ3QcxWg1ihXePyuulbMSzdM8KLn3zdSYxywQqdOopqbdRoNfThA0lK9q7VAUXRwdvf2pz8P09vmtQeHjBa/Z7ejkjUaa5A2bW85RE9P2nVKPCryJmi+SY2d54Fr31oXI1tsB+K4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b69da60-0528-4e46-7fc8-08db9862fc4f 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:58:31.1262 (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: dAdlzfrvE8qWbz/iUkBNaln00bqgjFuMgJFXBhKWi5bJcfmiNwj9j9TIPToCyhwH1fxfbiprMzATdkwkD/77JnJB6d+ADf2VRIjpiVjDCbcm3iDdog/tixof6NM5QvGn X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: XXSB4JRTHEECRT6JKMCZ4O5TME4K6WQE X-Message-ID-Hash: XXSB4JRTHEECRT6JKMCZ4O5TME4K6WQE 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 --- sound/soc/hisilicon/hi6210-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 27219a9e7d0d..dd7d2a077248 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -511,6 +511,7 @@ static int hi6210_i2s_dai_probe(struct snd_soc_dai *dai) static const struct snd_soc_dai_ops hi6210_i2s_dai_ops = { + .probe = hi6210_i2s_dai_probe, .trigger = hi6210_i2s_trigger, .hw_params = hi6210_i2s_hw_params, .set_fmt = hi6210_i2s_set_fmt, @@ -519,7 +520,6 @@ static const struct snd_soc_dai_ops hi6210_i2s_dai_ops = { }; static const struct snd_soc_dai_driver hi6210_i2s_dai_init = { - .probe = hi6210_i2s_dai_probe, .playback = { .channels_min = 2, .channels_max = 2, From patchwork Tue Aug 8 22:58: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: 711966 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 00173C001E0 for ; Tue, 8 Aug 2023 23:05:35 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 34571EAC; Wed, 9 Aug 2023 01:04:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 34571EAC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535934; bh=UM7zh+tVcLgJiiosxWM3wWW/ZzD8GO/vXxINOnvQz5w=; 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=S4q+D0rMJhT0pLR7Mhf0S/ZdnoasLWWMCKMNS6GW9HqD0VEz9De89oVgtSBcgRkTN 9hFjExy6seU7jCAJvCci0ooPNe210avZvQsJYwK1pRLVJHfhtjYXo96kOHeEgGNMoX r3SEfSO+00NMARKLtFyUMnHdjg7Odp/fukVn/i+U= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 77C96F806B2; Wed, 9 Aug 2023 00:58:47 +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 1186CF8069F; Wed, 9 Aug 2023 00:58:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 343A3F805F2; Wed, 9 Aug 2023 00:58:42 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::701]) (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 EAAAEF805E5 for ; Wed, 9 Aug 2023 00:58:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EAAAEF805E5 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=qB69Nlj7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RMn0cctktMSvrppbR2L0h5UXvpJcD3M7pFh4TTHkYLyFBPpg99UWGokvW163yS43a1FPhtAP+SFnSBl4MOwez3T58+vQafXSLGt26PravwzV7AamftcK5/TYXOhp6dmhpJMS27GDiGSrYI3krFZt31zlpuEkopKHEgBMtW8gh1cDsvmZXbmTWOjmm3G+MWHXC4qhs4InNOBf7kn4BZAXQYO5u4KYGrIpET4/Z4Jk7FK3L6quVod28lhRO/JGGLzUzjXO18QYnKw6pgaMMEFqOz1ev4TioKAzVUHJ8CjUe/u/Qb8iwXWzbG5OCbIYK7TnRWsIdSIWMt2ym2BwVL2wHQ== 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=hxzCxhO25b7kmHG7qelgCvoD/z8ZwNpUrn/0QslTleM=; b=L5zbU2cOib2UJAwKNk5dFcfUkgr66og2M8iIrWRBHmIL3Fq27MGgb0tDIKfMkkTwfxhlTdCEfkY+NY+y/yzhTDCev6csHkxYlXeUUN8dVPudiwQYQocmb6VedYQhf6Wusyd4+2vbkKctNSpFPOHgmt08r1O3Wdt/Iqa4Q3xbwzZnBgXbu54lGWJKeriQbGg8rn90GoFiFItzcxjLKlY7fhYqF685q2jiVGe2eWI8uAVLRHcGNNlmhgxpMoNuQDgctIxuPBb7mORd32OYmezrSWHJ2IhVZnU0z17Mq13TRlNheXjBidfA0hcqKduxdypuf3x9Zj5biZImE0MM9vxCaQ== 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=hxzCxhO25b7kmHG7qelgCvoD/z8ZwNpUrn/0QslTleM=; b=qB69Nlj7ioOzADPkHA4twivh+VZ48lykTDTCPh7aqG0HR/MiiyjhfwI2wVK6NL6EwubHnZVv3Baj5iHpmCHKDCUtSmjjrP/prhb4gMCopFYUpDM9Dnt/lF2ywUh96blZJLTtWVH40k6qzDkwLHDyx+AqKMi6TiML6I4xYOu8yIQ= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:36 +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:58:36 +0000 Message-ID: <87jzu59m5f.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 34/39] ASoC: codecs/wm*: 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:58:36 +0000 X-ClientProxiedBy: TYCPR01CA0176.jpnprd01.prod.outlook.com (2603:1096:400:2b2::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: a589918b-069f-4e89-328c-08db9862ff94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eg0BBKW3ynHTpm1SyoLrdZ3dthxsHzMFYORo4R6R7h1ZZuLx/kRPtWhPtuTSdv38FbEMdAsFMZyN6fNjrSNs61e7Nnf+2Q3XXNR5pcFbV9j3+r6pSWenXWEGXpTSXzBgTNayq9EGDrAajKQVsKfl63Jmdr5O73wyf3BJHB0iTMR5LgvN/RMIYYqW2hOQPCbz10A5Jc/jod/llRvwdVXVHWpNeWhFnO8JIuEF+32Y7sa9+2WWvNKo5RE4In8QsVpNVF3zkX35NZZuFiXNW+1+85wUnHCKef/6zr25i6OXL+fiiUr4sn53sBYoVTe5fGh4z+6p+R3fRHEAeFnoQckAkJJphe8EIjksRUW6WCx7IN3PdQ3GDhOe3nj99kkLR0HXkBlC/lhXdhW3niUIvfufJTtx/fP0ar07RzQDyKS0LjyvmHQQ6ZQlerbP9yCcV1HIrGsqiePDz/I6K01AHuA5FsL7m8CAHqpr5JAYHj87hYK+3NXvRjibZkZsLyIxJ1z+0rD/rakzsm2/DPU4rXIcBWp8FyYlMKUzkWQd0CnK4qMnGcUPrsSWDra4Vv44ottCGAT51Xa/zY3+oiSkOq0Pu0ZsrPlnB1u96qkS3tQpaIFVmlWysBoAjpBUB+JXh5II 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MBMApq3Vlyf9RVDYrCjmR4CNX3AswXUD+RHz25+uah4P9PwsZl2NAOf6Sue93r5VsGR8Or2DT7/MIlOdb5cF1t28cfwhCOmhllxO9yn1W7ei/z4tZ6zOEV/KNr8uxVmnodORjROVLY8ZzOp+TqNGc0ErS6fVcxusRUW2p2S2b5QE6Dyayov2E8uxCh1hq4TLdJa/fI37qY5/nJ0BtHz/IlnnjF0/8b7MR9PqXRuMVagLulD7N/qngtzFoyQEs6G4adKcBk+6yj+OBGvbupfgXWVBWBIlsSB1urcBtV9cJINQPV4l0wbUiUtEqk/T1SIkmKKz5/+OY2yy5tQvmUeT1sS3s7NcEE57q2dyIkk7X7cWZK8mMRh5ln1eIYiPvUHYp6s+TIjqC9TmKhgJCq5MwBbBn6bRKtEofeBlI7mYufvWj4m9NQsYXmL0cx2GJA2O0/Fh+rQXQniGWk1vBnL8CKnCCKsSLQpBs1h6Ddtq/X17mhuNJ/FH4cbAAice+Srw+KKcxnwvrLAz134ouIdmf6n6lUsmTItjgWVvfTQJEyh2v6tJxb6WUHwwrBw3fRtnlcuYvLSyoMu7NvfaAy0qBAiR+1OFmvkBhzuO0faqkRjiJJ/Ng0kIESlfCm9/24yIV10pHmQvgc7ZZbLv5P1GQz8cAb8NoA7Pmw88CLJ4dCxWZPFUpafAHQWIs6I3/HsYM8XO47BTWV2kgEDDQoJd8ZMdd5jMKEfAqOUkItwP33ImkwSWoEaRXRgRNeW0CRmwm42adSlT5M2nHWl69DCCM5/scA9NvRmbqd5xeWwdgNFYYH+Vb7xsFCvUZOkLItayjMM+Znquu2AEgSAimnIvkHh0cy7RK+C8j0qwJCPGA5drKMCP0vLdBRBptj96V48GLrZAFX5sfITfip6K8DdOBINI5RO1IoBVLbQ8pIeuIS9BI0D8r9rVJi2Y5WHE1fOrrWsUGvyxQKb+isGE9A2+w9gFcsEpMSgIu2U0yT17skgYxYZjsWVouMNlcXT6vkqHYx47kp0PAWAJ6nGNqy9oF9Nk/QxO0s6FZu3i3FD0HBVe4SFwwaiatSi95mfLqnPmu2EzAEa1utrj3o0BMa6YhXBFMjGqRE7XMTsl065QHTBJiwBOOekw8pfasdfdTi8Q6jttFgkTbbai0eNPNDUns047EQ5CqR8Dzie9K8I0h+M/z8VTcxF+Repl5D4qlTr/YPUXqoB57XiwgfFMmG3EobRzhVEIeAUKU2bxPpKToa2QvSePTMCdYBoQb6N1koE4Q/MzK3v4pU/JzjMOl2svrFD2023gJzNT5fGHN6GEsFcThk7OPTi3vj7romyyYW6sitzrut4BGjTu6fhErl3T8S+j5zCyh0IxzAtEoDHnhWNSyh64W0WjMhy/aMv1qgBasNSpVPDcCnB2zZqXdH7mgDGG2epSmXNm8LreVKzJh4dyMgPNp2jBMcULOLyzS9k9I+UyAyDYnNzMQArwrdrbJcxczDXX9OI6XNXfig+2n1r/CfvX31xq5pF6TVsqOMPOtnHYkrmnY9o5eRgQxXwAc/sRa9+R/staGLCHDsED7ttcNz9Q4aqhWfKWUHrpl6oZvK5J1vLIZdHkpI+KHv25h2rGGT2pAf8AB6Iy04Lk1b4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a589918b-069f-4e89-328c-08db9862ff94 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:58:36.5928 (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: cscNIbUYrQ7IQ2H/yfKK1O/sFixFs9uFNlKenoXg1Dgw+4Lu1A2kdT5ls5CUIYjx7RjH5xmuarP7cQQ3CGwnyHWlDteAGN85RiOH7I4IqtVD4CqGZ9vbDj3intJg8Bf6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: QVDIFDHASAWCKGWRDHA4JHL2YTZVQA4B X-Message-ID-Hash: QVDIFDHASAWCKGWRDHA4JHL2YTZVQA4B 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 --- sound/soc/codecs/wm2200.c | 12 ++++++------ sound/soc/codecs/wm5102.c | 6 +++++- sound/soc/codecs/wm5110.c | 8 ++++++-- sound/soc/codecs/wm8994.c | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 36cdf97993a5..9679906c6bd5 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1770,11 +1770,6 @@ static int wm2200_hw_params(struct snd_pcm_substream *substream, return 0; } -static const struct snd_soc_dai_ops wm2200_dai_ops = { - .set_fmt = wm2200_set_fmt, - .hw_params = wm2200_hw_params, -}; - static int wm2200_set_sysclk(struct snd_soc_component *component, int clk_id, int source, unsigned int freq, int dir) { @@ -2068,6 +2063,12 @@ static int wm2200_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops wm2200_dai_ops = { + .probe = wm2200_dai_probe, + .set_fmt = wm2200_set_fmt, + .hw_params = wm2200_hw_params, +}; + #define WM2200_RATES SNDRV_PCM_RATE_8000_48000 #define WM2200_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ @@ -2075,7 +2076,6 @@ static int wm2200_dai_probe(struct snd_soc_dai *dai) static struct snd_soc_dai_driver wm2200_dai = { .name = "wm2200", - .probe = wm2200_dai_probe, .playback = { .stream_name = "Playback", .channels_min = 2, diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 3bdbdf3770b5..4ecf07c7448c 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1773,6 +1773,10 @@ static int wm5102_set_fll(struct snd_soc_component *component, int fll_id, #define WM5102_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) +static const struct snd_soc_dai_ops wm5102_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver wm5102_dai[] = { { .name = "wm5102-aif1", @@ -1906,7 +1910,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = { .rates = WM5102_RATES, .formats = WM5102_FORMATS, }, - .compress_new = snd_soc_new_compress, + .ops = &wm5102_dai_ops, }, { .name = "wm5102-dsp-trace", diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index ad670300de8d..ac1f2c850346 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -2073,6 +2073,10 @@ static int wm5110_set_fll(struct snd_soc_component *component, int fll_id, #define WM5110_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) +static const struct snd_soc_dai_ops wm5110_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver wm5110_dai[] = { { .name = "wm5110-aif1", @@ -2206,7 +2210,7 @@ static struct snd_soc_dai_driver wm5110_dai[] = { .rates = WM5110_RATES, .formats = WM5110_FORMATS, }, - .compress_new = snd_soc_new_compress, + .ops = &wm5110_dai_ops, }, { .name = "wm5110-dsp-voicectrl", @@ -2227,7 +2231,7 @@ static struct snd_soc_dai_driver wm5110_dai[] = { .rates = WM5110_RATES, .formats = WM5110_FORMATS, }, - .compress_new = snd_soc_new_compress, + .ops = &wm5110_dai_ops, }, { .name = "wm5110-dsp-trace", diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index bca3ebe0dac4..a48e904a9740 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3215,6 +3215,7 @@ static const struct snd_soc_dai_ops wm8994_aif1_dai_ops = { }; static const struct snd_soc_dai_ops wm8994_aif2_dai_ops = { + .probe = wm8994_aif2_probe, .set_sysclk = wm8994_set_dai_sysclk, .set_fmt = wm8994_set_dai_fmt, .hw_params = wm8994_hw_params, @@ -3269,7 +3270,6 @@ static struct snd_soc_dai_driver wm8994_dai[] = { .formats = WM8994_FORMATS, .sig_bits = 24, }, - .probe = wm8994_aif2_probe, .ops = &wm8994_aif2_dai_ops, }, { From patchwork Tue Aug 8 22:58:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711589 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 09254C001DB for ; Tue, 8 Aug 2023 23:05: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 258D5EA4; Wed, 9 Aug 2023 01:05:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 258D5EA4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535952; bh=xo2Utyw8lxpudwTDUheI8L3FsXHr3saZOu0N+cM5b2A=; 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=f/HwrOnsK+uJGpc+uaGOB8PXY4OQW/c62TpnozBBynkHVVtbdQnVGU/HXD4+WsI8H DCyTJ2pkjlWyCw/5eludefnHwElpxK1H/s33Y8/ghgsmkpNC8BDYFHmP2L0G4BJXpW wa6ImuiY3enEH3TfyWHx9eoNZhV+84ymNrPxJb74= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 86C4BF806BA; Wed, 9 Aug 2023 00:58:55 +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 0E0E2F806B3; Wed, 9 Aug 2023 00:58:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 37DB7F80564; Wed, 9 Aug 2023 00:58:51 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20716.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::716]) (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 8569CF806B5 for ; Wed, 9 Aug 2023 00:58:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8569CF806B5 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=WAdzXl61 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kM7qyQGGr0PPVDar/LsAgWm2bN+hdLMsKCp17sWxj63n0WcFhtzpSWQWtrZvyrdpt+vp3A4ou1pfI1aAZVPmeDyKyTC/MCAxGr2bftdE+40d/KW0vIlWUQli5KIKtf9k5JvrA3YaLwr6BnFd3s2hDw6hB+HLRdLQTAPI0zb3GWm+DB3a7oYIusUjmzwIlxH3XFr538g6DuTUx28i+EiChJiV2vEesdVSSykayN6vDEclEHNuBGDoFMvHAjNlu1qfn/K154sanhBetiAs13nfaHNegj7G6/AVj74XHuUUiJNxUdvz9zBLDScSzHZvO8Bh3RHy3HANy5CEaSe+rrKpCg== 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=Tqq9rfk0v8IhGlN5/b994XJ7vAqT2uEGmcOXs3S9DPY=; b=dj9ff00/mFHCR9jZiYM1geImIJ9I0ldXcWh3LnLqTJNrXG8ffMBT9FP9a1OuPPiuN82aRhhpjHiTEpp6IUiLZqCT+2WyCqTF4dpGVDil4LyRd1z6DSO0YYVmlmLZcT5cKZvptUGFpfwJCmPOs7zxalhnDy6lh3IQ1wLhElHLlT8Vm9ZQrgHA+YeGL6LkUsGibHeoDkKrJWZ9W+JI0RK1Cvi7iQeralx5aLD52qWDLPiIvt2rIcDz7EVd6DBAHsteOP0Oz0ptyWm3tpMS9CR1Y5lv1z8Tvz+PbPnN9YY6kUj3CwZSxahMCDBBltfBgD7QOcKv7DZ0BtldXr3vLfGAQQ== 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=Tqq9rfk0v8IhGlN5/b994XJ7vAqT2uEGmcOXs3S9DPY=; b=WAdzXl61ZXzvZi88bgqYc2pDa4FDIbpkPxSkzA+cgXSGLglFVSSM0Rw+niFcVEeuarv5EdY3JqwCsqp+MUDZBodt9pmRQzvveoEQhgIKGud3yDawfxlMP1J53Qw5VQznWfkvQi9YXBW3zCzFWpCL11xbFFIyMGYDt/DBLRwCaB8= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:42 +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:58:42 +0000 Message-ID: <87il9p9m5a.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?unknown-8bit?b?IkFtYWRldXN6IFPDhYJhd2nDhYRza2kiIDxhbWFkZXVzenguc2xh?= =?unknown-8bit?b?d2luc2tpQGxpbnV4LmludGVsLmNvbT4sIEphcm9zbGF2IEt5c2VsYSA8?= =?unknown-8bit?b?cGVyZXhAcGVyZXguY3o+LCBMaWFtIEdpcmR3b29kIDxsZ2lyZHdvb2RA?= =?unknown-8bit?b?Z21haWwuY29tPiwgTWFyayBCcm93biA8YnJvb25pZUBrZXJuZWwub3Jn?= =?unknown-8bit?b?PiwgVGFrYXNoaSBJd2FpIDx0aXdhaUBzdXNlLmNvbT4=?= Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 35/39] ASoC: soc-topology: 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:58:42 +0000 X-ClientProxiedBy: TYAPR01CA0176.jpnprd01.prod.outlook.com (2603:1096:404:ba::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: a4fae57c-b1f9-4f7a-9211-08db98630308 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tZk067J4e7LKxYF45KWHPKL3wA6J4JFm/+yO+8gOvRmJomEF1TpkO8llyhbqpeaRqP5BVaj2KQyIOGI+TROE8MB1ey+9aobcWwM7wm4vQ3IysD05W9RDdPVxxqfA3iRIqqIZhPllnKJCtG5La1g7Edaj+KGMlJ8E1D7BcTD05v+id/1e0Kdp1MAzQl6/Po4avt8dqqbEuasn4TkAnZsnUsY78FRPW/uFPxCg0sj015EX4mD68VndwegMRzywKMVGrhcIj5jtHF6j/DHsI9pBnHHbSfPIswvZPGvw6tgyFQEAjJmcpFy3cGfvjY/zodlPu1Xumsy9h+E7NxVK02zgk/TehDFJZRO+l0q7o1azNUoSOlDmupxQrGjNvkXXTtSn8XSivCQRq9MqKVNnpGuJRYEN6+PZd6+yLdDLQQSEuKg/pMtes9cYuNXm4aLttpULuZQ3SUl7qlRhXZBsFJYW1HyijbmLMQWF2Q+P6rdAmU7r9yjZPL91jD2OasgpclribDcmJDoplpRhtGQv6DvzNvOUyxI+7eJ23AC5trCMGC6Q7G/nIjocbpnPKR8AajaAiKMfqRi3xPetAcuR1hOmBjcUJCmP9sRQCpJTYv2zXt8iOHW7rIko1A5jAdm80O9q 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(4744005)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9kDyJSu9zlPBc36VoSt5ncNQkmdrMHXaU7EuiKHmuMWqFJtKqwKo3YNcKs7Kyg4aPZso6lYyEm7I5Kn4obGQ8gZ0IZiEeQRpzzkv8OxssdWnbGfAQWxWPlFaG6GKBFPkdJ1cnZQXmFhGUZo8NCKihxhuAPC/rbnr/6sSXAcAzqc0T7g3byagFj2KsVXZ1OIXmfP2COplPPXmNjjR6VgRuHHzBjMs4L3OH1JLpUKMNI4e3acl9nbKZYUn0ueTKukZAuVhhOap+2w2QSnLnJ24aIuL1UBD5sLmsJj7KVuR0xDWKjHAHFQvZXnmLhKKAqrR7LBm8gIlxebZOBTa7teh1uOvbulBoj8nyh6NPCaJDc2hh1j/xRIEBotvnUj5ZmBjoW1qcRVxJNgZIIFkQr/i1eRmiw3GrtWus+frCzYRbwXHOyRnqUnUAnF+YAI1OnYDBQlTCzqygGr2Djj5II1cbZCCPh8HfHndsnNEeF/Jic53/R/o5ZAJgb3cyK3sJHwRMHZcqgX2mnHl9eAIi+LYbgKCezlhBc/HTR/8RkIqbzf4KqwXzC2hhj6r2dC319Ucfhs8PFC7qVMoQiM40JRrr1gxnNvO0uvZU9hgUAdSBK1z08Tb/qR5fDUz2AJBemmyJT3R89cZpyHXsLQKCy5ya6aCAB48/zbv0bX9qxVXwZ0cDzG23ygOBWL4FiMiHEfuNx61HUKoJZOiOxy3wNTZ6PCPvulHxtfN2p+JOkjI/xoBetgHqhlfNqILHdJnoPQIjtUGN1OygteNtAuK/rBh/4HyPgI0QroZyIHIDmR4EQv3IvRZG5e3grdPCIxSLWgZr2til3bmgyE0N6j3SbUzBGmc4nDhAXdSRZM6dv6Q1+Tf4RC8KdVmXYiVldD1Rvh0SAcz48r9raJaxsqnFEhnq8L1B3qUnTAirDyRuSzVnBP8eANDzBnUCFgluZy2zykgSPdYLyWWQ56xeoo7wiY6AkXx0qmmDBKkuUuWc0hJ1UZTYnAOrwMg4MB/vD515y1CDC7nZuJETrjrDlQXrC98DGI5Y5Q1iUQ4arSz35wrNT7juvUhl5npImTPH/jDYS+0q/KvQ69DAc8uLVdcI8otj49FSqKSGUj1RIfCCYzLCAyvDgNvk/QzoXFGOw6iMCj+3vPAkVO5Z9BxYI4kGaQDUrpyd+glXf8yS/l26rfVTvsBzKhVDpNbEzacY/iIluf7UxNAAiQQseK301j0N9rpjvbmZOcms+mauQ3Htyk+Cri3Qzs42s+BsU3UZ/Dw2nYnTH73nd7cC8dNKvbp17XDFDZVudXw34ZurXig2mPkMXAsTcq1haA56SnRYjh2XC3vn6KmT6Cm9qBiMgeCRyibuVTxb5y940HKP3GEwrP9eBdDXkI2K4R+sQQQ3SBjTLbbXgVAGFZ4WgFx9dqyopvLn2nnJKulDnmLdCCQBobue4i/PZDhccZE8rLeOSGkCvH2EWRlRJWnKH9nIrw8O7KVuu7pWo1Tr+jvgZzaY7d7v3aRddLRvaf1co8EwWJqCfL35KI5RZTvaO1DV14QBeIqzVyEcV03y12KWH24dpi0PokmEzj2+D4+9DqL0OxYdDoRTSlAl+dwfLRIU+rxi5i1AoLdNb3ohDJi/P4ilmPktwI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4fae57c-b1f9-4f7a-9211-08db98630308 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:58:42.4355 (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: folcaHK2qxdDY4px8CtQQLDpicbnkC+vfV361n8WH2/lple+Hvq32QAb3TzvyaLMXLKQydqblgW+GI/ybbabnVj2tQf6blS+97avR6Tv6JgfBZYNijbUbyHeZAeU1BG6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: VXOKICZDI3HFNJKZQ4PZBVJM5BDHNMJN X-Message-ID-Hash: VXOKICZDI3HFNJKZQ4PZBVJM5BDHNMJN 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 --- sound/soc/soc-topology.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index ad08d4f75a7b..e783055b6c3a 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1560,6 +1560,10 @@ static void set_dai_flags(struct snd_soc_dai_driver *dai_drv, 1 : 0; } +static const struct snd_soc_dai_ops tplg_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static int soc_tplg_dai_create(struct soc_tplg *tplg, struct snd_soc_tplg_pcm *pcm) { @@ -1601,7 +1605,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, } if (pcm->compress) - dai_drv->compress_new = snd_soc_new_compress; + dai_drv->ops = &tplg_dai_ops; /* pass control to component driver for optional further init */ ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL); From patchwork Tue Aug 8 22:58:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711965 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 15D9DC001DB for ; Tue, 8 Aug 2023 23:06:15 +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 7EB5984B; Wed, 9 Aug 2023 01:05:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7EB5984B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535971; bh=nNDB5lz26BBTR1RTQie0FKYVTw+fdds0H+VciN1FsFA=; 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=okOggtHKMBXtSyq3fb4ujsNBbYi+NvAqLKr9wx/rLm7GbhlzR6dKnHRRZV2Q9PPKf rd7w+Nh7kN2DEiha+f373IseWOZHE9jcPtcTkyv+1uAOSuLm8+4nKlCS8r8Nq/ailb eDEtuTcculVOjEhyxoUEgXwghY9gwRF0Za9m3KFk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7F4BBF805FD; Wed, 9 Aug 2023 00:59:04 +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 E373CF805FD; Wed, 9 Aug 2023 00:59:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DF936F805FD; Wed, 9 Aug 2023 00:58:59 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71d]) (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 F3585F806BD for ; Wed, 9 Aug 2023 00:58:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F3585F806BD 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=MHv6qirk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GTqSda8Dz0OQPcO/xYsWUAWAlcV3i06qzKQQ3nvFv60a1MjqgickzJ6loBf6/UaxGYmjVRGOwvXp2iJs67ICW2J1MmNkaNroWUjOXqHditbqAogwXs8Lj+d2Ht1bPu3QLJPYmebfPBkOIHjp+MFs+VczWyUxupCq8lQr+YwU6jqP+8nTVKi1kBsyPLHYUTkWlLAfpM1ZPiuIFs2IrSiXrXAV9iSF5oaXpS16GqHO5eQ0cfmnwez+ntwBeZGUJaPDMBAlctcaOVhmlMhk/ej/kRZ3utUO7hPiFcA56E6hN8ruTaPilu8RJ9FWKoIbvKayeJucKE9JzsRZrpWxZWSMKA== 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=SQfQReTqENmpM7t8YcWRL1xGpw0PBllD1OSjle4pegA=; b=UkIXtsMdl5iE60uICU3zylsv180Ro05SBmY5VzkfatJ7Kjruxdsu3htZTOe+j9FK4q7zVJGjtg7F3boW9ouJUqopaJqraOnaeOngdl8vwX6/YThxbaGe49IY0DvDlh9YZxivQJiKaxi+gVQhMpimOH40LI+RIEDwit9UqKge9RLtYxjf+AAQI/y7ZOWNvo06POmWsXY1yYDy5f4hM96GKX71Sz4gHLSDE1r6NV2ZWNwNJ+4sro94hNe/5BjmcPvYi0nt8Sg/w7zLY9qK/fafkQlwdSe4ZNDPvORfud3FRV9jkOQsCxH8q8YFZQNBRxcCPzWrz+L+33YX9bwzSnqcNA== 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=SQfQReTqENmpM7t8YcWRL1xGpw0PBllD1OSjle4pegA=; b=MHv6qirk7hEvPs5saxolXaflNyFToXbdV2L967gukdj1vqj8emIka/7dWAIeA/OXtLa0hhloesOb7dSW8imSspp6tKAIKd//lY3ATbTWlULKe7xaHQMVAR9ymnijBH+djXEPNZQ29Tc+seanC7SdD3WW+L4nE5TfejqEOVIk+1U= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:47 +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:58:47 +0000 Message-ID: <87h6p99m55.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22Uwe_Kleine-K=C3=B6nig=22?= , Charles Keepax , David Rhodes , James Schulman , Jaroslav Kysela , Liam Girdwood , Mark Brown , Richard Fitzgerald , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 36/39] ASoC: codecs/cs47lxx: 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:58:47 +0000 X-ClientProxiedBy: TYCP286CA0191.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:382::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 086f71db-8d00-4f26-35cb-08db9863061b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /bZRa7qTgIqjLmtq6Zr//bJqb7uPWJU/FP913oLZaYMu5qgdXRmCJ526idbNZT9w27UqscJ4bTdr9qUnhzAVrF07zx9VqrSPw0Hw0Pv8u1urlhxeTeP3ejAaAN/noS1PNBqc8KFdaaD96YCc6nFZtW3tO+wKnJq4gr0db2rIqpoErQms1090fAzfsws4MK2TS9I2EN++Hk+ziq0dwWihvh/hbTdE/chWMESPMBprkXdWhXBds53ELnsZZTt9XY8RWbHFII5HzrRA1sGxfilsKgu1ghD8m1qXK3jVqbIWScuSqICHJHbWqQ9e6MdJt+CMCQde0pQg2XFOirpjafxHgQAlx/fbE4kI0ZP49zg3MoGoJZ849VDrwyCPxb9OPXfPShHP/aeBh9TJq71gahb9XdYW/dAELwDtKVechZA7DRV5kCg4/OqCLuIn1Ml8whbj973S2lhtlZaKEdJrvLurFbIughU18nmQL3jG/3ekgCwDdXcEzRHG/89viUd0PPnqQ2wvWDffykH8Aj4xR0vEStxDMNRd5+m+Ts4ftHW1nmDuFN3goPszU+mHWV1HfVPGCPZb7x2ZpjzZ1cYcWLO7E4s6MHjZdadXjirVpbgHfOGmRZiqXESv6PPJJch/z0fy 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(7416002)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y5BrNdMlM5mM2uJCC9CCMwz00EEKnZO1nQjgvhZvqyteKvlHQe/u8OWp0i8evp7EjacqLUgphOO/tZFFr8IQn4+9HdlloDBtobqQGbZUv01z2A+yYFjOWS+3FG3Yb60e4HhUKYxd45Vm9ah107AN6fVYs9I6/1oYrF3Jy9hfEwksmQCI7URiE0ouRolF45ozG9r2dlEVYIYfL8+9KpB+B7uBvjaUx1FwxtGTFBZFgM1JB0POt90CNUQQMsSZpVpDuKZveyAMIinntKkIAWXfiXz24eVOcfi4oVc6QLYnuOiESYcPU90Lyt7NEJW+iOQzDe6KMPyD2wzVTn5IuBj9E+lA7xlT3GnkMYlp98s8YSuiLAx6jcSZSoskVA26aVKSz5OfbTx8N8f8SxESjk2vD6g0UXhyfzfQdm5xNTG9vMNYxxw1YXHCJ2fxEKFClHT6gXod9h53dIOUTIJB+WN17d0/N/33b02ZTBEiheGpoCWHpJtwYsrpdiTaavh3K81mUg1t+soAuWr3Y3/Pvxgv3hMMxms4JdsN4sVeVBo7P5Vl8GPxHQGRSE1+fEIl2kjfe+u8qhjn47ipygGx0/Zh3qStQ2GSAlrUbLpoGCbFOcy9c97DNMISPUIpl/dClqG1hp8zoXYBbLheFjSqAuUZ98pJCzLplKI2ONbWZonMtcOCnB0g2h+1ikfBvoRKw61gRNF/7a4aITCVTXDBaIuVHQmVexyJA2ugAPUmgpArF1X/ZOiqv3IEBsiykgxmgF4s1IuyZERBU4a0aRtlVSLho9HJLwQYxiYROegsaVxzPd9CBDno5k5nQRmoDGZCbrxDGlos+MOrzTIncxV85pCfBfwF5qQwECXTWfp7w/+qri6NX3zWBfgKKWSzE07LhZaRaQIPlEazDujurvj1vLeyzmVT1Ta/l3oGs5n+9qGJdNZ6AdfcAuh+WbVNc8MFjfyIAGReQ1m2ZinG/oCGBGq0xqpsTjAZS3wiRgHfwfB8ghNQEKSuoolnkZwNnZ2DHdE/3Titk2GdJnUpCGRq8LuZRASLBWgJPS5CMkVodJ9pJiuu6st+mvXpeDX3GVyVbNstzuAMnthD7AmcU+4IU0ASS7EeiNOYn10whNM0NMRXdbTYcsiYQgy8e1qSWO7LkKnvST0m/cVDrGnMy+coAsNc/viKH+Lxi2DikGNUozW004QKHaexM+Q1SRF1rGPobly4ypIr4Oml0JE5GrpGbtffHq72x0E1KseY7XvjhcUqBx623f7b3jKCCl+oBJvWasXyQ11EMhqXrKg8UtmXUXh/ZOIpMzwsGOfeAZL7zECPGrIjU004mUG2fRDZAS9ug/21r/DEHP2MPiGn0PXOpdWW8gV8Iw8+gb1SCGcG+Q0OJIRdDSWAmWkMs6AonV6zHFnmNtmU3vxRtBf1i6g9DzKReIMirIOC7RnAjdtQomRC+cKY2MClN8rTV62k9h5OCIkHBQWwRbUbsio7Z6IJF5Ru32+l/rL1r1a4i+IwsqKal7/QtM2tug+EjuL6ixI3T4c39jna1uB5vY5k8BTKP+QQNPLeX67E5SPoCp7C8/rgHC2unm/hFuzzrGAqH1ne5+QOa7lzPvwgtiuBoaZLYwlNq8mbAdneTuHOwxqz+3c9Qqg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 086f71db-8d00-4f26-35cb-08db9863061b 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:58:47.5741 (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: 6lu7gTqcButgL7pYqpf0np4La5uVFFd2X2wtwRzdxE281MxtHEyzlLoskTgYsKujKJYKFsO7o0iDGE1snmYDOszaF+NiC5eChmRkbCKgGkGuKvqI03hwflP55UenEA+8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: 4RFD36RHSUCAS54LDBO6WOGTFNPPUET4 X-Message-ID-Hash: 4RFD36RHSUCAS54LDBO6WOGTFNPPUET4 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 Acked-by: Charles Keepax --- sound/soc/codecs/cs47l15.c | 6 +++++- sound/soc/codecs/cs47l24.c | 8 ++++++-- sound/soc/codecs/cs47l35.c | 8 ++++++-- sound/soc/codecs/cs47l85.c | 8 ++++++-- sound/soc/codecs/cs47l90.c | 8 ++++++-- sound/soc/codecs/cs47l92.c | 6 +++++- 6 files changed, 34 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c index a6538dab6639..1245e1a4f2a5 100644 --- a/sound/soc/codecs/cs47l15.c +++ b/sound/soc/codecs/cs47l15.c @@ -1143,6 +1143,10 @@ static int cs47l15_set_fll(struct snd_soc_component *component, int fll_id, } } +static const struct snd_soc_dai_ops cs47l15_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver cs47l15_dai[] = { { .name = "cs47l15-aif1", @@ -1219,7 +1223,7 @@ static struct snd_soc_dai_driver cs47l15_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = snd_soc_new_compress, + .ops = &cs47l15_dai_ops, }, { .name = "cs47l15-dsp-trace", diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c index a07b621d463e..cfa1d34f6ebd 100644 --- a/sound/soc/codecs/cs47l24.c +++ b/sound/soc/codecs/cs47l24.c @@ -957,6 +957,10 @@ static int cs47l24_set_fll(struct snd_soc_component *component, int fll_id, #define CS47L24_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) +static const struct snd_soc_dai_ops cs47l24_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver cs47l24_dai[] = { { .name = "cs47l24-aif1", @@ -1033,7 +1037,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { .rates = CS47L24_RATES, .formats = CS47L24_FORMATS, }, - .compress_new = snd_soc_new_compress, + .ops = &cs47l24_dai_ops, }, { .name = "cs47l24-dsp-voicectrl", @@ -1054,7 +1058,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { .rates = CS47L24_RATES, .formats = CS47L24_FORMATS, }, - .compress_new = snd_soc_new_compress, + .ops = &cs47l24_dai_ops, }, { .name = "cs47l24-dsp-trace", diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c index c05c80c16c84..a953f2ede1ee 100644 --- a/sound/soc/codecs/cs47l35.c +++ b/sound/soc/codecs/cs47l35.c @@ -1348,6 +1348,10 @@ static int cs47l35_set_fll(struct snd_soc_component *component, int fll_id, } } +static const struct snd_soc_dai_ops cs47l35_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver cs47l35_dai[] = { { .name = "cs47l35-aif1", @@ -1462,7 +1466,7 @@ static struct snd_soc_dai_driver cs47l35_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = &snd_soc_new_compress, + .ops = &cs47l35_dai_ops, }, { .name = "cs47l35-dsp-voicectrl", @@ -1483,7 +1487,7 @@ static struct snd_soc_dai_driver cs47l35_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = &snd_soc_new_compress, + .ops = &cs47l35_dai_ops, }, { .name = "cs47l35-dsp-trace", diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index dd7997a53e70..827685481859 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -2249,6 +2249,10 @@ static int cs47l85_set_fll(struct snd_soc_component *component, int fll_id, } } +static const struct snd_soc_dai_ops cs47l85_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver cs47l85_dai[] = { { .name = "cs47l85-aif1", @@ -2404,7 +2408,7 @@ static struct snd_soc_dai_driver cs47l85_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = &snd_soc_new_compress, + .ops = &cs47l85_dai_ops, }, { .name = "cs47l85-dsp-voicectrl", @@ -2425,7 +2429,7 @@ static struct snd_soc_dai_driver cs47l85_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = &snd_soc_new_compress, + .ops = &cs47l85_dai_ops, }, { .name = "cs47l85-dsp-trace", diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c index cdd5e7e20b5d..2c9a5372cf51 100644 --- a/sound/soc/codecs/cs47l90.c +++ b/sound/soc/codecs/cs47l90.c @@ -2168,6 +2168,10 @@ static int cs47l90_set_fll(struct snd_soc_component *component, int fll_id, } } +static const struct snd_soc_dai_ops cs47l90_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver cs47l90_dai[] = { { .name = "cs47l90-aif1", @@ -2323,7 +2327,7 @@ static struct snd_soc_dai_driver cs47l90_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = &snd_soc_new_compress, + .ops = &cs47l90_dai_ops, }, { .name = "cs47l90-dsp-voicectrl", @@ -2344,7 +2348,7 @@ static struct snd_soc_dai_driver cs47l90_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = &snd_soc_new_compress, + .ops = &cs47l90_dai_ops, }, { .name = "cs47l90-dsp-trace", diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c index bc4d311d4778..352deeaff1ca 100644 --- a/sound/soc/codecs/cs47l92.c +++ b/sound/soc/codecs/cs47l92.c @@ -1690,6 +1690,10 @@ static int cs47l92_set_fll(struct snd_soc_component *component, int fll_id, } } +static const struct snd_soc_dai_ops cs47l92_dai_ops = { + .compress_new = snd_soc_new_compress, +}; + static struct snd_soc_dai_driver cs47l92_dai[] = { { .name = "cs47l92-aif1", @@ -1823,7 +1827,7 @@ static struct snd_soc_dai_driver cs47l92_dai[] = { .rates = MADERA_RATES, .formats = MADERA_FORMATS, }, - .compress_new = snd_soc_new_compress, + .ops = &cs47l92_dai_ops, }, { .name = "cs47l92-dsp-trace", From patchwork Tue Aug 8 22:58: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: 711588 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 0B9E1C001E0 for ; Tue, 8 Aug 2023 23:06: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 4D0B0EBA; Wed, 9 Aug 2023 01:05:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4D0B0EBA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691535977; bh=uXSgYYtfWmuy8xUaysURVsc2mZvLsxvi2WKRBwOnOjA=; 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=JSC6/x+nqTfmAM9QXwK9LvjICSv/6scyPT+ayGiXMoONad5faotOND1ytuw6hWUi0 ihSF8BhIvAb8YXZLPujLEmfeTI/FtZ6TNu8dhXn4ZOfL53pV1pFkVFE9XyTNgTXVTr IiOztOuwM0ugn0AppbqLA+tqP3nUOmKX/sE8JEu0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DFEA4F806C4; Wed, 9 Aug 2023 00:59:06 +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 82B83F806C2; Wed, 9 Aug 2023 00:59:06 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AB55FF805FD; Wed, 9 Aug 2023 00:59:00 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71d]) (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 9E49AF806BE for ; Wed, 9 Aug 2023 00:58:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9E49AF806BE 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=K6/Pa2FW ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q1192vUzDDolak+/7AacRdkFFrd3aclyCsQECJwAedkq4Oi9pE9W7t/+QNcvGjwwTEVl7epEN5AmmwrjFerODfC/v4fej4RIiA8uNFgeyo3FsGtUNqLwdciTN/t22qfLmBV4YQsEFsmYqEqxyilPB0ymuhm3P5P4EFTzpRXcHyUMdv/YOXIpvK1sy2uAStMvB8Jqd5OAIH8JQuXIGl6gWkfyRCl//MxYnRQLjhitvVNEJ3bPR9rxwF+xm8reHWN/g3iDQJtZ7XXej5qNw0vbppYLkV3SUdTqLzv/ptoF+dJKRvoKkWIq/In5X7A8f2krTVLgwgVWIR9PLYugySOcUg== 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=ZHFLSEcvTs3ab7hgBHBYA0G8LXCFjgzk4lrIVzlSETg=; b=GnIvcdQf6BcVGK6kS7pRAMerI4cMfPcV0VFqHXEY8fgG1OtXKZtCzXZYLLgNrhunjhP8l9NTj0W3KuGizUKGPqXkmJTQIZS4/mAp1U4+0YzDLNDbU7Xyl9LebKoaF7jUPERS6gzWYF6PgfkS0yS6jARoPOhF8+S/K0E2uYw5Kv+Z/kX16261GzbtsfN9LORiHRNKHI8UxQ4td0Ml4bP18rgibACVSNuAT969s8rhID5qUiUjFWWvFOr35kByvBBulYZVWKezl2aBftJAXeOK0DKeN1o0TPfnk2PvO37fTZ8547RZ6Q3oppGid2vaukbpJWyM9wD4qsRmLjWEnqylzw== 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=ZHFLSEcvTs3ab7hgBHBYA0G8LXCFjgzk4lrIVzlSETg=; b=K6/Pa2FWYpsC3TYbqy7/WmYH/8oP5HaiHx/gRUdQvx+ne5sh2l+so6MOT9qp1oyWvEwrJPzB5FkYj9G7WKWYknyzNucoLDB2AJzhN2CaOTFOLaWgg1LTQFLH3D0bixdoY98ea7mrX5sKFhgDvxOd47hXWe8KmsGgAp8+zgpjxGQ= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58: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:58:53 +0000 Message-ID: <87fs4t9m4y.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 37/39] ASoC: codecs/cx2072x: 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:58:53 +0000 X-ClientProxiedBy: TYCP301CA0052.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::15) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c570071-049f-4053-927f-08db986309ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O22/N0vwz+7o2YkgEP0epy4uUqjeE0LKe3zxwtbXfZcVRy1VOQerpezoZ7OUhp8uatZBI83GwPXmfaVRv2z53tpoQFFM92+stK/BBY1ozu801hzJnmF2VE/fqeABfGsPDa5VuSLpd1FNTtZVvcDmge7BrVitF85nLJ7J21daiKXFft6TMj3Y+tZivzHEjqH+o9szzeGY6p1Q16INyLQPeSqvVdgDXTpQKX2x+Mg9a2trkaNbVWJekJMdymYO6vEVaEjqSCIfJg6P2Q7zDZqTwoEXc+inL/19rnuj7Xj4p7Ohh5x7yNLCSHTjd62ms1qysuK1Y4dUxDmxoDag4wZHOSRr6Ym0PU8rBGHQ+UmjaqEtEsUyDLs78OH7Zz3jBcR0dSjcENS0uCAfycPP6SDSlKiKtKF0iwQK7EWCY1ZYzndqsBIKAT1u9o7kDSIc10176LJmhvLfYOsuINlSY3ZNN3hjfjs45zwTkQkwyhf0Kw2mTsL+teEVOcRhrsLaRnIalKV/zoty0b6MoXWsIOw/r/xK/dk0vY98t8q+mCdkhbtxZAwBU8o8mRftzYhFjqk+KnzXbq9Uk11i0r3WaQhnDbmw6u5AfkcU+PGKkBU7/20VNbuCEk4dhxPIdgbY2PmX 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xScjr2x1ZRaLyAdxZ4VYNz2hNFZMdMXwobZ8VAWBYUAWC+7YbcNI2Jqu/TtXJssQGWHplbd8qJ4kXR6I9tpEjlTcai7hn4tPv6ZDwLVS/jvUxqcusCBhA7jzWmBmhdRJeC/yWGwUcSYIFLjTrBuSWiBD/R0cfG0yIdEH6+dZ7mqkHOI8Sm9iPPMWpkzniYKmVODA1ICh5ITHGX6gl/Pp9e3BHssvIDzlWGeSvJmXSiCzhMHnsmlKxzFcCocw/4gxk3Y5dXtXRHTeMipmw0+VG7gGiBg6c+IbYtiZBlKShm1LxijFJanG1YZT94tAQFpp1jnHfZ5lTD2FzZxb5LcNcC3zIJVHo9zdyzJsO9qhFWCA8SGuBdGIIKEZsIsaF5mGUXK4JcIYj5R5hY33+8mc1zGEGRMDZg4LcQyNFKnx+q+7egAiV3s7SkI2Qdvnc+o86NkA7f3FVwtYcUAVhkA8xMRpAN9KypmVY/fHGvAiFForvlKldCFz7qEXxOR7jGYLWzhTqG4WzWGDGS0ux+c8OZlDEdeloCrAqPU7Nslo1LKQhZzqwpa/gNBOy7b/zahQTCyHxkAyDPdnTGLzR01/XSJ1R5gWWMs8hSNuXTTh8VJa/DsP//bDaH/hLInbZd/YFW4doH8eaT2IDF3u/GUvZe7ZpzuovE4KuEGntCPix3YBL9AYug52W94QYzOFL4f7YkI9v3XXXCZ34f3knwxI6T06QY5nALOQ9OrPjsEoTntTQcLk0MUia+BaAUQbcdJfqqx8yoV+dtq7xu+i3W0kuX8MY0QFL6SnFM6bLu+7hxhRpjHDpqRxETAcBHeFNTnHeMicfvH1RDSsBRFdh2CF+dk4SPRvTZvX2VVEEfg67ZoT/hJZjTOKuICeHi9iPdVYXdNVqJxGd8bRHIb+zRAO4KzULRazv9ZZxLyu0ffIPKzxJRILpga3XyS1pYQAFgW0jh6SlgrT6J/8MKOFHNbqjkj0+KOeJRQk4V0CQJK/HCGl+slvEa+HjPwv/5krokLUEW6lfBErneo+JQULtHFceUhy4iLxGaYScMjn2lMsJegMkVeykDUamL8/Y0tUHka+SF0MrRSFkoIAxjdEYWLO3QVxOzslHzmzq1wM50SfL5pTJHWC/OaJGKDpBziBLk0hXVAdDa8VA5v2QLKmpmnbzHH9ChL1RnBK8/VtLkdwfWDwldCqtKkju7bWGV/eObs2r1DtiShkOTb5h46XJv3iKrbUGbepg1QZYlGG2DOKMscE/TAx1VnvZjN8CfpqApc2Y25WMpbBm+WYDqVRyJ4MCGFLFanmIrJOCCb+6xw9aTEzi1tgw6r9SShwkbDMBBWzOwcF0729R20gfsTvScWs5+YQT4PsQ0pLq01qdYuCrs3X+MOTMgoqUhMdzqUEcb2tsN00qzy1a7qc+N/epKCt9h38UMZulMq0T94ahqgmlPdcfwku8rrXAEDhGNn6fIjxWIdv6HQozcULhuqPHpEKvzJu+VyLLbNw1VtKLAeNIOiRjfOhNsLBPU2HMPWVf2/OZJHNMHWDg+T+9gjwMA3GqTv3oSkDMkfbbrkTDmDi+TDzvtX+ySFqK5xqOYrRX/b5Cx898lAlAewmporCDlfaAIaPxVXxjl9gENxiPglLUwk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c570071-049f-4053-927f-08db986309ae 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:58:53.6451 (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: QnlrrkizCjHxJoCW5ZvHeyPyHl8bZtstbzlV6QFhw0rbwIS7xhq9vuiwXXWRiJ8hXtnwryv/Xxovb02gnfMxzu2mAsgQvLz28Lauvc9CotME8voVZxpc0WokiiKJAPrA X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: FKIT4HWJX6X4DZCZLEU6MYX7QCVCENP6 X-Message-ID-Hash: FKIT4HWJX6X4DZCZLEU6MYX7QCVCENP6 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 --- sound/soc/codecs/cx2072x.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cx2072x.c b/sound/soc/codecs/cx2072x.c index 082231088a26..f8b128084015 100644 --- a/sound/soc/codecs/cx2072x.c +++ b/sound/soc/codecs/cx2072x.c @@ -1546,6 +1546,14 @@ static int cx2072x_dsp_dai_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops cx2072x_dai_ops2 = { + .probe = cx2072x_dsp_dai_probe, + .set_sysclk = cx2072x_set_dai_sysclk, + .set_fmt = cx2072x_set_dai_fmt, + .hw_params = cx2072x_hw_params, + .set_bclk_ratio = cx2072x_set_dai_bclk_ratio, +}; + #define CX2072X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = { @@ -1572,7 +1580,6 @@ static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = { { /* plabayck only, return echo reference to Conexant DSP chip */ .name = "cx2072x-dsp", .id = CX2072X_DAI_DSP, - .probe = cx2072x_dsp_dai_probe, .playback = { .stream_name = "DSP Playback", .channels_min = 2, @@ -1580,7 +1587,7 @@ static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = { .rates = CX2072X_RATES_DSP, .formats = CX2072X_FORMATS, }, - .ops = &cx2072x_dai_ops, + .ops = &cx2072x_dai_ops2, }, { /* plabayck only, return echo reference through I2S TX */ .name = "cx2072x-aec", From patchwork Tue Aug 8 22:58:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 711964 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 93C5BC001DB for ; Tue, 8 Aug 2023 23:06:45 +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 C1AB6E82; Wed, 9 Aug 2023 01:05:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C1AB6E82 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691536002; bh=GiYai0OBQKCpXbnkQSbrNHCnnp2/t1Qa21mkJBiYSzE=; 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=gDBsVdqD4jhuDc5zkxryj+Bvynd797xKmVn100UlOqm6qfW/DVEouexHIJSL3KcB6 WlkQKVqq0ox5VH1ZmOBFIaqj2CSfNIee1xw70Kd7Rf4SBNGIYK9rpubfljCFxzoUVP Cb+IXUkC0toR3mI1GKJS13FuOceIhXwpl5fUDUOg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A32F3F806D7; Wed, 9 Aug 2023 00:59:10 +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 52C42F805E8; Wed, 9 Aug 2023 00:59:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1A9D8F806C2; Wed, 9 Aug 2023 00:59:06 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20715.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::715]) (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 270B1F80580 for ; Wed, 9 Aug 2023 00:59:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 270B1F80580 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=FJ7OHhZS ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DCtnrjri3DdF/c28uNVDSrPJV3IsiHJa7F1ruZJ26tJDFblBVJLAiEYIN+jrwUEjseRtUgg4IuBkf/FipCZ0NJl/9z28aYzMzE6pblAcHSUKxlKokzSXvfTbS5jdyZ3Tfq1fqrHrEm7Ik3XXGcmQwjbYBsbiFZGqHvaqBcpM8slIevsZwcqLug8u5V4OqI3cc3O8s7eDEqCV8s6m+Vbv1PTVgWeLIQYjd4QyzW02GxfQrC8XTL3/rzBgZXYV0mlKCJro1IS9k/6D7ROP2PgDkYv0shdQPOJqMPPdsA2TakS5D8FoSJsRdTfpG8li8i5PT+aEBLag1Q0wz4U3MPcbJw== 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=PnUKKTHXzU45kPAwhdoLL6cAq3jlhEdI7WHg/vFZsvU=; b=jmkv23UvPW7jJoxr5FPi9uIRXvO56QN7uDmpQF3rM6ezJKloS1G//LD8+I8/qZK31xzus2Ksdg4JrgLJIRCGzFwDVxjHLycoFCl1zMPJmeo9/72017xRvDvPDmeVF9W7B7LAI+GesuIGAW2WCUAfqUWSurc9Wmuhc1TUWS4lTMf+BPvL6BAZyr6UzQO2Wjev8rW74yhyIj5Bni8QvHYXJDiJ+omy2djGjMbAtHFN+XqhAM4+3Gv5iMz+xnLNTqzNMCFqzaxMNOYP/V278rrs2UD/GaR5bPNFmUSTc3kFIC2205D309ASU0Ra0qVDYfQyrJsQjKM8Dwz+nqObFNRBzQ== 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=PnUKKTHXzU45kPAwhdoLL6cAq3jlhEdI7WHg/vFZsvU=; b=FJ7OHhZSkRloi+lfS0U7Wm64ioTcpY8u5b1sSCP94MZe+b+JCO5qb/op6Qpak9Q0sirjUKOWws7wj9FAlijORNdEKAqe4qrwjiqpV2Pv+i73P5qdfrG5s+B9wFPEi/jXJ2RDdH6P9Q82kgv13674Yh4i5dvco27+4h+fEA7hABg= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:58:58 +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:58:58 +0000 Message-ID: <87edkd9m4t.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 38/39] ASoC: codecs/hdmi-codec: 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:58:58 +0000 X-ClientProxiedBy: TY2PR06CA0045.apcprd06.prod.outlook.com (2603:1096:404:2e::33) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 950e8b43-ac05-422a-216e-08db98630ccd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: md27ffKIPPNRluH4pM1Q5sIJRgTVKiM7AMFQSwEyXCKp8YG5M30GRRXu5pjL95M29++3qH/YELwChpQKERk+2A0CcV8mMHJB1SxC0aimxY+lys7SCpGrzY94yWSmXSBq4LqFR8hYzfuHf5OFG2BDE4gs/q/mpw+aGNdkZZu9fBiKZk+Iiq44Mo2nXwSEIDzfx/6tmtdA0ObeuCPEX1frR0SvZe/BJ8y3L/GzQq48suiV37G/8Cl0WSBCzP3r7u4cmWxlNVrTgnP5+zP5Q0MsonQCjsYo/Uy/a/nfzfF+4iz6vZURN46Rt2QbO9c8jsFE1h6nT+F33ChA5P3nj2w6hodHvxYt+/kZ1he2tX52xc+Sc4hKYkfUczAo8Kf8+r356B0jFZIhzRPO5xirzRRcxpypxByXxxYwF2aFLOV+nByJPOIq+20uwSWPCQL6NutzbdAXuNQpy3ntLXckBZqrbMOXcKqqzz7WMxB8rfHZww7aRDMf7/gLgc3OnpfBxwTPiMb2zlqtSq1r8GBqZVOCJEEf1/pKj5ofRGzrfIrdrukh8MUHfhXkKE1JcrPVQBzjQJbIEfBeuopvHOVbrHCCq/2Z78VvEgXmipW/vj5JKSZAowYjnENkU/j0ZH4zNXmJ 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J6awiLFo5S9QW8KIt5koMDLKsql98cRlwh2rbLkcHzZR71ZJhyL7Bo4EsvKXkzgHV8cP/jQbsKvufd5fYYxfB6FVspf3GLuGrEk+ADve3z0NuAKbSWbRY9d/GktF2+FlJp7irL5Ef4l0SZMdVFRLQJoT0qr5k8kIT1M2FEnOYyDNlhxGTgt3reNAXTeU0flz/9T3eIWTA/jMJKmTWwtwtyt26lB4H37kVgs5svi84TPibWisjDQ0Z+/nIFjfe94555N8FGn65bjAMuBrNDDN15vciYI5pE7aa/h5zIzLFeBuCBwtASPyWsx60jdHPL1aTlpTzpe8n/55uupLurpAQEvu3XoZwSFQZrSASHx23N35CEv2S+1joSCXV3gLKltJfTpZLF6HKqMrgLcWQPnvV+XywNCXQQb/vChWJr8WbiiQ8mb9RRRXNnBfwryGfi7nZVluM6Mfaow2C6OovoSQFs25xRYXjVARpefkg8wP3cAPtQ8/ebB5NJQjvPsNFTKZnaa5yemC9IcQHrbwrpq9xSvcRjPd3y/YwykewTgPWLMcAx9UQQqJeGdeEkypTHH3h7XbYdmDL69qUcF33zkSONWhMQbOOU81CxvEm460HREG5A34xtBtGdGTVKUL+IUmxRMBi5qLqg0mRFEvE1vMrP9te9tWLigAyp8jV3FsXQOw2Mbu9gRVuRiPPGWazZwN9tRAUPs9Hdjz5Nl1tJdRifzq9D/mD4ibgaVv9Nsd/lMbf3hZEQFm2uxmTYrg0h0axpXjhCULrqlccYd12A6h7pCc6JC3S0F4bJLApfFi0bTyH9zzRLA8TptmT8+PyRm80aVTSZeFKxMqO5J1rjbUvAdJdt6InnjYpKdgCaGF3T532FTIgKlTqcqdk6TcPWVObSMOm3cQmMTFcpWRcn+u0OxTwyejX0YXVX8VuajxvGSxjV8qYbSd5dg796ACRYNhkZtS4Q0jpcz8pj3ucFhZ424BkWkHxM5H/yIgbunb4jZBpOzzl/b0WEnEhTHIX4cZRT2SqWybVkmCXU9gt+amura+MnzzeuvDooakwz6KrQF2IycM9Q+UtLnH1GLJfdlSoTaDCBt1QAc9kajR0c6/f0zWYMEaVLqz1DMeND73zrdPWYgp7VSMQQmruxCsQtTD4hnmcEzOWgbjZSUqEmDWBhI0so9Hg/pqh9AVGVpicx6H4m3xxDcgN1GtAUCjvK7MrOIbCnFKeRS00MXS1Ts0Ua/1yiiIA9KuxjyWVH/GwDk25T2ZalJEL+KChDOsLe530PM/lvXhcJLiAxXXWh+T7xsurIt1323RKUDh9EkM3Q8JSboJ+NlK+5tJ5bGf96t70zL121d8DnEjRyiH2d6J5VcaRCW4dQLhUVjy7DPlFM4PkEg865q2TUinShWwKuS6dm14I4Jvdno7u9A79LzZZz7wthY9D0nvnm9N+Yx256jkC4wLetRsfwMUWVt42XNYHRKGJTUj9LGTiwEyXCXU0EL49O6c56kAdjkMmtkG18rQDSQEGe07w5X9g6vJlGwuXcu0cMBnlc2X1F8F5v4g75oqCajSckDKgW65iGm7roKrYVPDECkblM/y9mTwKz5MA9HaldEYGea9I+vqwFr/e3iWKQicTakigp8D0BVWluA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 950e8b43-ac05-422a-216e-08db98630ccd 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:58:58.7863 (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: Wd1WCIW3+/LSpN1TepBCNwyEyrZSz9urKCqjlyF44XYtLtNKrTVCndfa2HVNWpwv7xTzTxmjDDqRYIAKfatF3CR1eBlhDLQBMhu1zrI2wXghwGBzApdeNBlzMSOm7Bmn X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: 3STQVAXOWZLIW635J5CSIVQD2XJY24RB X-Message-ID-Hash: 3STQVAXOWZLIW635J5CSIVQD2XJY24RB 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 --- sound/soc/codecs/hdmi-codec.c | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index d21f69f05342..13689e718d36 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -723,24 +723,6 @@ static u64 hdmi_codec_formats = SND_SOC_POSSIBLE_DAIFMT_LEFT_J | SND_SOC_POSSIBLE_DAIFMT_AC97; -static const struct snd_soc_dai_ops hdmi_codec_i2s_dai_ops = { - .startup = hdmi_codec_startup, - .shutdown = hdmi_codec_shutdown, - .hw_params = hdmi_codec_hw_params, - .prepare = hdmi_codec_prepare, - .set_fmt = hdmi_codec_i2s_set_fmt, - .mute_stream = hdmi_codec_mute, - .auto_selectable_formats = &hdmi_codec_formats, - .num_auto_selectable_formats = 1, -}; - -static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = { - .startup = hdmi_codec_startup, - .shutdown = hdmi_codec_shutdown, - .hw_params = hdmi_codec_hw_params, - .mute_stream = hdmi_codec_mute, -}; - #define HDMI_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\ SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\ @@ -921,10 +903,31 @@ static int hdmi_dai_spdif_probe(struct snd_soc_dai *dai) return 0; } +static const struct snd_soc_dai_ops hdmi_codec_i2s_dai_ops = { + .probe = hdmi_dai_probe, + .startup = hdmi_codec_startup, + .shutdown = hdmi_codec_shutdown, + .hw_params = hdmi_codec_hw_params, + .prepare = hdmi_codec_prepare, + .set_fmt = hdmi_codec_i2s_set_fmt, + .mute_stream = hdmi_codec_mute, + .pcm_new = hdmi_codec_pcm_new, + .auto_selectable_formats = &hdmi_codec_formats, + .num_auto_selectable_formats = 1, +}; + +static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = { + .probe = hdmi_dai_spdif_probe, + .startup = hdmi_codec_startup, + .shutdown = hdmi_codec_shutdown, + .hw_params = hdmi_codec_hw_params, + .mute_stream = hdmi_codec_mute, + .pcm_new = hdmi_codec_pcm_new, +}; + static const struct snd_soc_dai_driver hdmi_i2s_dai = { .name = "i2s-hifi", .id = DAI_ID_I2S, - .probe = hdmi_dai_probe, .playback = { .stream_name = "I2S Playback", .channels_min = 2, @@ -942,13 +945,11 @@ static const struct snd_soc_dai_driver hdmi_i2s_dai = { .sig_bits = 24, }, .ops = &hdmi_codec_i2s_dai_ops, - .pcm_new = hdmi_codec_pcm_new, }; static const struct snd_soc_dai_driver hdmi_spdif_dai = { .name = "spdif-hifi", .id = DAI_ID_SPDIF, - .probe = hdmi_dai_spdif_probe, .playback = { .stream_name = "SPDIF Playback", .channels_min = 2, @@ -964,7 +965,6 @@ static const struct snd_soc_dai_driver hdmi_spdif_dai = { .formats = SPDIF_FORMATS, }, .ops = &hdmi_codec_spdif_dai_ops, - .pcm_new = hdmi_codec_pcm_new, }; static int hdmi_of_xlate_dai_id(struct snd_soc_component *component, From patchwork Tue Aug 8 22:59: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: 711587 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 C3281C001DB for ; Tue, 8 Aug 2023 23:06: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 E9BBBEC8; Wed, 9 Aug 2023 01:06:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E9BBBEC8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691536012; bh=T/JYhbmvi6JEIwMO8uqAO8+4/7EKoe3F36kpr7sBrO8=; 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=Y3wzIE3nSxRMtWFlGuobLQeUBU/M1i4wLiXQip8hr/Kg6YT92z6zMbgKNGSRwYHIf eiTFSTG8NenuvMj4dcNU8p/4SHWp/lV0/6RrF9Rk5fI0MaUHoPtX+ab5f2Wxz3LIXp FG9QP/jS2f5JqEiow3xVzWsqNQUCN+rPTUMV/ZaQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3FD1DF80605; Wed, 9 Aug 2023 00:59:13 +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 DABDAF806D9; Wed, 9 Aug 2023 00:59:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B565AF805F4; Wed, 9 Aug 2023 00:59:09 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71e]) (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 46089F806CE for ; Wed, 9 Aug 2023 00:59:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 46089F806CE 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=AiccxorR ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PDlsD78KjxMFmjrC4RWdh4W0dZMFI9+h3UTfjKfnC/BmSmUJzxNqGaMSNuilW6O37I5Ps1lSLuzYIj5zasIF6ER8sHh5/QpvdGGAHqsnr3WSXQUaqQGVXUmZeV03EktkOMChZKAPPbKPM9hSaCIRWLyWbcgNs7KQq/txMGgwOT+f+iIVPoS+jservNS0Pm3/Wb4QX2ZyCm0tbCWn7yRFjEH0fEj/cAZmiZI+4STuFeh2wRTlLN4F3VPoxE/vrWOVRojqm9ndFsyyIou85mjwMtmRZm7kOxLvW6aquZD4jSyQW5nNNp32CEfzgUKYg1KJPd40gPxqlGl0f332HlLeUQ== 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=lmdMINNXf7yZVGeNQRgMRAOzqUBW5RKk5UUksA8gCUI=; b=hCjnCUIljC5dS8lSEbvq4kYXz7eJ8eYKLJhAGlWarpO6QI7U9gWQ6jFrYDA0GXjM6+0ixHO9O/IwllN953LX/RJXung0cOoEwU/BqMErqfbqPE39Iir2QyRk5Gzj7n5W2ecX/QODdwHyVOlYrbiolKWuMxsaDrUtSn2V+9ktrHG2y26lgJQ4WbdE6ronlasa/4zXGy9PSY34/m/Usp36+J/VwvW8ccevr8cx0zBluA1BTBPM7RZqp+xTv8nQ7yj9mLct5IMOG2oumRgON7MpFTwdF3FfwJ1vGXpMhoBNBVccgzdFea3dj0QR+KwjzJnksaV+xE6nDw0eKUZxmX4JMA== 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=lmdMINNXf7yZVGeNQRgMRAOzqUBW5RKk5UUksA8gCUI=; b=AiccxorRsU+9NMQDufKGy8hC9y/YvyZ7mGNz3XLK1AfgnWe+WnIMo99cDpnFKHlreNnaeNM/vx1VWSEzE5zv28swvOc30hBsWEh+tOyWSPpZRmd4UXNWkTYpF3wNbxkDRk4ge9qT6w1aXEhjIZSt+UCVRYnoWgAIlbtsKXILvSE= 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 OS3PR01MB8414.jpnprd01.prod.outlook.com (2603:1096:604:192::14) 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:59: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.6652.028; Tue, 8 Aug 2023 22:59:04 +0000 Message-ID: <87cyzx9m4o.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH v2 39/39] ASoC: soc-dai.h: remove unused call back functions 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:59:03 +0000 X-ClientProxiedBy: TYCP286CA0169.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::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_|OS3PR01MB8414:EE_ X-MS-Office365-Filtering-Correlation-Id: 09508c53-27df-4554-9daf-08db98630ff7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 08nZfimdxRdo5kCW6lYhzQ/2fo2Go6VD/KArR2Sd7qvadi9RFQZFntFsKxykrd/fu5Mt1oBiE3Gl8LvYmonljqgL4Vz3PgX2Ibmf1F19j9sFAN9MVKkP0NrVG4G9M40NB1rc4qf+GEL6GuoC4F9/78O44a9xrZdW5kTfGFt3CDygyCoOsf0HXKgGnyKIHqpa/RTHmtP3HebXt29LAxsZ9sDQtRi9IaUKa0J3bx1w4fJ159qxqAyii1To+AN6A1TgpFBgZyAh/P1eisXRkDjWueUcqGD96JNjUKK9y+cNAEnBlpuHu8HBM1PfGGneDofdoBZSnuSKI/QzRBx6glQ9uqlNFYkmjvzHQfV/71nycOTwSk4DArY+VSgWyTWTjFbRO6MU2DtQTnp0Z7e0aHlHbi3QoKV+eBf0bQA2zUx9iDVq7gmZXoLdm9JBgnigLl4/1a3VBZPHDdO9wW0SEdr8rTAfvEjXhIlgFjPQuWSD4hvNu15NQ9TLjnjWuycIyvVe03t0nhW8kEjLSGEtleN0t1Cjju3+tX7MdGWXV9/to28OHgoFTVLENOENIDFtVOsUsfZJwUx1IfDiaj6mrqp89/ddt1ucjAEazGp6Acg+tOS9z5ZOTL7LQjzQuMHQZsfw 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)(396003)(136003)(366004)(346002)(376002)(39860400002)(1800799006)(451199021)(186006)(5660300002)(38350700002)(8676002)(8936002)(38100700002)(2906002)(86362001)(52116002)(6512007)(6486002)(2616005)(110136005)(83380400001)(478600001)(66556008)(6506007)(26005)(4326008)(41300700001)(36756003)(316002)(66476007)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tXHs4jpD/P9gIlZ1Gq5fX5OsKlY9EEHeczGYkYXStAmF1kqPAapykYcpXWnOA4JjFomP2bihxPcPGxT3qtHlzSqLq28p7lUjn9l3ZNwxqoyWX/CRed4l072v4nfhyefQPdBIy2TCpwyPjPcP7+7xQB6MNPcKqLVyMZFFtmFg3nJplyOFsf7VRSFT8+puX4HPALBxCvmvy7OL0vXvY1sw2z8+v27JKfi7JWbW3fgfm5YF4BKzxKpVgJGDk7S4T3V1xvBJTTREto/OlACbXFO2Am2He3uEdpPhLO+3kpzUoWKNLhMAX8zE/FG152sxGn05rNe0uH93iEgsxVsHbHVVfl1HvtLsAqS3lOsGch6vIGHskur9gYwSNMslRUl1EA7OZa3j+1Dq/IRFKGSaOjnrvJZH813AKO0frrbmUxGUgcXDNwNdj4BobFbSLtN6MhYvetvP2MwEwyHoE0AaiB2yRVPq/+MGaHkbPOGpbSPknGU9ZskPlU2D7kntXzXGrQFOmZmkrUJFAOyW9GdLg5+ZQJ31UK4LdkgjVMYKyYVQKd2WkT7611n63Cfh1UOyu4FmzG6wIJV9v9kYWY7BaPiLZlEFAxdBewqYFdBICze7KBPgMspOX5e0N47IwsLnQ912OSGj3B9dj/VILWPFKwQ/ntebwTmB7+RtAQmeDylpgc0sfxWH1yP6r3+w5uBAV3/a1XYRfRfswr540VpIarQ5PXQupQFMqkfUNBiJbe+qfL7aDLEC4Uxf+Yjitsa5AvJb4gmvBH19/DZKcZoblsxnZZ9KRX05CB7Tyb/2bKMKz0xW1R80JmImdxDzhmGouvGahdr6xMcB7AxXW/j/Yy3XE3KIEZ75tbIsyRSxXS2RtSeGQR4L9wV3r5qEmCFro0/0wtdhBopupitODJUz+aweY168Fksk1Wu9C/qEumbU+YKSIGN9JXL7F6DjhQiIKID8JHDKy85YmW2HEtNjxzEF8Pt9lcMWAeqxHaPnoWwzu/v5K8nSbW7P177Dpark53UQIK995uRfeEYg9XqgCsFIYOXMYsjFp2VxM4haM/lz5lg4r6Gxx/KEg9hEQ6JnD7c1Y7c8Qe2wU9wFJKkpzAvjqV3A8a5Fl0tgxMJUOiBF2ykxzTLkCG0iip+NkailTcoVFaYYTB1a2CNxUKmTCxw1ypqfgP2suEutjuIa1Mvn2xEvtNrpEDQ9QpwyX6OgQ8Jsy7wKaqXeCuuWZOn/brRnY+xu39NpWe33JtlDngAmK5r+W4XAp+LjPs9SuU+rKcp+scT4CBga+frESUE/HwMIXtgNvAnGsq8GrM6HnUlFYyfCcn9DdS18UJUsm/fcuVxgJcjg75hH7wmqDbjGoI8KU2wY85mb7JlBRYTCQj1Tt17CiOIUVvUmyXCZJ8IDKFymH/SzGv+Dq4Jd9uPQqtFg2kzECIFUxJHjRsrNKZYqmGoRjM/BNLLQTehaE9LoVDyjcF3udjOtv8GJnbUzgdNanTN8RR+tdHYmdwdBTU/giZDlvs/47Q1V6dxA4Xgs0MUZ52/X3vWzkFH5fevL4Xzw7rRByuP7tRlqUqsyA+RDnOoTpzDLK/+3WaZLSu8KEd52odUttDdpOiB5bdTUm0F4ovNnX+V3vNvYkH3syUw/Hxg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09508c53-27df-4554-9daf-08db98630ff7 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:59:04.0828 (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: KGveQWTLkeAyKP3OkX2r/gSBZPst7P1zHrcTJR5gvzFYlcpTW8BsuSylRqmkxDbLMIpMkkKSo140qEXYaOszrW72yPTmt6aTMLRqkkec8mwklR/sJPQ2QsjauIj6y5si X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8414 Message-ID-Hash: DOLTKK6743ELF57YQ5QSBR2BAQVKIQTP X-Message-ID-Hash: DOLTKK6743ELF57YQ5QSBR2BAQVKIQTP 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: Now, all drivers are using ops call backs. Let's remove unused other call back functions. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dai.h | 13 ------------- sound/soc/soc-core.c | 25 ------------------------- 2 files changed, 38 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 85f897fea21a..5fcfba47d98c 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -414,15 +414,6 @@ struct snd_soc_dai_driver { struct snd_soc_dobj dobj; struct of_phandle_args *dai_args; - /* DAI driver callbacks */ - int (*probe)(struct snd_soc_dai *dai); - int (*remove)(struct snd_soc_dai *dai); - /* compress dai */ - int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num); - /* Optional Callback used at pcm creation*/ - int (*pcm_new)(struct snd_soc_pcm_runtime *rtd, - struct snd_soc_dai *dai); - /* ops */ const struct snd_soc_dai_ops *ops; const struct snd_soc_cdai_ops *cops; @@ -433,10 +424,6 @@ struct snd_soc_dai_driver { unsigned int symmetric_rate:1; unsigned int symmetric_channels:1; unsigned int symmetric_sample_bits:1; - - /* probe ordering - for components with runtime dependencies */ - int probe_order; - int remove_order; }; /* for Playback/Capture */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7dbf37e0ba2f..a5b96c17633a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2510,7 +2510,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, { struct device *dev = component->dev; struct snd_soc_dai *dai; - struct snd_soc_dai_ops *ops; /* REMOVE ME */ lockdep_assert_held(&client_mutex); @@ -2539,30 +2538,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, if (!dai->name) return NULL; - /* REMOVE ME */ - if (dai_drv->probe || - dai_drv->remove || - dai_drv->compress_new || - dai_drv->pcm_new || - dai_drv->probe_order || - dai_drv->remove_order) { - - ops = devm_kzalloc(dev, sizeof(struct snd_soc_dai_ops), GFP_KERNEL); - if (!ops) - return NULL; - if (dai_drv->ops) - memcpy(ops, dai_drv->ops, sizeof(struct snd_soc_dai_ops)); - - ops->probe = dai_drv->probe; - ops->remove = dai_drv->remove; - ops->compress_new = dai_drv->compress_new; - ops->pcm_new = dai_drv->pcm_new; - ops->probe_order = dai_drv->probe_order; - ops->remove_order = dai_drv->remove_order; - - dai_drv->ops = ops; - } - dai->component = component; dai->dev = dev; dai->driver = dai_drv;