From patchwork Wed Aug 2 00:52:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337434 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 2679FEB64DD for ; Wed, 2 Aug 2023 00:53:55 +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 D3FCB820; Wed, 2 Aug 2023 02:53:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D3FCB820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937632; 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=jVflyIQSEB31+BR/Zs0uBfdnyStmRkfDil0mn8r0MIzvlgt1OcFnkOHdrfPwaSz67 kHCib1zBxjYYLdqA9n8umUBotpMkHQfHE8zIo7KN/1whgh9C3rYZj2AyyqeIzDSwCw WPJC6UoY0kti2QfdAKsuJ3JsFGIl+dUAu+KKvlCE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D45A5F801D5; Wed, 2 Aug 2023 02:52: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 395F2F8025A; Wed, 2 Aug 2023 02:52:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 10397F801D5; Wed, 2 Aug 2023 02:52:29 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20727.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::727]) (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 E4104F80163 for ; Wed, 2 Aug 2023 02:52:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E4104F80163 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=JGUxGwLf ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QBgJtiqiy3N5wa7OFu+zwYihJaSB13OkkAGa2zbYPi2NvE/WtV3OCstXsA8Ey9rFGQVwTdzFGv2GEf5cWeouGzp3QT+QDPGJ0t7VBKdLjYhmhx6ZH+ih+NXRuInWfn/rCokb516zJmeGvO5rmLJouMCusynSWJYjSy9EtYdD5unzzBGvXcK19QC9tAKZ6WroZyxoN3bxJ1t7Ts4jNBrqtn5lImUnnwyHtXUg1UhbY6qZo6P8+AFtsT1Y+uvqr/RwUrpnbAgdnniKzSI5e4zN09UFQCtO6DNbLPh7DJ9aKt4h3n2n58E97qjxeikrAl0qx+5JsykeqM1/4SROwaWTjg== 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=JcQE5Mx9+WACjedgnRgBAZkv7PBxlSxz7Bo7BCBQw0B3wXh/098T+ez4lpvYOBWeDzRTOZoO+bsbVva9eBIRnCIPrpQSuztWSqwNIV0pEtqw+p4jnVUHWOYWyP6zWFc5xXCRGlkkIs8LXsLBzIJwlMc6cS1oBTenvuikR/22RqmwkQwMXbo5PFUcrER5ZTyD/hB2X/cBMy06Gu/kwCtzKTM1Nmu59Alaj1Zdn2Ed0rLFFM2Jy1uWdmoCT1PcqpgfaFxF19joW2wDI3JT4MaE/McQ3YCO9+mNlsf+GO/y9FU0tgEp+3o/XYKobVKKT0z9yMTDLv3n7EwOvEV3D5Rg/w== 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=JGUxGwLfzfxCRZhEEOSzFYx3pambguxn1WRjRS6e7f+ZlvZzTCtsp0rXaIueM/i724fHMot8dH2POhzH9v/r/TCnFWmJSmHIEQLD5+4xV/3KoqGpQ2u3tlY4YmrlkPah8S6MdaDJKDg2eqLsNx3W+BLN77h23wWo0jTHLXC1ONM= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:52:11 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:52:11 +0000 Message-ID: <878rauuuyt.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 01/38] 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: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:52:10 +0000 X-ClientProxiedBy: TYCP286CA0325.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3b7::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: ebeaa0cf-d7ef-48ec-0991-08db92f2b465 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CCAHlvrIkH8ffF8Sjcd3EnbjHItSeWz9c7KEHIXZzB537783hY1rJk3AHWLFkbnjo1eNgUsdw3AbNbfyjXu4uHUmQyNovyNLy0aR8BzADyaviulK4hQcktg2hrslCKYd+pwsTFX5i2S5z5HHHTYtU9QJSfqUo9bOXrOgaReI0NYAS2bP9lCykvna+TrWiw4qOAlr6zz/PUMIa9jevZ3SU56Wtb7PuNS8DijtB+VcJMd3QRQARAKq2qi4xLSwL3t/bzVSP7C6MNxu+BXYIXAfFYTDNactSobTIOWqdx/7rycbMFCVOa9iXCbfSnwGAiBxrjsPJS7ragJGoH011ShYu7hywHy42YVICIClzZzPQWK3aKOcS/+bVeGcKly7/A4rr+TfCLb+CCfa+yjrxDYJ06Jv/8ktQ/1FrshnvM+gfrmI2Dxk7APGGOEYxep//7KZMdh05XxbtvSCHOuZTu+MBtgCmRG5vue3Abl3mmn+W78dxEsZOD91qJMaAjXq5t0WAS+ZfBgHRtrDhPOMgXkTIWEj3I9/VLHzJatG0Z4BaKxfDCq4oIehYSbkNZqhDOr92zse+myIOY46p6SeSuvtlwNqxI37UkSOOCQS/SnlXBdzp6b56iEtzhnvE5T1M9NV 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y4I0IlSbmW+MpXb4s00okkpFL0M7ehuVrw2muLzpl7F7pP7ArSde5pcGN6SiQhF4gpQdI/Na6oeJCjiwE/6QXhG6BGfpW26JUoBdgY2bBds7AZuKLSkrDF/OlEna1qUQUBYJYxIjZjnb1d6kUgAmDAOsuWBirYwNsx67kfGv5eJeKSAqMPoICetk/1TUjK5q6stz+hU4Skx29kWxCV+8bbyKZhjbc3/pnq+IBS5wiNVHwceHvYfsSrGUL4A0rWvvrU3J7sezgXCwIfsn+y+vZksN0iv2hNYoE3DBRFlnJM0NN1QJkwyReQR5XXWI2n+LvEycYYetn9vsE33TiynQCTNwS6WFRLjZV5sSAu++2MePUycrcWm/MRejc0W/22Y0w0ejjZAnihJOL1GgORx89fHR59Y/EGN1YAyVZJJ7R5bUPDM1p5Ak5WFau3lPJ3tOGM58GdnrvP05BExfTElXSir1NER40XLzeo8/CWvgVlyG4rasEnQNIMRiU4xm1lsApwHGPp1kQunNBNL1COtbis7uznLiUrG0KJ+3ky42g9tEpMayNjizWYsiopvQAhhvcycO/m6qlqLWTJkcK6tGA6z5HhsywkLtaOtHdNat1lKitcR9O7X1ibHckagEjx6FMQprQz905xS8RQ7PINf/snovM355JERh/Qcwwv+zJLOsQiozUSGWsprDfz05j5WeMn3UCohXf3Fdzu16dwA9+IYhMbXLZk083yztOYMb4FsYkYh3PWhSRh/375GcycRMQ2ejmpqkekhXp9158A8vJ0rRMueTJsDhUahjmajNStmMO/w18G7CPgAJEMlOPIWSVQkP+kyoJ12Z6WlkSr5wx47YOK5emZ1HpjjMRImerC9FFVzA0fbWVLQVlmRVDyvrdCX4lsB5kvsHlCdROn7bm+Y4aNEqgy1Wen2z9/eJ2uCGmtxw0UGFSZ1yL+qZYixHimsV4oiLk5pJI2BzthkADKt5qozGSrUKMzIOf6cSKfFG0nvkf9Br6XglrA6skV19JPrvY59Z9M14FF/a41icFLth1fc6iHsVGoO0TxzUfW1019tXMALaYNSoMUI3JfLkkzpOLECGLsnF5FFmvbZ2d3ECxPlfBGI6fneEjuJGEcyifXaUq65Aip5NpifIEi5y98o3Xo/aD9AZqgXqQsO+aVa7FEcgOs/mtiB2i21i3Sqvyi2g6WpqaCWwk0L6Oebu8nCxQ5KXw1hiZqU7W88OlTCiwatTDke6rZErfXvq08PRSyj4Dj9V7+ZpQ1ZKxvyXcCIMDTmQWAehBVsRxol830mllaD4chg3xqKRUPqe3kT1bEHNKGVzoP1nQyCmyJHFGvmxX+MTwkUgyy0taleG9GT+NhrlZA3GpH3Q8dIE9slICaF4RYFhx6UC/iVOc0eXc3likzD4X3jpirbdGrFpJ8PzuQ+eqi/VSa2kMeQr/S66IlBXC7mUPyTgd/X1NlwjPPzF762xHtShQ4ykrdfDC7QzAzuQKL9BgdIVwoWadplJtU8lFHK12bAac4XKcKVOzPVXt/pYF78QNP+6XV3J6i2v5uwv+l8YwNHTjYeW1XC5ZfJWmFRK9Fk6JtzP4R8iORQqUaCGF/ITGKY39j5JiKVSqR3KFNrt04Q9B2pOA0U= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebeaa0cf-d7ef-48ec-0991-08db92f2b465 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:52:11.0760 (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: rjkuR+0RmYCpHF7gSLY828KKVVFyrnfDabXMAfSjnF4VlgQBI4P5cD1lVOGyrXCLibrxBdLZL8vzmh/RxyXMDUIRZLeXUFJfuXzJJ9mwj93Ii9wsL/wZXK1CcmLZxyoU X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: 54J7LTDXN43H3FLWGPDC2R3OHXIQZ7KS X-Message-ID-Hash: 54J7LTDXN43H3FLWGPDC2R3OHXIQZ7KS 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 Wed Aug 2 00:52:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337435 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 C4047EB64DD for ; Wed, 2 Aug 2023 00:54:16 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8B37B82A; Wed, 2 Aug 2023 02:53:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8B37B82A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937654; bh=cMFH5Dxy+ZJoT8cWJQ+Hyd/fk0/oPbz3zB6uevGnAwg=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=SPcnXtfBAUvHVYokTdbptXMs0xDDwbBs8/zkjXj0Uw4v602VFNPem/AyJ9VcAo0pN qtjtygFxmUhVjPyPKPhLMe9m4D/IWG3RiMkM90KU7HwiyyYe8L3rqzzHX9tiv5B1wC gT7KB3AmVd/mlFbuQDO1esl8RVnqMjXn2mlnfiNc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5D003F8055B; Wed, 2 Aug 2023 02:52: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 18CEBF802BE; Wed, 2 Aug 2023 02:52:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 47F64F80549; Wed, 2 Aug 2023 02:52:39 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20721.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::721]) (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 0CD6DF80149 for ; Wed, 2 Aug 2023 02:52:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0CD6DF80149 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=U0fkcwF6 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DthNmhmMFvKgONWGXjssJY1ZXOwieEqJ/NViroyF67Ar1jqaW/1ZMNw/43K7eujTWJtfK5yMB51UMULo2CYS+8KABag5ZDyjXlOuKAc7qnpK06Us5jryiH0FWxxJ4iLR2XdnA2KuKvg7zYqy78vxbNrDcZGuUI7ECLjSDDBLXfKr/kSMWcDIw1VgTvRfuvGR2BzFads1XwPpym0vQ9/axEGaidQci4RW33eH4NV9F6oB+osCN7KnpS2c/Cf3qZrf7lj+vYVZJQLPWO9QavfSF87ZgtRqdKfIVfImCDCaJuUJ2LmXpxFD2Q3fRdF2W8iNjDJBZ1cVjO+meAYckCMO0g== 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=hVVumunzmYcwXVdvaaN93q1hVkmItYRmdoFs7xeuYsw=; b=AXtviMLmJo1748hImUqoHXFQwxo9FUyJbZ41HdsEWkZu/pE5HlaKiwyAh3qySabeT3SHLI5On+nqNf/l29Pm7xWyDPowP5ewfyiB/+SY0feMMF0jwGq7fPMRXmyXfwQVJ87NoQ8yTXr1Fprlq9ZebB4WvCu8uEqeqpCyaZC3Tf9bXq2kbHjmMhiP4J90kNsKFqlMhz5IjP0sVww5XwqaLeiSkhI6/+C0f5GEnPoa8glBM/jrZ315llD+5xy2+pMHsyCjy2ct2X8PkleRYyX6DzWqa8CywAbNI9qufnJYIDdtxehUogFMLZ4RvDTM0JHVSsvJctQriLoRzqgrSDJjLg== 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=hVVumunzmYcwXVdvaaN93q1hVkmItYRmdoFs7xeuYsw=; b=U0fkcwF6eVfCoIlfEXxGwMHYV5cPEB7NpcF9+EIS98i1L6QCI3r1+Ic9F61kO+INqPMWLhfLqQnG2VMOCch4onUE4pYyAOvEHlIgfibJbkaJoE3LOqEjMNs6v9+PS3HaIvDhveHUBszLVHr9locKAs7Jb8SQMXH/v6uctSWrH0U= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:52: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.6631.045; Wed, 2 Aug 2023 00:52:23 +0000 Message-ID: <877cqeuuyh.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 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 02/38] ASoC: ti: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:52:23 +0000 X-ClientProxiedBy: TYCP286CA0135.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: c75f2fdc-bc14-452e-5831-08db92f2bbe6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +cAA8ZaktrNOzdeVUuvGQbRsgg9XrFWy1MPUZp5vMoV4S9v4ItslhPd+FCJGFXahNW9rM97XFQGgDHMkeuUbyuvGEyzfsT6RVm3TlreCHbiKu6aB+x/UOtV60z1sDzBhjocv2IZ8V2itwJH4xykrzSL0A3+9KUpkpBnjq+TmjXWbjePe9e0VJr0oh80OZLIOuX+7LVrZBezhBAOsHXsRzKojj5oX7js5ACZcI3GGOA7a29A22RRnKysKndo8C/Zejk8noSxXj0AdU0AL4GwdmF2LznzKaqlsPM0Tv6lMunQxfWPjx2nAqfQuJ0dxyg96DG5y4uddj52vmWMhooNtZMXosYqNnh25IU0s/afApia52w6sNnDXbxvmGOlsjcSUbj0Ps/vQplYcl51TnvQR5bA7cICU+GsHYaKezg3Yfvwet2grJ+C0o9wdp8NmZ6+1vDdFD67/0d8UTA6N8v5Q2iedKfi5RK5ec/px6mb+Wfcd24m6vyyPD7emFvN/p0AzVROR/o+E9kRgLkavFo5raIm+bSQe/TrhDfjqu4PpSYaVAXuA0YeZ7WNHyoimG90++opeRe7WSRtzzGQFXkAkuf3yT6BjZZt4ueuAH/daxSM5Z5c5Ck8O3SRI9Twp6jli 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 700Jt3OGQ4pGHUeGaYi/ihqRuxdFM+6E8HSH1ooCNVm4pFqjecssjf0buWhdPvEdbRpcwovGYNOeFjoWtDCruty9eH5STjJASlWPQpzBPIBPVGk1joIPcH1SK4g9e6PFKtnN6xcDaSckOOvk1YVi5XsDInHbksK2qBw+RGapDoLfW4s20mELqinCuh6EWncWM47ApiY04ggFWlVnmtV3hEWy0iTlONealLEHzS601U5Oi3sWIcHmvx+f80IoK1hOZsdzEeoYsdgQ7ZWL7twNJlIUp0FJKM/+F5I9nueS8cfUp5oyUsUjOv/UfIIVG6UxUEQg/Y72Te4gXP/lRGTX6d/i5Lc/RkXW+SlraGDU3dqNVYmTIrk/8vL1UWbYagC0w7tRVRyeHzkx4/nHtaGzqNfjGDd32y5x6F+i+pTfLWBuf0wb18XrJevY2TvfQD68gMLnTLtbHDDtwikyXmwKHLsdphe15pj4TZZNgVt9BOLDoHBip0F15mK1spm9388PR3YFRNqv7D1ZEAomjbau10/D8yn1+JAkdXo+gFZDQnsXo8yBaV2oxdqnpKGBaOeBgu/z7QlCPcKyKnXUSCVl2RwJe17AsZX9AVexJveJtq3u/GRMLbagHnYSJZAqc5KWxqHQKNz8WcU5AY1s6E51jY+OfrvDTNFjt4hYVTxOsdBw1H55gG/9eER0s7ZHyNkpxC2qvkwjMdiHW06Z2iipJL0QyZpk6OznajwZ4GSvMuf0gTMg+sZco4MERVR3iV5fFGuy5vKVHkCzyISYuvyXdNDrhkyEhQcyzefOcFsEATSCiO+ozKMS4g25SEwe8oopI5Ke3GlPx3yF2oWCqG4pKGwPhv9Rbmntha/spFRcBCRXWFUQzbvbTMPSyx/nf6NtOh1bRwvcoK4Qccusrnus6tcSx0gI1HfVZZTvQV/xqY/fPpLzG8uu4QzFd4hSCtJhVcOrzNAgkRLdVPR0m1rPT5bXAR2HJ1aauH+7xYRrYa1Iv3ptm4HJRrmZpjk1LH6I67iYjTvocKtWe70LDPzJgxyMw4LZTQNoJIgSnQgXp1vd1T6ZuZschVDoBQBXVfyrztXZ+FxP2q9TrXNROrqdQtuQo/35w7wuRNyp4ZOA3iQbTPcKUyDyJ+iKOIMDPwx7g9n3oZMz6bSQvqhetOWJCZmOGExjw/3iTvxjr8D9N8SyKjTNROK8otOG9++vGZLQrSi7kd8QuBfeEW4uYK7z1AZGYvwDwod/CdZd3/4TcBy0+cVARw9HsJzdcgjDrVcanfE3ziwxwW3/+fzP2g6OKhOcyVfmgR5/M52QzGnVJOxJFrmVYiIjOOE5n5COZccOQ3CrZ8gRUAJhUxQbIXN7lo1l5eUMXiMBfQ5yw7V7fVE5SGwjdftWb2pgLfvnhPTAbE9WOEJK0pYPY7dU+vBccOBES1oaRAVBJXh/HPBR6571GqrBIhuummGcP/Q43FoqtSBmdpWPAmk/75aA6JIz6Vrq3bDjVLPvmetVCx+3dc4sKAqh12a0IRJGiHR42uKB3SYVfMno3tlZNFCDsIlIozR35e4JcRxr7PIXDHuk071JsxEO7bCUQusOnMGPEl4oPthcXjkKKYSduuOVXvyU9SxCI0lWKfuyd0OPuJdFyyE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c75f2fdc-bc14-452e-5831-08db92f2bbe6 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:52:23.6392 (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: ofLVcHDbjEq1eJt7NjTOyRGT72px5otLhuvXD4t+Rjf9IYJDZHPWov70cDYdqRbYFARAC+nudECuCHUe0tbzCVLV17SlqZlG3dIayBKbeTTyEqr5RL3KarvOMde7E9EQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: CBLHFDURU3VNW4MKC344NDY77KI2PSLH X-Message-ID-Hash: CBLHFDURU3VNW4MKC344NDY77KI2PSLH X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:52:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337436 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 3052DC0015E for ; Wed, 2 Aug 2023 00:54:18 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 4530883B; Wed, 2 Aug 2023 02:53:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4530883B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937656; bh=zvABlKNkKAn+3GkNQt79enRKY8aiXPBueZlkaF1xPaw=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=EU9r+iIBmEbMNNXF38v0GENCQ4mz2o0SZSPwfcQ+u7Uk/X/7KGfx2+yFwSuFDgM8A rVTpApJ/3U9/xMMDtKEbuuUnqFpOmIDhvKKPNUTXlt8f55aebEqwA8KgbTcnauRC5D dzMt929dYzl8sJJQlYBMOTvSnE+oVdlKTZIQc6oI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E62F2F80564; Wed, 2 Aug 2023 02:52:52 +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 9C053F80563; Wed, 2 Aug 2023 02:52:52 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DE46CF80563; Wed, 2 Aug 2023 02:52:48 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72e]) (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 5AACAF80557 for ; Wed, 2 Aug 2023 02:52:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5AACAF80557 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=lqPEgKro ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MfJfD3x/cmetHldgpYR4ARy3E/SvU74pZBVcEDNDU3eo/GUupdW7roYtmhhuWJp+NuYfmW8mIDf3XnByCYXwQrJQe/1ytNiI8LKWa4koPK2eQZ1mnPuFbIGprNIR2eAM1fvbjuCwKrpAvNdaOxuTwMb18sdKCmpT6n5K0GOPYB8q2tq+68nsXb3MilxW72JzsEu0O+sCd4RKkYg++j6x5pTYfFiJugtZVVQFwFF/fvydAQuYK19BRiXQQJpJ7kpysuCA6vYfjRWmQuayNh0ECSExuAwz9k2HKO+fp7bSHLK3HqJvEII4kh8H6DpWh7lZ+v1kcGGSewhiMk6Kxmzalw== 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=0c7lHnGvCfbI0XLzeoMVI8lCSHBAr8nJg5RdCsRmdjY=; b=LqkutpVL13YD0QTLiBJmSZ9+Zpov1v9Cs0uwixN4l+E0MIgNKW4pAeZFJg9pnoq8sIdPV5OIV20XLLQABYECX2KGXDCW0Fs2nElyfksfRKAm8VTe7rKh/seFC118/S0o4MiRUiwbIkvJX11ZuFidOoHLY8iOyy1cjwzy7GNRVPR2YaUjPyOAUbVeIgDTEasRJz/ETsYTa2DTQJTTJeNT9vmN2LHU2qD1S/W3oIGTpmYhknyDG9VViS6nafb4E/hEE0Mbn8OuVQQHF0sw8bgGFnnu+sY/D31H5+sy/s8rt9ljXbXQ4nb696FGFPl5J0r5EYqcYHZAVovn2E2tHnhgLA== 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=0c7lHnGvCfbI0XLzeoMVI8lCSHBAr8nJg5RdCsRmdjY=; b=lqPEgKroPEMrSYn/LIyPmHngJio1hGeDpJErv19z+5dxd6qHPxEaiLP1dX6m6V6ZyHITPPSg2QLoTHKvoLJil1mbtz/p+mFbOjZ4ppcFUjk7Lr/yxHmQmmUoYjIuF7nA1xaGzYfjMj4mp7QJV7oxdtKYtZhsenND5hbJsUlpcNE= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:52:38 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:52:38 +0000 Message-ID: <875y5yuuy2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Uwe" , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 03/38] ASoC: adi: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:52:38 +0000 X-ClientProxiedBy: TYCP286CA0098.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: bf4014af-8e4e-4cb7-9950-08db92f2c4cf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XQscpUFtco7Ii0HlHCqlgX4S0aPbLO60EF7P8kg7I6wmvt7hfTCeUuXjr5Lx0zE/0T8D0DJm68POw1WsWWHnxii9oGWPmll8TZVgggFs6Fw5bRWwdEkpFy0PVrq9ZygQ2Z47JBsD+3b/Peq4dlWbhyRDBRHojn8pAc/ZSAuF07Nx+VGHZWWUZM/TUqTzj9JrH5ykcGKRdwi917rmtjujBeE2kxpi30+ZmyW/vyn4xNmlDd9J1tUnK6K+UL0kvVW93EqxhOjlhQUXX9FPWh2mzCkGIQDVhpBMwjvPfcXBlB/cNXZk8qtBLhmlOZnfUl553Ca9nA9ySbpB8GBUEZZsFrltWhNQrxJnIy1A6mMEgN5RzwS+/r2muff+9ldqWxagtadCjVvzBAJ3rVX3vaj+Zp3hSfqVT1V7IkyI3YZtXZ+eB5Fd4HWPWEhYFKeEM89JuEF75cPOMSgCPq1CcRmXQwgYwzUL91cdhkMsIu7CEzK1P0HxPPSCJiI7Y//lPbeWF4YGQ0dMXbrCnUiCMjyWBpTvfe2A043IMG/6T8heB7bjB179LptJcOzfZeKUsCBuDdxIjIxmAPIONkiEPgKica+MbBxA2dSw85EL/A5xtiG4mEQOljsXAjCmMePEbSFf 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(4744005)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hZNVZqdnvbrPuJhiWQqaEy9wuHK+e6QzRJoh48bwk6cEyRaeZUBhP4KCDKFw3ku8fJGJeUxQb09rpeL1kvaCss1tCg0oO/2LoND/O/G4B3qv4LmZ8H+irnLiew3th6BQkzPWZRwH2x19J0JMG7jEl23Ki8pA6KK17ruy+ShZGP9K/dVlWqyhOhNQhhJfsj+mrc1AYwkaTU7X26PJ4849xnftvgRnQwZ48Kv+WT60MM0vv3AfUtjJ4V6KzASYZ3WIL3rQkZy6t+MoG2Es4YCJwMIUJ48W+RPlSnTsUeX0vAdVV4ujedkYG2xvLyFPO0VPq4K0jjhHDMiCOQoiLRAqNNiyd3JbaqqdHx9P5PKltsUrhoR8sYREHX9ax2YbGau/eyii2/20jInrfEaqU3JLhb9BgQH/YluoDDS1Y/cLv7xCNrcLGvasrU7EYGD6xsenCFVQZDXPyUfe6fQzqysK6le5zNhFaj1MrZ8A4r4kgrmDr4Vj7BKJGOMZ/IY0EDe6W1FyLb8XCdlSdOS0UxxLQqrZSG0SNo5dAJuDLlfTkx941jcP7CedNakRfCtAQ8YWPae2WBGBmZK+MrIAbRrekLem1QX+iNnSEaHn776593CRQz5EpCXIvsAH695VfpzhVYz61rdlZFipyAg/kuwhaeJSNu8ZujBaDhJk/5cv65Gp5o/Alj+aVwVwnWL6WURwUWtYtT6ySbQ2xKDx5+QyaO0adgHgQNnHcPHOk13S8934tKgqtJdEBhbolOFAYwg9zMu2KwUIicV/znHFUk6lOpEkElLQCqxkjF53AUORdPoH1otYI5wObCGXq6+mVHJRVuoH4EEwHbJihNXqNR1tfBkUG6e/UQOmnWe7ksH2rDoZfPF1aG3wbfFx5S/yb1Yr1D8aaTC9d5v9cYHlsnq+2KoYuaY6DZIifvkngkiwiCSMOWx7f+RfVV2nNRk5M5IbU3UREU6h5LkWC2QzKmWH/gCXbE6inJWjMIua2cjqlPB5/sDj8Y5Xjo4RhQIeXf2tQAzjePuuid0G8xIxAk5ys3suCFJUREfGR1UuINxKppbr7lPOOz6mE7InltnSW11LsN8bOKOhmKg55SZpfjCVHSJuo1Vcsb1uiFNvxcvJKmkkfZUeXn2BkJlB8GM1bQXh53++F+zqH5sZhvxvA5opLKaLo1sEiutxQjiVVP7ark20yXh3uQBArCUTuFLxO7T1tUPxiTCMMU9mR/SbKM82zxpTtvALc1+CQgn5BNgB46Uw63FWy3rUSMRfaEzWuuvjr3Wulcmh9bSx6F3iivdaHU99HhUxb9PKs+qCOUCmDirSY+vdVw2EyZWKiQRrtfslJ/1Lr/jqg8TWPaSYX+gV9HzYEwCG7zNQGRoO9IMDKgUNKJiGDNqLvZOpbo1VMOnDlvxLMiBf+8cXEkogv2eL5hA+c+f9mglHBX4DgQExfvFN4XluJGUOuFYQ+3L+WDMEHLHUa6Haj7FPifdTbhNkrR4bbg4vJCKFVHdUU89ZpJyuh1sp9cwot6RbXBGZ1FSlUW5Sy5Q/VH/z7vc6Msk/Z1W5vJowDqqDxVWCOVYek1rCsx2ZuBT7zx3VkPjKy2U6wHR9vzO1LNmzGd+8l/rYLqpGbxOIgFFLpzilMNSb6YA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf4014af-8e4e-4cb7-9950-08db92f2c4cf X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:52:38.5839 (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: P44JpSN0ItLGL/joLURbLH8IojcWn/RWjA4hWDDIIdadf9VbHYEilBRpfRXnpn0l4fMc2uTztK1yvByKe+dT3EzEvK7VEeUAQdsAiuUiiVIO64x+JqZq5XcwttzoVcZm X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: 6YIKFEL2PYJAZTIWWQHJFYYW7W5TLOGS X-Message-ID-Hash: 6YIKFEL2PYJAZTIWWQHJFYYW7W5TLOGS X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:52: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: 13337437 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 946FDC0015E for ; Wed, 2 Aug 2023 00:54:43 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5CB2C823; Wed, 2 Aug 2023 02:53:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5CB2C823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937681; bh=VT7jhRl/fcMoNnKivFjGramW21w615SCW/kFVsus6fY=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=bpeOhe6H8Xw2aNUHPWWKLgeeyfw7dUvdwOO155xDPq8nJH6kABKuUXTMZPO5IHGFc +G7/0ppyPhdcz7xzsgSO6BDoKQ+PRVNLMoMgiILP1vq2Jg+FJLVUFDbRkKbRO8vndD mqq/AP0YALPVCD3ciPylf8WPyvAfxBXpzNK/MxWg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4CDA3F80587; Wed, 2 Aug 2023 02:52:59 +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 0A982F8057B; Wed, 2 Aug 2023 02:52:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 80378F8057A; Wed, 2 Aug 2023 02:52:55 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20720.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::720]) (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 11D99F8055C for ; Wed, 2 Aug 2023 02:52:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 11D99F8055C 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=JdhZKYgf ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j/9PsFRDyYawhHcHlhefaUV3KsYg09YCiyIllfP2Pp1zhpy2IZy/4m40IuWPOmuFM9ZScStudBIcpEZtmWiXeGzIZDnth3Gmx3LhzJ4hPHtivxLV9ZdDHB4LKkEbY1nqP3FzpWYrih4DybztZSlvw8JUlIdI+QKIhp+ZTDbPMu2tUcxGBGeD83D/5wI2gRfk9fUs0CqVPb8yS221fholXtczUw4uOyEfwf7chkoa2Pqkdt1BrszHRSUBtzz3ZA+uVvWrmhHDAtP8+zCEfwXzgcrijKinRV6WZXj1+tiFKpa/Fz2dQniL5NHa07/ymIiZthl8vh6o6Uq4tBCSKMZdeA== 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=IB/2m2O31TxjIt2X+RRB87LPseiLF4W8peGV5Rywowo=; b=VcEe2uCKRXY0DGJBqh5Ygi0IiWjkz8aR8qcvDVU+9GNRPM7YNjgCQ2qeWQV4G8OHak52HaktCWmpWWc3GM6hL8DKs4ys6SFyl40cb72Ba6CvuizLc95Deq/KtlrzmT260S4tPUHRsRFAlsKmjJLwPSYZ+vbpSXLcwr6G5EyynTMKCXQFbPTUg7OzuDhNwWwliXq61GrGCtPUwgn+UEf3GehLJ6jg/78PjXpler4oTvVDs+Vv6I3P0nGhTI3PGs1QWC41xn+UBkVF5iWd5FUahY0dofButbKnnyPnvnSAOLv8OMSzDbdzivoUGoyVi6+0455y2IAhOEtWWtNmnzhe/g== 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=IB/2m2O31TxjIt2X+RRB87LPseiLF4W8peGV5Rywowo=; b=JdhZKYgfMs8IogcPV/KsxkSt9qfU79KYkSLIgyXobfnkLxtRBrJx9bTUFH7AerFPQtTmElKOLhJG+VXg+d1RxCsxG1UPJ8EtDLQES4phP7Okjh5RLld0DOvpaU7GhnzP3XE2kzIUYnBTeCTvXjrvG1HsPgKJohdiM8+WKSW4/y0= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:52: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.6631.045; Wed, 2 Aug 2023 00:52:47 +0000 Message-ID: <874jliuuxt.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Uwe" , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 04/38] ASoC: adi: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:52:47 +0000 X-ClientProxiedBy: TYAPR01CA0191.jpnprd01.prod.outlook.com (2603:1096:404:ba::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ce8a612-7740-47e5-9533-08db92f2c9fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iJsljZSrJ4uiuC9cnq3Qr2BUEHMBWAreJNaD+G4yhqmFDrblK21eUp5JXvYFON1xtUN4/ZKl+8c5EjhUFSqITIZ81WQtR0gwg4zrCOtshwMsD8R5o/qGBFKQWP8sRtnl6euC/wEVj+m4KSkH9psHmSlxyI456pktT+ZhWNNx7Hg8MnJypiU6jaV/S6ovNwZ3gNLdCxRUJHSh4i+0f2ow4itpGa8ZBedUiCWD8veP+BcimIU3Ima4E1UQb66T9FUhAI0spT16284gXwrxcpHmvFCymLsiN7vAgMzA3gBq95ew98uiao0xpm9Qsk4SXA0Fb3cujtqAokvSQKJaAtSeKCUqVfe8H5O7z8kN6UlGMWerCdw08xd/EELH2ot4/mxu0HsE3WRHuVSCDyUN2X47oFZ6ByT8dbUM0uWx1UT7FIE3+Ym/1DnpRVUqLlhlZugWLrJalLM1k8oRR3IGV/RSOiRWvaYi8CRq6H5mt3m4D0q0umov0qptSw5BaemiHtVw+Aj25G6YwPN5JE6iEybvrcRQyB0oJtxC+GVPizkOsrKsm0CSgjWfD1CGI6r3dxQeG5fx9qR3QbMyrJS89WAh3ckDe9g2qtXdkSffC2CAjqAMEP93dJWdLB3T/+2U6bvP 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(4744005)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rPACh9XOcO/Uig8ZbgJpnhnGAA17q43EZ69cUCiX9qqVGndGI3gar24C1EYFxmF7yRp4EAnBwicsxmGjlN6ik1Y1AaqQ+m5ztNo837uZbvEDVkIn0XHwqZ5yx2Fa5EXoPamVg1rNj3TkfX3R7IQXixtmgJYalcS1KFdjJGlFmgTsej41ZHpXR6XmE27yI9qsuL9QAqGfKuRGkTsX7YDTgnXSOJJ+LhFrt2abN9fX2T9bFbqX7/WX26ACVFFAbCVAVX/elDqIMjvTTqKrpkoNgmG0zJPvtUi8DpzfejDCHW3IAXaosM7YYUPcrQxSNKxoR5ld/k6hDXvg258rzTBfUVwnDKVsJ3yTVIT/kIHMspwnjCV5G5V+Ao5dyKa/7vWSNuj5zLMK47+jE+fS2ZhtMA9VwJ+HCErntSKVmpWhPNFb97cUwMF05DAGl+t65QyXHxcc3JniywQUw2iwScRAWwKRVQMSzq0US2ZUh1MX8NDrGXAlsOA/uV04NX/GV+VoCNEDh1rAbhtPA8XEcqt+naL8Ht+XmuAzBX9CK8V1XbQ853aJkhXUthQL0NQ/6nYe6MQBXHvJW+oTUnE7Hn+HPc26L/sm88y/aVqvtUNQCD+eB3tUqFTdurFmq7hRLXDXwruWA5xZzlpupUgEOreEnnCT5Vqhe6lVIi2NM20Jaz/3jYGlk5Znb3bXGiFLfQZhg34EUmNqVmYKBCTBgJa4eyNz8g1O0U/XivLZVgJipcWOAOsoGwRq11g0ua0IuihVu2Zh9v4cQZQ7ZyGWPlCMJRAbB/8krh3M/p3p2BmkaHhBpmP1vrIEX8IOEkdr2z+gsSu6NlDgGMvqRnE14Iq6ET5LymBJuWUzztC8Cg7vFYT0Z8gc2yJiSbotz3jeSj6ycUKVq2R18IVkCKc8mZmBmllEJoe4Ki+ml9+66kALIHIw002M/RvR3sbDoNoDeA6vWhvfnxK/0OslWlf6rIGjAFWfrXppWeQuw5gEP50EHeo/HziTkvaF8ZWSGhpXnMrFBpkGPdev9fKscCGNMT7deDdPev2UfQlj84K4soS0hYq0pe5y1LhBKcRI/MlCaapIaYZrMvVcC9wStSReRQAAKxsjjHsN6kUSfSEo9NDOyKOHmdebIlzuCOQHfeyKyxybnBPQLtuCPPBSCdanBqtrwd/GZCuG/Mz0IRS/1/hkkiS/Zc2ZZbOfa6J+/aeUE3sb7nXyDTeaim/DRXjjYB0kNjmYeZSu9+H1O0V7Mj0YLTg7IJxg1FfL3qsM0AK56sH69m6xN4adKv3+dEe27lzzeTsfJKv00dfjSPn4ECy60pHtqESLCAo+ublY1Qxbms7Wx92Y1B0TvBX7ROEG3R3woUEMCKONbMqiak3Cj0/rbX5FvzE0iBHYcJJCQdP6W+DU29SPJ4oZyk52v88aGwYcwHbaoLbARM7pAVGqJ7xc/V/PzIatlfJw7uVCxthqQWes1N82JlJnqdNG2kVSjAIJYXYkO3oRDsNQOtzlm8QmJAZj2l+TkyEj+SxMylhxr/OMhiiobjWnArrCIbcS8HPMsTdhRXuKDueZGth61ypvFcjSVa+SUpHLZ0T7At1EMpcyzz3epj43J6z+iASIGJF2aYbFOcc6HA3LVM4NzpzOLlU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ce8a612-7740-47e5-9533-08db92f2c9fa X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:52:47.2730 (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: iy2VEi96dbTIhCgKqHHMhZpOQEwD1SVu8K+LuLpraDaYgPZDd/yIkwHbTb1GIGtzaee9yUVzjktm9bklYKErBmMtyIVi11gOU9dISQ0kHp6L98J2K3poKXYCoJLFOMaO X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: UMWGWLKJPRVCFH4ZBYFYAFTGBK6KFI2Z X-Message-ID-Hash: UMWGWLKJPRVCFH4ZBYFYAFTGBK6KFI2Z X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:52: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: 13337438 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 BF9BCC0015E for ; Wed, 2 Aug 2023 00:54:59 +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 DF239850; Wed, 2 Aug 2023 02:54:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DF239850 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937698; bh=ElhcncEscVJh6kQNQTT0zW/VMsi2AQBLI55VaLV0UP8=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=GpiseW6NmqgLdG26OA580FDkAmh0gv4B1hA5FYqHhJMUdQzb6HspQ/gUEoKBDPWB/ fqoUA7ByzhVMNu2lywnL+J2vBhd4Z2bxpbJ4DMASG+7ExMx9V+HfpEkCqSgNBp/6KH r37MtY8e31kTg1K1rc1u3EyNuru/fZAbo6SjU2ug= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0AA7AF80588; Wed, 2 Aug 2023 02:53: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 92511F80588; Wed, 2 Aug 2023 02:53:06 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 14D79F80588; Wed, 2 Aug 2023 02:53:01 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20720.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::720]) (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 F062DF80578 for ; Wed, 2 Aug 2023 02:52:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F062DF80578 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=lUxPf81j ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VmyZ2pQfeAFjrmEe1j4nmwo/OkHWQB5dPMDthvQFvoAhKCf55VYWyrhhxxaqKBcTeMnW5Wy6SSutPlCeuUsxq9eUfNxcVuYK9lryZHRdr4OW6cPB2d+U092C6ThzJNQgPa7jEcwInFu2YFifdFWTXn+psC2lKSm0HvZBJ2rGDg2/R7rlBxVy09y57jz39bRbZ3S8AQgOZlA3MsA+d4bMsYAB5OhQEpBbW6UFrBYvDIq0PqqCns7zHQ7q6dHu5q3ROtyOkW6L+e/gn0I0RW+1Ut6rKi86j/9eeko822IENIfA1e/gyQZuC3vg9LRI3jU9FV1B/l/0x5zeJfKQTnxS8A== 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=UArWovGkyY/QpFe2RCYWBUrzlLsbFBs/YnsnPkiHSyE=; b=NsXIQJS5S8sPaDdqP9O5EEtDks6oE+c8+1p40IF8YyxVrrj7+h3YEpK60mOHOSCe5R6eYE5W7s8iU9MUlNBZxqACzS41YBjLS5/JfzbkgsDhi7QjNzyZ+MGMRD75rIEcKKPOJQZMG2I1IHgV9zQU6t+SIYriXktCQ5OH2IGsLA5AGwxgKQ01PzLIMuH3QUUZDgEiN/3IFOS9CcH8Jo2pYOfvNnrGf6C/8hDgQ2FVnGVSzw3ceU0tM80cQEfyfpmyFim1cUfH9H7/ysavjl8PzHshvvlTeyFowDk18+NL1XzjyN94NCWjvzxgL9B6Uu1go/wsrRPKL2TGzbgBEMJ7Lg== 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=UArWovGkyY/QpFe2RCYWBUrzlLsbFBs/YnsnPkiHSyE=; b=lUxPf81jF5hMNkQCfh4CYeK6YMHKAjqx9xVqdr3siAbOinA0kGwHh6FU0pGjmbri6jddMNuI2YIyT5ksSgDfuRSTgBFGg4OMAuKgi84TyC/31SYALf5sw+IE26Wuo6XFmQ+Sx8eUn4hdKbWKYqmAd3k8RJ0aCynBNclwjzQszls= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:52: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.6631.045; Wed, 2 Aug 2023 00:52:53 +0000 Message-ID: <873512uuxn.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 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 05/38] ASoC: amd: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:52:52 +0000 X-ClientProxiedBy: TYCP286CA0113.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: 6992543f-6e14-48f5-06d6-08db92f2cd82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: stzOsNmRzLxnNfjnLGKZmQoBAe1dp8h7EhNe1eNhGFjR9s7BNxwxnQLNuhIgRI1tusjXyriJ1/0evVO95kOyeZlnrWHaGKgXI23vJwnCySDVZCaYrXwm1LNjt1omU1OrjvaHJAxsaPGlGFbE2F9Bob8Q6fGa3Vpyk8N9yvYiXO+EufJ6hqkrQc0OHeO42MDKkbwJi3K/OCkH3nCV5SJ6DqHhGlaN3VE1mT0V3PyYHoZSt6/Zta8pbJWVPF/ovnpFs3QjRenZPz9NDfZJpTytXjbqa82Wb9+sI6FpMoar60xFA0JYqWR7jqgJSZ+r2LtAiDaz1hfvaCFFXvARlDsKbwEVeDDpITag1iq2Iz5AKI156P2kJ0OuxEyba1rk1/57NafGhaJYqfEm3i8p4fl8F/cYsbAZseFtpjSwkr6iAscf42aq8wS+syKvWIbWCIC3lfKGWl6DVplfaK+EFo8JlyeiF31Ul6rMCPm8md8FZXAZ6xAj0D0oCeY3OrzkSU7RXpaWwjTrScZ4wB7YLZ8eseQs2IeOrglcEz2wgaNMoBMq+ROQEfj1vDKVX2gFXAt8YOj3fygKbWJDJU79o9A5th3+SFNv08JFz+SupghbVseRiE4HQ33BKIOUTSZ5iydq 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jv/zX74nQS18LN7JNZcDcJnRQefDIGYL3ZbKU0pTX9InkvYfMuMIqv7ExhGi1nTEUi4PCsMA6LZNKr7p8hXl4YDMU+izyGgzL4llgFV4hNgG+7biF1ndhs6lMubKdN7yLBdFpBJhmKXaZfFMVgO2nwfemmWyWgDCPJvxX4szI4KP7KEqPyLwjsCh6nFSH+Y1zh8oGNhwQc3OjtO0bIeX8Ru6CFMwvyvN7Qz7EyHx8ghVaMrF2mHyXURvsXyiCjg6DbrbOSKWyV2ck9EnCIS56t47yiEMhE6gQYDq0R8vOPtjfFemj5uBGkzyoaxnde2WvT+7SxuE9oIaOLc5vzd0bQe/A7M7TwWPHxdmJ5QERkJ+biph/gCPnstDTpGM/TtjznqIu2AVXcXCimC6dhMbfihM+7FBVr/RQQWoYEGg1goznLGyBjeJ6Pz1e6UVnKxgeCWwA60wWkm4ar9PFWSYlhqSWw6mMIiKdPRxfKSnbGpT0upyXI5l1SeLasrNQJ6d8NrG7nxV73MdGIKA/b8HiUbat9XKUBxZ7opMIALKwLMobO7DMLb7+KW88RYPlxWlvKHRZre0foK2rkDzTDCPthwowYYQYPW6Y7l2kqNTTe/kRuljgt5JIMLruL6TQibwi7I4kk2NzC3l9y10p7AsoKSqyiUC2K5G2UOO7JjOOrrE0Covbn3KfmRQZ24tAjTt5fR7QCfvTWlWS8CweWqMbpKX/Wp4aPNRkDygPoi23DU7zhxtMlt+/RM4B4F7qRqbWFxEcupXB4SS8hq/Di8vsf66BYkJUdIV8hWaqedLaIAHUJQ8NqqZoKr/t7qlumKDV7m4rx0qWTvQ2K7mfeFFLoM0LANzu/gQfQxpmDCyhVhdQz+tfw870FbvptbvCqF5Avai3TtB7H2qB6nhva+yIAJ43F2rUmuGNgFSMZIeU6MlRWMdeWV6nYetPeovZ94ceeibBLw/0l5+Km2wo1VyfwzqlEFzYMjKh9qEMZaH3Bcbdz4xcJcBpS/veoftz9IK6CLu2SsRUX0idd0x303pwIXcWIk/gE4BYTYMG1woYigp9l7vJOiGwojA+TqAjNRvqF7k6+r5v2eESrFVPW+nPGe2mIbRMCRNcTsCfVzAmEIHfQAtU6Kc6YeXPnUv8CQCCPQSbAcXcgJGoJLaRe6ZusEtS2HEQ6OiU3/mgMTWKWXZzQ6liOTv0a3oSTYTq6eRRDD2dQAfKDEKzQbuQ8IacM5ZaYg4+nnElLh5LrWoVUT1GI4f1jbsc2mkUEk6A5I4eql1iLaA4UgVSTWhnWSdMOdioxiZ2et5kwdAZ9Dq55Nhb7XDSuzw8AyuIs9htZFZWDMXsBcBq7Ad39SFOdTWxq4wHruNW1+/cWso3/wa+WiXd6CFo8zW82kGpbCfW/If8mmCtA0hxxf1T8TpsZOGaiz8sTiaJ28wSL5aZ19vN2oj12xDCTbKv7MvMG1qzl4g008sBof9sm9mTCdD6zoMt1JF1X9JxRL8XHI00xx3/GdjK8WrunRo+edBUqCWwl1r6RuSW8rNEh4L2WT36X6Al+toSZKpubPoLWxDR28tYM3+X6mODi+TBmfxZ8InW2Z36+YZ89Azpp+9TR4E2M+0SC8ogFnWZVyNhiUOZOQuRUs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6992543f-6e14-48f5-06d6-08db92f2cd82 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:52:53.1667 (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: fJ8rtRkAe/B7W0MhvIrfo9SqljYO4NaHmP6dmX7LNLJ7384DmV33OP3gIZv8Tmr2XwtuX9SKGCt36t6VDRDSWn0KgB4U7KzTGCW/DGxSAC/b1EFowtRIbT78Nwa08Lnh X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: YPXUOC73ISBLFRMLLNKWMQEG3WH75QGR X-Message-ID-Hash: YPXUOC73ISBLFRMLLNKWMQEG3WH75QGR X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:52: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: 13337439 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 23D16EB64DD for ; Wed, 2 Aug 2023 00:55:09 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C1333857; Wed, 2 Aug 2023 02:54:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C1333857 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937706; bh=9F4W/SL/4I5oEq0CCbU4nS3YFcWTk0qMUKR5V4lf6c4=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=a4rjbVO+76sKhD+w6xIk3JgEx/CXEEBAToak/Gnv4dp0q+7yyaaS7+IuzaMki7oLQ QNmPdM9uOdLlYJy+9U3E69wsccyz8EzynTGkZNsQMPeDMZzEKiE8v9UkXmSy8JBDG4 HerTW+LekzRb/PIWjxjAqML8jg54IF4CEANFDGfM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3E07BF805A9; Wed, 2 Aug 2023 02:53: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 06287F805A9; Wed, 2 Aug 2023 02:53:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 383A4F805AA; Wed, 2 Aug 2023 02:53:07 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20721.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::721]) (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 8B302F80425 for ; Wed, 2 Aug 2023 02:53:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8B302F80425 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=pyAleh3n ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a6k1l/es2wRYCesEWiHP8WZmia2hSarcMjgUjr+wkahEblFjpUtIi9KYojT5PiDfkQh3na1HPAIz3/p7GCqIKnRCjhDIQXwLwsLAwTkTmUzwylNcvFKkqyxaNN0UwT2P6MYHMhxoQWrvIgZ7GuVGLaZW8iBl737pnd/WaDXhRHR6wkavQxURgWm9T9y5gcgFhgCfyQ/SINkZmEhuFstgISnkvp8GQLu+6hl9guLwgiFgdlpnZMh04WaC8fxy9AXs+4/bo3KpbWd+L1zeasqLCXPF39iPFQ0OPi0Me49grtdwSe7giBGjzF1Vz/+9mx765u5I422bV0IeIT2FEklRxA== 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=RYvrdhC8Clysi7YdhqkgnXxH0cMI3M8UPaYT8GTS3fg=; b=b0h9sWnu9402XF/mH8P4ag6LZicYBUq25TA3i5rc6XQXUVqieYk3xS2eX7WPK+54W71E+HsKbbmUXvhpyIEfqIK1AcjJnDlhOzGh3ulVYTlb6od5CHJ8K9FuMXIpx5t8cyuonaI72cxp7HlA0aP0GHAOShIk9vWVvVvcxVbGyDKpZuFiaUUrUghJZP/EXDAWw36Xd/PiSEdeXBN2b/Zbqf5ULG4PWasyoqEArO0TgiSnGcTcH57j2pQjPUslRouzZ5qUK6CJhllsgx9v1+DyvfR6eu7WRK00oW06SeHYsh3JwUeqNbrt3UCpiBp61X38KOF00c5lYWMhK3E0CASD/A== 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=RYvrdhC8Clysi7YdhqkgnXxH0cMI3M8UPaYT8GTS3fg=; b=pyAleh3n8+CVsSHV2QkzKQWA244zI4xjftxcxFMHwlxlc6Idogz3MgZqEWcz4i1Xqgc52VK42MGSw4LWKu3m+XeCPZMj8IDXEglq3UQm1UypH2OqTVtpuuuNMZ5/x9kGljusOGVkRwyYIxnonjIpWQqG6XLC4+hgi8uA5cgYIs0= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:52: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.6631.045; Wed, 2 Aug 2023 00:52:59 +0000 Message-ID: <871qgmuuxh.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 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 06/38] ASoC: dwc: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:52:58 +0000 X-ClientProxiedBy: TYWPR01CA0032.jpnprd01.prod.outlook.com (2603:1096:400:aa::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: c22f3d2d-07a2-4f4e-2dbd-08db92f2d0dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vZNLd7NQFKGr22oPIcwu4Y1Bf2JI1ojomA+93O/h5h0HDqZhdVTY1xsH42SbSu27J83RWktDbtR7voqXDenGZ1G4cEkTlpD7K0/oMxZ/ORmv2mYNJcG0FTgGIQ5OWx9v4c29KwBmvnjydugdWyHuFtOT6WzPKPrDWbOdFJsm53xLGWTbr/05IKuxZxwYi9gxeGOpy8KqqOjRXaR5LwDwXl56tE+X8xLW68mu75MiESxy5HvAgFkuAxHJyP3KkGPCgtzpo0bKpr76i8DKpyN+QtI9DwrwGx9JKknbGF7mZ1N/is6u9AvmPGX+HfIfj/SRUeLIErKQ0/bGtJQwXvrnoF1a5YFS4Y20JLO2pfnRp2UmZTDbGxNYU/GyMQh66GRRAtbVtLAjnLyCyOoA+sUVgjn5ha4MUxBigg5FUvSeudHDjAZUmsraqhr8CG4fQVoqbwpSNbxOaAoqkz6Ed6KfQFYd/hrBdBJOYtW4fJXY1HLnfbndaXT9V6Qm+0C/oqcx9TR2sj1Ay5tEvUzbrXIdEYVGlcjWCtPKZW4XKqvvXabkYJAjK9MssCat8mR+QBb90mRaQr2p0g/W9m7/+YXHCntYRCJV0XpF3+yylTVmDaQ4UTATJAV7aILZAxTDJlJl 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ac+MqV+/rMFm8wYLLtqlApSX1hel3eGFl1kgciFJrcEgS+SmlkL54P1BaVj/8gjV46WU0KESNz7IT9uH3A9Up7zBVqFwFok69iathfzd336y0G4eigAS7oNOuXHHncmseEpJIjjQniDPfreT6asQaBbHN1x3sIPoOxrXhmr6Vil2h8uaD7WNu2PgH17jlFfK06xAgHzWe4jnP1NG5o3X8ysQ4Ad51IIYliFt/Jl9EYWFP3IYkbYTJVJnlaTPBMTTz7Wwl5cs5W9oGHJPapQN41A2zccEgXFuiWGVfV5h2oLmJMH8TeLOlLuT+K2FnjPNwGEaJjyS0Bvb7qss8KkoQRAxJk+8UV0/R9ooQ3xc8QWILpQ/imJTtmyT8KxqePDDj/oXUQvgWmoeAm6YJViRq7rbZWMw9WJ/08E7ohkLazGkCvTHGHOBVhVmaFiXG6jhpXTTm+aWQO8yXfGKpQ4sLlSO4h/S1543IKfRPtXD4xUTFPKMra5Ne7lExV7JwQcHGq2ZtSuo6FgttSpJvmE0RCnJ6Yy+al2uwDUhHGzzUetLA2kkPPtFb/HY0cL9l90QQKeYc+wjq7jTLyXGY5OaEfcX++hXjmmiu+2/Rdf6Ajy3E7En1+pM5AhdRhNJlBh98+3CxhHMd4tDlOVb/87GLGnx1q3KaKoCb44wA3omcPTvYmYt/7yUR2Le4WaFKiScbc9OzpArm/q2PI4QOSHfvKH3MrV43kgXUAfnL9DKthpaOz39Uutk1iOOk8hEp2VGUmXFGL2bfJQSCsll1SQKGxo6FgjNZzLVkLvyrNnqPbGoexbDod+e/Ofzq32c3Alzzhd4DEHPjkAD3VxAEAoN45GeZXTPQcV6QA4zE1xgFObr8nKGK8uucK5xjby/vRV6SnP9Tk6UKOP1AGxLcN4EeH/aYSNinJxrQWMqYTofTvU6PGNArEx/GJDE1909bx8fVYDhP8bOGCHOmuddwvpKQx4PeMj9NmigeDov4TDOKAoUj1Eb2CbLw/bHXldrkA+tE7EP2rJfcvWqhhfWdNlJCHnmomwVBcQ245rYEOhN5VfGeRh89ZgYTctsD0SRuYpJLyKXEm4Ruwc3++Wy5A2jZisgKUN9m2t7oyBaEBf6fgThVunNQpFF3jx6AJ1p4savZxinE+Ksgp4bXuoH+DCr77ajKX8bI3qc6Qa3sdVgwWunIJbm5t3wr0JOpOqB8DvlJ2782uNGcKBfuaBF5g+rC2QP2E5hBByFSFKP+FGVtguOo7FHYYALXzAJ53CeNFURROH0y2nZJHJTjzSMk+zDeVVPgB9t9BGUgseu+8y985AIVMVrDNRjDSfizJy6WlVgk0i1JZUPwH2akofv2K2N6gpWbi3KPn5TX3gU+WvNFqC1PYmrVYGxuAmflVCq745oklHq7ThMBZLQbQB9JmNyTAgIP0WHydhamjQLLDcx/ktMBeMs/6ubpP+R5Ah0DDjAZPkc15oH1UNSxtUQj+FLlam0GenAwadsmRuxWr9vrqyy1X0YudwUtX0/HTGrBXjWyXI20OdJ+fKvqXbPjkayY3tpSuQRLOhwYLHd67PsrwKpRrWrTfwgCk5JpkfDejo9PTqW0clVWa0D0u0SXy30NX9xNfB3snQFJNLVIn1KbAE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c22f3d2d-07a2-4f4e-2dbd-08db92f2d0dc X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:52:58.8912 (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: mMeTOR5WBYFIr/6ZVHiYvdGiH/mpeMP78s3C6SOrvmicJ/zTmAJtyyo6ax8m0OqSwIb1++1FlUoJ1D+A6uK6kG8EgJdxjs4TFIjJRnChS1w1b1+PL/m/7jgvXQVQRRYZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: LVKR4DWE2VXWZLBFMXZT2427FM73LQCV X-Message-ID-Hash: LVKR4DWE2VXWZLBFMXZT2427FM73LQCV X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto 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 Wed Aug 2 00:53: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: 13337440 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 D5D0FEB64DD for ; Wed, 2 Aug 2023 00:55:27 +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 1842F83E; Wed, 2 Aug 2023 02:54:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1842F83E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937726; bh=F//vrXsNL9/LizxvQK5GOU03PkOkreAf3NoBESh8Qv4=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=m1F68Ia1JENQZxSaSbU0mBakaovaYfetmZVdwwPWtb5n2mOvnJvuf9SfQPLaOmAAC IhWvgxy6O1wDVnYWDT/Hh4hb9n9P/oQHKQNW2uCo1TeIRtRwF7orLqxUkPlRrZ9Wfl KOmY4LKZ9vM0doaroFcE8+i/ftafa1iAQakD7D0w= Received: by alsa1.perex.cz (Postfix, from userid 50401) id CD3BAF805BD; Wed, 2 Aug 2023 02:53:19 +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 7DD9CF80425; Wed, 2 Aug 2023 02:53:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0E90FF805B2; Wed, 2 Aug 2023 02:53:14 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070a.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 3EB68F80425 for ; Wed, 2 Aug 2023 02:53:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3EB68F80425 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=U7Ridq2j ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ijVWrBaG2yXLF/LB0zRLFACVogjtuOtwSK6ysvs0Ich2uZtdujxe82TLaWpeICurdK3hZxIsEpbFLz6N8n4h3oB5eoe7fJJhCyr4I9zlvzQxa/DZUxZI+A7JOEP5Wj0Jj2nBOmFvm0FMNUDQt2MND0urNaj3VJg/Kzx9jer0Hvs+OjtEwUpfJEYPErGMe+zS0TRwZg+X6Axc4WmDqbxNfaDGZCrr9xwpFRjin+73wclP4gamukFW9SRgQ3X7yPMa9JVKCFQJlaKC4zRfX49w81AG8opSF/BgvqLU82FqVbaE0THIat61eEq03rQJiyUVOl+f5TcD9cyzY0c/+9Gyxw== 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=uULtnjeH9TM9rI6xly8bh1Pvoy52lkgi36kj7XerO6Y=; b=Fen/UJ63GjPHNdIU7kzVwGDE9rE35I27prVwB4GosQyC0A6uC9cX/uVC0QfnZ1sHN3r9Ik6heuT1jBHuBC+SmoHvX2oqzYvnG6l9iJAiTgITu4GeLvIv4BHX+q9aapr3BA+p2FH9RTuZyPYorz5c2QKvBGsJX8Vrid/k9oTO/cbiNdTjPoOWibxG71TpzNMuuH1a5vCWIla8D8o5T/rWvXOEcwx2F3ZdIZ4hRCICbT3/bIQ3Rms/reldObysTvVUsQjOHZYV+ZzUnZB/E8FTOJ2ryFpyIuwR+5VNGVJFu9NopbeQcX0X/l1vb4JAuJdvPnr+3vVvNOAoC0Z4NxOLrA== 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=uULtnjeH9TM9rI6xly8bh1Pvoy52lkgi36kj7XerO6Y=; b=U7Ridq2jiMt4sF2oYP2z/mVzwvF9+pEJu9FtqxoRFlWiSz9VqeKODIPWAD95QIHBR7ZN/xLrbp2S05oL1fbod1dgwhFw16XGL/JcyYVsbTWFDlC0wuu0ZWKlbG08O+0EXeuzPwoOMU6zGnAFpi6K/J4Jc5Kp2QSXZQ3jxGz9IFs= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:53:05 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:53:05 +0000 Message-ID: <87zg3atgcv.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 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 07/38] ASoC: pxa: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:53:04 +0000 X-ClientProxiedBy: TYWPR01CA0049.jpnprd01.prod.outlook.com (2603:1096:400:17f::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: 6de0cf46-5ee1-46d0-4c1c-08db92f2d493 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nzAr2rk7I8HVr28svBOn9jetb3NutGr8e7734Va7GHZzcqboznRJ1dtWnMYlobBcQnitqwuYbFnKjZgxdm9yO4iU+kADXjuYeMy5tZaXuB1GMIYRRhPNoO5YKmUiVsWw6D0JuKDKNjvVEyPf2H17/UfKpMS5292Ji0tdXKFQtbvuoPyQnItx6Za0TNCP0tnF2p56JsvWxaFL2tEE4/0AXAGMjBd3evR9mKlm8sqf5HEyPz2NtD7jjClUQbOIX08Ve08VPFtCR8Sz4jPsB7sPVure8zZXf4iBytOXMiPjvrDufGvpxTR9Ope4NklB2opEUGhIfpJ2fcSm8XLTW9v2UXdGd8RnANWffDjJ2VhTsO1RV+TgMaYnVWQ0oDQ/z9ZxMRuMowwxL3Wuq8APmKk73okKTK0KhfgLrxReYauMGnjHUiCKzqey5AH2lNDpgTsb1PoNcY/qWW4C4oKUY4GtxnyY2Ky2P3NY8q0IJgpWnVpSkRzyQCmwMEd2ZYyrMnADm1GRjBDv7VUk5yV9QnsLkHBij+gsbkRlr90g9g+WfqmtAj4Shre346LblwiokazF1hXTt4Nb4kdXO7d47/EBwn1eb1WFz1MgdAc8cBGQ7Jk/mepwNNzVmF2DUE5Htz6vfmuLnPQW86tWBFZRRH7Mhg== 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(4744005)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003)(41080700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8wpQ+DWLTPthnVPV9m0fVGP7KKDsjYB6WPGUxQgEHucLHNXkUwJhxcYBJyvOOAHQOns6gb/0gJg9N7GlgSt8iJ42WO6B1VijZzgorgrVQXGvm9tG1rWqwunX8fOI2QJu7wMJEQ0wrq0c5aviwrYcWkngDUjCuRQ0X13bGhlOjPwrhXUQrJ5DMzLGLcOhZY8I48F6J4itP7jUYsRQnEniTCHynW9hx3U952TlKDbj2S18HRG8ZmFeNtXHlejFQ2KFZkW5WdbD4OwS4XQx4rs82Cp545lbHcOM3Y9QFMQLqu9M070BxipSM5IxH6hwIRWx/Itfb4Md7TWKgKmLkPHvD/SXT6ITGP46xzA22xJBY4FhckpYncqVDJEiDCbFUcukPjc5Ne7+btC6hs/FsZ8j7PVWLbS7DQXEdFGMKfGKpOGFsDB9ahMr/OvWFALuIy9fXPA26/++ls0MVJNbRX9q1gPwgZfvoxYNxN9HtfcPpWhmVokV48g7+tsURGx/8CAV/lgf90/Q5UDM55U++36X84+0RFOuosbdiJwQG6RSFkasstqrp8jlG32/WQYDJ1SSvtMHFzLe711gJQN3oi3Mda46DmHYja+n+AWP8T7X4Tujfc99WRdcSs1vA6D8o41Upi+FwxvqmJo2j8SkzK2zqVmCUd1M3b4NrZjdQo36Zc7PiYZxXncI5FsOtmJ+R3FFHw19csHFtRHf5TAEAWUJ4MP99WzAGJNcywZOhCF8lVW2RIyzGurn4tt9FCbsi927xpIhJB8jpGIqR+wJIPHuWqCq/JmT9Ja/D4uOXZu1V3hdxojmJ6crLs3w17RnAMDilJtL/3xHU8WdBhqk6WpWggLdSJzK8W39a2GPhHiSLRiUsecDXjlp7dNic9BygZ7kuKv10JMfjfnRB86j2pGtIDm8a54EfsgV5T+ooaFdLG+nSAoJfNl4DX/CVsN5rNfA0oCaeyes3PvCl7ualioX/l/5l9KVrOwK/VS426AOPFpZlm4/aUW0sOuQ9+lzXd+PEFgmXQN0VYYYoHzva/0G3//EsEszXxBx7ztUq9VNG0ljDqp+8HeYWNvuAT2QuFefNVWJy9ZZ9aQDmY3k1xvVqBU8YiencbRhGlBmFDs0rZK/M7crkSzD8AyRH9pVg2Le8cd8pEPHm7CyVftmc4qI7A4t80uPvSZpCsHNZPK2RCkvnUt0zCuG5xYbS1JDC1X6YHzfwmJSLbYKGcWWsM+b7hCL5Q3qKYcNhDCvX50PDvLKI7asjroOOpAH7WJ6XUuJ91S3hmxxF0eLd2ZUg6ovcquYO32lh4vNaKMngZ5mZRDcQxSw/EVGRzAZ0uzr01eCig7KKDeK4qDtdpTHhcTCjyP3B0MICk/PBVzxRWpelFJ007bh3o/ECnYYuil9hlGxifT0SE4tGqudNgf2mi4qBek+wOBGD5eKRa1mcHQOq2PTfb72Pe35RpC+Mojs/11Sc8ps56A+E/oJHnHxyfi5NbiRPXq6s+MMM3QnddVOe1ne3JQBCsZRF12RIAeR6hF8ikwY9Y6zNpjj4AylNBdY+Z3W30nZrWNI2B1+cnm009UfgDqOwlGmGrHZlJW7d8Dr0XEsPtNXFAzTQqoHoRUlmmQS6L1vIN2YlIgwft1DvTU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6de0cf46-5ee1-46d0-4c1c-08db92f2d493 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:53:05.0421 (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: QYGScysoyMdVuo8wNyPTMngk5JbV+07YsvqbDYjficLfElKPrYFrwa+a/XO5ovXoC0jvxIgymaUbVnn6TU27ZiQPv0LYHRPIijdoTN3/CzAY3Dq0bUL2NonuzOlSacT2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: CTDUVADSLR34XHN5XQ3OJDTPY6UHUHL3 X-Message-ID-Hash: CTDUVADSLR34XHN5XQ3OJDTPY6UHUHL3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:53: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: 13337441 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 32DFFC0015E for ; Wed, 2 Aug 2023 00:55: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 960A486F; Wed, 2 Aug 2023 02:54:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 960A486F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937739; bh=yqoKC4gW7I7HfCN/FYVKHtZXfACEmkDfbhvG+hhfpC0=; 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=CgM6/UkqdMW7HM1MelywOph9+SLESGbI9e7zqTjbQJcPi/nIpj4uVbynEb/caIb6V Bx/CzGHGqoPBKZF5xaWQegnlC4tI2jdomt3i8JQ3hZYImK2KLboQJcCwboRaV37c8B ZvfadD2WcldzngoQ3VqJlAnmotoA4xbEEpWpexZs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 03F32F80549; Wed, 2 Aug 2023 02:53: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 6395AF80544; Wed, 2 Aug 2023 02:53:30 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6B44EF80163; Wed, 2 Aug 2023 02:53:27 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70f]) (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 78DB7F8025A for ; Wed, 2 Aug 2023 02:53:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 78DB7F8025A 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=ITf6FrTC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fPfkQ+IoDvuvYb5uFDxR3fnDAes7goHSmZdj1dxhmtT7cvPW8t6F/S4DKxABRVbGPtptppJNKOTW9jN31NCWNQtMKZSL6vDMGUYI1vApBZzdPQt5XaVweg/RBai0FTmy8GsAgcRoHyOG19A/JzU73N0kSMxCOckRq5QPPHRQUTXRs/eDXAu8sp1SgEC0rCeVjczxXffwAO4hcAVDnDOR96xgjXjq2JAXDyem2SCWVPUCzaSMRRcrlE0mFFtqq/tlh0i7wEMyebI3gJYwcsZfd9oFgg4ygrR93rSes+ch0Ne6QhU2CLuYBdTPKYCT3ZaT1JAFpnbE2mlPudFpSnG6CQ== 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=OjP/X10TNebzobe16IuG64ZVdZkNUeXlJbvzqPmqMqA=; b=g/ivyMo3l+fKxN6pLgKDLIdcCIwdt+p0roygU2Zj24vaXACt5iiehJH0B7nECFkYLoJkuJ3U5YXQyseQa1vaPfCti4kzJ7s1nDvz2IRuT+LVrmuL2lhXkjuxjMeyXtXhAbJaoUgjMam0Cp/JEnqK/50XJ9z8J/6G6Gwz27B7PrAwsHyd3FJmsTpsBY540+MAigYSdX+xSYyZktwwZIK6senaHUg9RXI0h7xEj3N7YFpkKRHQOL+MJ572TFVO39L9QRalj3F2Oz9YBwzGgDyLUM88YQiSl0iwK8ybhkYBCHmFa+qAGW2/YonWdTpxv2SM9KjNOoUMKme0z6/SmzbWNg== 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=OjP/X10TNebzobe16IuG64ZVdZkNUeXlJbvzqPmqMqA=; b=ITf6FrTCYZoipG5OWaJKXBZzjm4SFf5ZZIbUn0ZPsMZrd9Vcq+y00Y3hOW0FTa/7Pv3TManXUt7+5tnqoudYnV+JEnWzcgZkIiCPluLk+KkMJMSWlEhJAslFie98Yx0GDQPfVS3vO+I57GwBKN+4c9ZcFzhjzBqlqRd5DFYdoac= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:53: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.6631.045; Wed, 2 Aug 2023 00:53:19 +0000 Message-ID: <87y1iutgch.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 08/38] ASoC: bcm: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:53:18 +0000 X-ClientProxiedBy: TYCPR01CA0155.jpnprd01.prod.outlook.com (2603:1096:400:2b1::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: 27ae20ca-e84c-497c-86ba-08db92f2dced X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8RZr+RAWpD5HhXPvEQ64BDHa8w4StwHoIA465aLU2RS7im/S9KJ/rUNwPbuo7BtI1rRWN+YReGpWGCSdPnd8lWP5YwOm5saENVUDXugcFP1PJvth9wnKhc5QeohSonvyPUzjCrMcjwxDy1KIz8Ts/+jrvP6HIku3BKhteGVm07fGzzGxRroYzsTsNnPjddd51TdDD08AeqhV4LxJQkOYs7hWQfBAX/I2pXJgWGtNh4Hr2FPKUBGcF/hVcf2l1dW4kyTvgWUr69emGqPVB4+0/qBmaFJWIj9KKqFzZLPBChhoglzdvhGlaMk7gO3qBPdHme+bH4mUy6wztA2IOTaHzvQt5HWZXlZ9K7SK8TmGK22j8+LsLYjESxiumd5zya2K4F/K24T7rX71jaEKrz1DqFU3YUTSTbaEj3uUxMabXAaiI/vvWvB+1YrrNk1fb5W231RUXJWkPu9Gz0UkZ5dNufu0VT9KmDxcfOKrHmj50wH+xvn+RFf9uxoNGZcRWAqaso4lu3Ox38KaPrbRPRYaIVCtzD2GDq/0Yf++2lIL9VfiWSgZCfb9+MydZNCDQqUl0fDUoVtgryMwSZfkf/fQX64Nz+yCIj2vBfFgeveOSUhxry8bO4x95qPndkEsmAy2 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cBFEYPr/deKf2GXQUOeS8/mOY+rxEohBSs3F0KKgzyicxNaIt6GgjOKW/TtsdmbguSX54KP7M7ldIy7y1y9tgEYG6TDf6nIzBcj/DhIJfEahE3maetOjp32WbkJuGtv55RZXnm6Ng3e9f0GFO87OuVSbiDjDvVxKFg+nXvniNoMosjOB0w+fOk8qBFRzUZz7w99H2JgR+SokMDzs5VAF5Hh3H7F/hKifgoKKwQqvWiD4BxqmKX0ESN6YpDAvwsvy3SNVtsJB2/PCWS3STio4evnOqChPqRp1ThxEMKRpcLcM0jHyKp2iCKwO4WySvn0JJkMJgeE9dtVWVPjaae5MRLcdI7nEPqN0icC9W1Z2RMAeWgprcTHCw4pMKoTn70ia6AAouLBRGdxHzkUosyyD9s4J1QHKFPXd4LnRwU7mlQr2R3Ul99xWPGdv1rhGV+kDokX+WTlCV2fRH42uXxbokMht5bbKfSbPX/QfDjpubOSvXwQPjm735AQqYi21uEwVdooqaHo6+453cQbAl7bQjgcCF8cHSpyF/zC92t+yR7nyvkGfoBWrL+N9rpsNvo1EDwp9X8g+QvpL6/mkqrmpkUm5cklZrwCj3veQQcazZRJ1GiKTM3i1y9A4ANJ4ENl3+Vn+HgGO4G+iIhF5t0zrnPUJ9zm9eM/5xoWH+FaGOECwRoCprXAOQDLXOEjKce+2AzyxOM8J3/JrsOPOUgcntCXYFj/I9CLq0RcZbwiX12ERW5Bc8tv6oH4+2yD/MQK9TLHXbk1iCKYdU1pMDIUClKmEcwqMqh13FEjrXHyv8T4049grHECEBSY/e56oeBI+MqC7MUjmyj6IV6a8Bccq7hayeAlpHvmWjjTSBXwbVF39GlSv/tU3Q1Xj81Dp5F6wxO4MPYlEfJ1L4l4gELiwbWs50lodnJaprw/XiMjKuo23J0oCuDMObV6jdBGfTSxOS/JzO8+wYEFfW6X+sPq/5Ede5zahh6JgvOv1sNh4+1tpO9yj+uEuOHVqocmi+cF77hXjlQUNwnzB0o8FEVXiG8EOSykQFoxB19FuBGyUx1wXz83/y9I02ms6RM4TGue+2dacdLRc3thKM6BHAgp/sh9nzNKGtQ4pKXFijk4Zdiey8mg562LAJrU31pIrVsE6bUYW4nhvRGQWuE+06uUcgWWEBWv42mE2AIlWvCDY2zR+sCCzk0JOwd237BdaRihSXAQ4aBfsdX4h743l22C5Pevv9YMYPDGja0kgZSaxGder9XZ/DUx78T+5cLiEioFj3psrM0KFXOQRPuRgBq7oYQ8M1gRgOcB3uxqLQhKAt2Ex09319jBA3NAK9oHplqixPXoQSrOiAm0IpdQvPs0aXxH0YNKMwiibmKtgsrcz+0trOfFg4AOuRBCtEx7i34SrMl64q7IYRCZxVxyDp0W2XzNQsiHC+hni/Ylz5wzoW9zGBP3jNTNnc9UnA71WmTA094cfQwSg2UHGKHArGR6Rh8RSqzBCAh4AOzTr+xt2WKeoPVZNuID8ojqoAcJhavj4V3mapVEc350FARd75HCZxEERAPdmwF1AwyJIeKI88qu/CSNZQBqBQ8GBmznFKYFGE7d6MfIkHTwlw9voZjs/lK1vLu0TIZkOC7fYyy0ULY8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27ae20ca-e84c-497c-86ba-08db92f2dced X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:53:19.0226 (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: WyyhGXN6WtHpO2MG2Au1iqCXxIDoOjTeWRRQEN/2HZgnkwzyR9wZW55xO/w6M4wNlynGzek8J8qdiEF7JgOnmQPR3W7sr8h+Z6QLpTlqKW7nFeIicsMdp7a5lanC/T4X X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: JL76HZ3XWGD6Q6YI7XUCKK67MVPEQUQO X-Message-ID-Hash: JL76HZ3XWGD6Q6YI7XUCKK67MVPEQUQO X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: <> List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:53: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: 13337442 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 507C3EB64DD for ; Wed, 2 Aug 2023 00:56: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 7E5F2844; Wed, 2 Aug 2023 02:55:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7E5F2844 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937758; bh=Es1PrXO2oMKX6cS27+q+y5ouvy4e3pWNB0WMJZeoG+s=; 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=bjEeAGjIAspqfolga+EnBQ8DHMfKLhKZHJuoF1qCZTIEwVr1XZ4ARvwISYNQOhor6 LjV6a3aHURXkTEUdCGFS3KQ8FoumcqNrBPsc/FlFv9VdT487NrU8MMDwTQjRBPiwe1 T+9T+gVKnVWlTFuF9NNXM6gUO7KMT99C9px+MVcM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BEA79F805C6; Wed, 2 Aug 2023 02:53:49 +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 6A793F80579; Wed, 2 Aug 2023 02:53:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 94994F80563; Wed, 2 Aug 2023 02:53:45 +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 929C8F8025A for ; Wed, 2 Aug 2023 02:53:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 929C8F8025A 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=iS/AhaSi ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lK0xGNofmEUP0xUP4qD1g9D9zCnb3lWMYj0SPIHzqr8DmPeNOZ+BIm5xTFaRipEpv5eCvP0+DgFSNbEf/oK/EFdnduwD6+Umsu76dUeaa+MXL0NPbEPL2+Pi5m/1g9sdCzA2+swWMWxq6ZrR/vCuJpYEPo5T0rD1u4CemTRT4jbFbKuCNvxWoNW1tYtPkxx/ym1uSsFsEHEG1iVyyUx7S0b4yR/P3qMZlNP4S7KI0gR5GgGW6Tgt1C9nLPNC+5Ta/P/fsbwyEalE0BFZIte/QnCNi1rE8UJgMStnt/HU1Kfq3lfz3cEATMn/0LyHHqW2oy8VFKHDxx9tLSeb841ZTw== 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=VbG4JGDDHnAW77KCbDHr77BpJznoPugD4d32FSmyEy4=; b=cUUi+BapCMMEnUDkxqIjyT9vL+ugEcF5ZhJplRKL3kvMrWSyxbYPR9xcdgAbMY9JW8jnB1/dTMNYqT2zPypn0I9gojUm3ffURF1jpP9TvdzA2Xys2sQVsOI0wLetVDVyY8lK7nIHJGumFAgd47/KEPTFDMOIyu0egQ0lFm/y5DsGzxmRN7P0zBdcBBJmjID3HQpIL1c3b5h5G6A9yVI5YFeERGZrY5MSoxDQXqMZRbDPLF9wef9ZyRa2zdJ0FHQWgsglxk2TLC4Ebluq+cLvOTmEMsb1S8GtOtXMLD9kgRkB5sqPAzvwIeoHylG54aOq/6q4vldqc3R4hImf2mtyuQ== 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=VbG4JGDDHnAW77KCbDHr77BpJznoPugD4d32FSmyEy4=; b=iS/AhaSiEZmSyq/JVdfOTnzza88IDWa5kf5jyiGFOSOHAk5hRQNjDTRiqMWmpQcqqwBWdWfRrCYrZVIQwglJQJ4yHcYkUqFmflBk9FgXpmhWHRLqosZTkzcJl9Sywb06tdUFxJDLWQQMTWHU9pmfVHXDhkY/pVEX278ro6aGdXI= 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 TY3PR01MB12016.jpnprd01.prod.outlook.com (2603:1096:400:408::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:53: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.6631.045; Wed, 2 Aug 2023 00:53:28 +0000 Message-ID: <87wmyetgc7.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 09/38] ASoC: fsl: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:53:28 +0000 X-ClientProxiedBy: TYWP286CA0028.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::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_|TY3PR01MB12016:EE_ X-MS-Office365-Filtering-Correlation-Id: 741da13b-8c6e-4a66-1227-08db92f2e2b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uEJ1P/DtoacbzUPQyguNkkQ3wklLk/PCyRGMnF71n/MWPMZc7wdlY62AMmlX/w7tqtie9dsQuy1nw10oTlmfzaeIx+qROP+zvf9XGIHEGUyGXFngKFF08JnGXe5BqcKFgx/T454tUIfkZrzJodQWs8gEHcFlT9qDuI+tZ0wLNUFIDrf5wFY1YWIqBw7DQnOII3amh48i1hgJdGNVH0FF9Zo1yZV8PodNowSuLA2b7I6FLIvPfOtZXrKCl2dEAdHxmFhafg5IoZjXu0xbmw5KRLDQ4fwjIpbIQt7Cf09lXvhRYzJ6/FWKNTBX7nBREeYsBKJalMNKaPSoGmuwpwBKCRE4ZBjLB2yJShbA9N75fWGWGC9pFGlQGm+Y6fltFbyBMtKBOCAgBBA/LGBqluuYokYPMQDUaz/c/OFolOvs+zZt8JvboRcJtAVDEkcVmGw0GZeCr1eVWJKKRmMjuaDxmeamEwrpswTRP55UQfgwzot9JGav/bMYbQp8+ffP9Ng4szRI2xd3S43iM0iC81J4O2YwZcFoJgfZlPWIALOOtcdM3W1OFJIDC3M9o+9Zd645eDh6jt6cVeZBuY4PIqRETfBkctJYXTfd1AarfwyzVl5lRoVKX+SHdyALK2GeaQqG 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(30864003)(2906002)(5660300002)(7416002)(2616005)(86362001)(478600001)(54906003)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /IzMwee0mV/9P6Z5kT3pPfx9HOxDrmmI8f+OqGgygMX1e63mb8yPrUWVozM381DsdKoffOgepSvTG2X+WG92WTf9fwoVpDJjp5jOROadSNeIT49qqPuI3lrUSLUInT3qz0uJst1dsCJnY3T/nBXZYojyv1NaRyzL1scIAJTIa8fxnE6TrPYDiyacx78CS/xUU/M12MDG/B52Sc+n6In11rigDNl8tpTFKl5s6Qhu8KWzUNu7fdiRxuJZXhgmAUoJBgNPa5J+iXSGvVpY7Fttn2s8kSLjdrPtwAjvSJ4Hkq9MfiHAkrSLHsvPVsvQpSeJ67RURLu+SyJLfBxOauaYxIpMMsE8Tq7mVM/MJJ19tR5FNc8juSBzX6fpRmd4hr+OHmg9fNYyaxcMpdchEWxgKEfUwVBitB2/iB5a4F6rAbUQLElbxyz4PD2TZ1bYtCTmZz1qD9iGsTx/g+DxZbbcgF5ecxZPU8mIuJGM/rYCsfrrVk6t0q9lBme0enyDcvUZejQPS5vpcAWiIwsA2Q+X3KRbRPMA/uDcRTuvN4UTJrJbF86+TJ1Ylt5gQJi15IgqP99KA3bx0YLCUzzw6C47d2u/KygTF90x0FII18FPB2nkuuBd7rW85FD4og2XDKyhKZlrpBFR/60kx3FBzaCGpK0bhTzbyqleCQdD/q9l9UaKiAXxjHuKqTtbijGaWGmGOdEz+vJkMheW2KcuPVp1fzI5c0WpIHx9KqAFyWviAxhYfvQ1gCkVRxqUmwvOQTJn+/nYaBNQkwRsfC/Rch/WGXVyB0jGzkVDAOp8TTR1vSpQODC7U5hIswhdxx9dUSNAqhVbxnidqX2DBCKY9paZTqzTOpjWwARf5LAxAWSElRi8aPRcMbPtrtcXla3uG0fg9kJuPGtsK6iMArUcKGfvmPkCszPnvwoaMOdbGn55ZZ7+r6VNRIKoGLd8UGeL/V+lZJAzBlB/AHsD7sfAM9Uw5qo239LJ9ZAjWTk2LHrLZjhBAiCRzwErl4JdByajt4qmU1kS+dmDqVHDqcp168DZHbViQyo6oGP7ZqkWBpDhdAziz9X7FS7vz57dZ3bc2BbA3VE0O2ATH2Fx1VL+mDQZvE1w0JNquXq6TVcBO6F0vnxMF1X33Tbwnxl0jMSxyjQ/5td6zmPyx/6dgD4DVe+QHgnqFmmoGbaQ8/TSzH9Vcx3WxqOSVBbqksYGI3X7vOMulWV6RsUQwNIs25yKOqQkl2YMwKMaA+/m8EqqM0P7O0rfWvXJNygJ2+DxcV04QePHy+SZPgVkTq7dc6HfLB1IFe3PqXpyKVnDgA9rZ2whnB8qORiB4n0S5RDRdz6P5gruffkUbEECLqY0fFB2yAuypIAQgxwSh7S1n6jQgKJ+bLnL9RNqrrLCptk3PODSdw/LANetRmXgerJhE4eBdfUEW3UYMfuKfCgu/BqyAsTxiOPjbL6PsU/0M9eMQMNf21OSLgvbESiH68+g+eylMLsx+XTyP7SZzZLODhG9xclMRuNGbymIv7VTfnQKmfadoML/a5/pLX5Uy+onmAHMR8dclVQRBkoKvKEgB7kKjWqNqr+Jfpuru4sQfjkaUnhSXrUUmNl32+Uyjk716oZL+P83jnJqRmERDg5kxDls0RfOjgQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 741da13b-8c6e-4a66-1227-08db92f2e2b1 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:53:28.7029 (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: Ek5m3ANXsknsjArfWIlUjTpChOQYjcxj1pWm1akIYcMEk+FBQn3s87FdJmtkV7Q49wfNv/CL+eK774ftoPsi9wn1Ik4MUnCMD4xeKTzdDmN5YtylHwOMNN+IrDNXKPl9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB12016 Message-ID-Hash: UMKDGCANXOHX27PC3HC3WRJGFSL4XMUK X-Message-ID-Hash: UMKDGCANXOHX27PC3HC3WRJGFSL4XMUK X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:53: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: 13337443 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 007FEEB64DD for ; Wed, 2 Aug 2023 00:56: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 1AA24846; Wed, 2 Aug 2023 02:55:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1AA24846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937774; bh=Rl0vPfr354uiEILcwCWQ8WcbK0lPr48/v2ssA0yEXh8=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Ihj5+jTXVeAwl2zXvGqfQpsU6vy/QpE2HF3Mwj8M/o7O1KH2K/WfHTkT1XWykFryz ow3tRUdnqdf21aSrhIINEmuXzpALuxQDX7LP6Eeh4T4zKEtkrO9bAiD8igBwqIs+Rc TaIpzWtIWiZwvYISG6G7J/OAASTW8X8JZh3FC8IM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id AF3E3F8057A; Wed, 2 Aug 2023 02:53: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 F3DE5F8057A; Wed, 2 Aug 2023 02:53:54 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D7917F805C5; Wed, 2 Aug 2023 02:53:51 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20705.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 A731AF80551 for ; Wed, 2 Aug 2023 02:53:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A731AF80551 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=eYa289Q0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VnFbksUDwSeQg6kgCtjAdwwJsCn4YIdTpI6HtQCo85Prs/iAR1L7cczdeAJjNfSMU4wI4n0rZS/ylkuZnu/bP1XmK2Sq/Q9jPBIV66u6oCHxWJxF90cJ41Y9LU2Wo5qs54BeYRcXviYWjhTFDbCvr98ZL9AXNcZdQqoQtaVQlFrRyd+3Zb6isHP3NOijVu5mqLfLGY8ty9jcHgrECG5hkZViBt23y5TIZ7/MuJnixzKvy5wMKx0ojj3wCOcW847kDpYQTMSy5QgjeLGQHN/WOnvv7zhr80P3Kco1oOr0XmkeXWs4Os9YGcA9k4fIMdt22afTksFFBe2FVezvr/9BJw== 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=fFsMrQ2uQlW7xeEb6enRHp02paM++q4BNrm/b0KUV2E=; b=SKaEOavnVJxSZ5AuTrC95j/00rrPK0ldKBjldYk50bzgV9aSeHiZzH7CqdTmvirWraN/QwjAAtXf0a0efOo8zgJHYzV4CFSE+qklGdQQjK5yFN6x1ktpIEcKWFxazQq+ua1cJLkLDwXVklohbGmBiQeLpg7QYf0zI8XZEbhh5yNEd0oyhlkBojioAL3KRFi3Q61eSKIUM12kt9bq0gfdiCWKwiSmuN1E5ul91BKg2dN7AKAVba6xXA6Uif+II/G9RRHhb5He/2tkiiKSkyf8ihtt7V7A5sNICAfnZceJpL5St3gVwgEx+uMcZCp+y5A5P63pBZs5ttr73jzS2sik7A== 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=fFsMrQ2uQlW7xeEb6enRHp02paM++q4BNrm/b0KUV2E=; b=eYa289Q0Wd1cSfwVBMXShrk7MPJtno/AhoapqdhlmfMgdbLZB07KqOTwWK7p2YUUTpaiLkFRkZwDf2mCo/9VgNzOcgbR+FpDHYTbcnIR65mteZe2XBdlz5+TcDgvPSFIwpnd+fV+tVqQQB3vVVNMsCFcFM4vUmZdobSUq/eLke0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:53:34 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:53:34 +0000 Message-ID: <87v8dytgc2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 10/38] ASoC: img: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:53:34 +0000 X-ClientProxiedBy: TYAPR01CA0096.jpnprd01.prod.outlook.com (2603:1096:404:2c::36) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: e13a0b81-e2d2-4035-0f87-08db92f2e623 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L0JNIHZ0HNbrdCpZJglG7N3+AwX761YiYjey7vbwveosY7ZGfH71WEq1YyvJgrfk03NL6FJQUYfzZtrsLds1B8sdXIdayPXZO4vSfyROg4+pVvXqB0yFDYXwGJxtdVnRHnao9r9asnKcA74XCsuadWWkyuVX6cGw1beids0og0A0zPsXoQehoCxaH2iMjo0or9UbAZbLcoMuwbaLumbMKSVucmaD2c8O8QDrCrg/tTkVoiI2iS1VJHOToSll/vWXU8da/Dn7/8sm+kvn1ev5lx1XrjT41nUUFeME0ZrjPN7PM8e4O4F20a27vIHL3hzi8AtdmlWx+qFixVpfr2sHVw8ggYR5UMVXxfTsUYd37igohKG5J1sNMHHutY5KknWqOwu/LbTwjhvUOM0kkuhzkI+Mw/JjvwpXAsUl0xfH9ToAi5iI5684RoQ2s0KtZg11JuDzmpiNxOK2vylsNuVwM0zBNcTVPe9FSOZ1H/B695JR3rXuI+aV0/5FuCENRpcy++xrUg+B5DrvobC8hpdYfypKSRIvXnjl/TabFnmM71xJ9MGczDgScA6MSvyHludTt4pxojdaEfGwfRxg4bf3RHah1q1F388HFrQJKPcDUzWCTiuxe/CkcYfHCwqHzBgj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d2/j45wMh/MMkGJ8tHqVD35/shq/oBVB8WthC57VdaTdfCUURVMKDFmHUqXG8GRMW4ujugsVlENgOuyreadEHWlmhyw8sKQuQrjzTvKZIeCWSf4xi3V3c9GfuDD2YXHOiu8EiDKAV4T8GLMUejNiydwSiFjM34NVZA0IlxyA8p/aem0Nlfx2RovDOMnujoWXKGgM5WQql1Ib/XZc/LX9Xqszfm+TQmYEdTCVHn6x5jmfFBaR/AQRFI4GKWx2IGAMfs/2MK1xMvVcDGS0r8gte74KHTJMZbFyuTqRr9VvbkqXpxnxLdsMLCMCnJO9zVY9jwkcDagepuBfkrLFwxJumc9aPpqkk60yY0cXQprz7QAHSHgIq6HFBR2TL2THU6h8M396rxPH3cO5P6cbEzOGmOuUvK5qo3GnXse9GxCHPuibXNjxLXslg9MPw3WD1fXUvQlrMdDOSyDldN8X1HlYhIuUYwEDOo/QFd7GtTMdZVuwGtZUcp+5K6DEdOnzXtH3wmWAQNRQUX5lOvRpc2gsiapZlk8iNmaRM8B2AeHj3MDXs86QDZCctwv95YFjVUmo9vLNzwbuC/R8hnYMc+8KrBnvIKi11MY122Rd7HkfLhaFOFm810YSWgzrq63YMCGQUL8QRifK04HLVYoHRtT1Nw5TnvNEdlnO3vmuzy3HQm1g9nyFm3vdw8S4jcICLYXfNN1QRol+cRVW5hAaS04f/qLG9XaupKd2EkKWJcyxjiH8XnSd51LVxy8leTLMsoCliu8DwNYUYDnqhhkziX1k7F2pLFZ28rEFMs7JRJIskPEeX/NXaKnTd78+8vXDQmEUhBsB3qCY+ydLcqQbehNDtAPepSi5m077wUzDe9f8bIRvBP2U2DHnQE0c+VJ8oTfxVUyx1JknmMsCMabE+8lDIz+3tFcnEJCRaT08oegT0qpbHcljS+wYrJT4y7c8bPIH3fSxiYjcFqJO8S5CKZZc/IeM2ADjxDSE1OThG/vq9DM07dzAo/M+LZRufXOm422U4sZzBDzFAE3b7lPjkYlKvKcoLpRET8aDXDIfvmg/xWonSygSXnwM+iKnZvABAVoenLuabYgteUBPO9v9OTq2IfjEp3qvxD0dfgbjs0rJbq/H098YTkfmmZ8l1nyXiigCh6jJlu2fR3AhC5iZXYN7TGvO32b4WfqxbSazEmKq5Vg4Jaj7EcpkAqdu03Gr1KkfaH3SJj21iQGBTB9ccglXEttOWlPMbrxRTfC39SRKAxb4DngOC5S8YvSXpD9r/qC7kViymX3hBNZyFdHg72KzA3oUxW/3uHbwgOYDNPBvwDC8GnWoIn42vq5scuZLSH4C8OC0quDjfCKKiVFdLNqOfjYmq0ZHWTy21cRscUol44VaYro2m9E5Ic15uSsTuBxKWGINzbAUX2l0lKrunNlj3MV81uOCIZHL9Fmxrn1IyhTv48WEPhyc1lThvLdAkKpI4OYZ0ABo5wE5lZth+yl5Qe5n932r2bJqGm51mnqqX1/57cw+YXJxfYVbS1OxQOgAtE3erMJH3D6sY8XxxHK3SK5ly40pdink2VDRhRN1sUqBem08t/TejREev1G6FCdNu+xsXFBLcRZZE2XqmaIDg01fYUkugcA8WdBZWqzqnDM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e13a0b81-e2d2-4035-0f87-08db92f2e623 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:53:34.4882 (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: 3eqWMQuqtTXqIVxXKqJQ5GnpsLyFeWnMJqNX0yAbkClS+F13v4Jwg7HwKd15jTghGM15Iz3/LE5aEAYB8yXb9JTd3d7N21g+GEnCbhjywNpO3gYBK2ymEXdALtPVEifR X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: UFY4LG3WSUOTSLHGAES4GPKENKCATG7F X-Message-ID-Hash: UFY4LG3WSUOTSLHGAES4GPKENKCATG7F X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:53:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337444 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 76F7BEB64DD for ; Wed, 2 Aug 2023 00: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 B64E0852; Wed, 2 Aug 2023 02:55:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B64E0852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937788; bh=Ef0aDKg/CPuVOMnydOcMEZQJwjmNXMu1TwF1O1t4uKE=; 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=enRmWgwLCmjkQdMSNQPrXPm+eiOxL99DmyEDxRjjZSsv3j+M8T7tXzVLqb/+7c+6i jUawo/hrIbp9Y3QMNTFZsnYHIuJF/kbvcYSZj6OgeI1GHtsmoY6B5vkeFPS6HsDlCg kvqXmY0rLq3QUBxSP05DMbq28qodEIgeGOzEfPLs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id ECB19F805D6; Wed, 2 Aug 2023 02:53:57 +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 AE908F805D6; Wed, 2 Aug 2023 02:53:57 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 91D33F80568; Wed, 2 Aug 2023 02:53:54 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70f]) (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 7339DF80568 for ; Wed, 2 Aug 2023 02:53:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7339DF80568 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=ernGb0j0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RhkXqS/AK9HmR8WkuCiEaT5NukolQiAHOVbDToD+KjWkKlbkYxtutrc4xaqFXhYyW0OvU86Ssv29HaNBvPvi+cI/OVBRjfCm78AWKrP4/b3Bks5lVO4Wth3Q5atCKBrWECrumvxy/z760j3Fa0m+vCOkyoHJ1KSXNLK+7Zeoyg8O8wDyQ1APCg7bOOkK9gAmb8XH2M7rauaGsUbQhscNwHze/PsZ+tLAT905mHUx0Yo6a6TNKyv1ZGUwHsDGtmiKMnKtV++lWHw3WAj2mnyVjN4f5+uPbdtsAA0jkMcVw3mstsccC4i0GAe71LR37LYro8v48gHf0+Ee65ytv9vMxA== 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=kDRhyYVMPokhTjxNvUj45xw6yAEhct9O/EROsCyy9D8=; b=Ljy85DMg7hmiTOnLqdMSoMRwoYKzK4d3lPOgNsBkG8T1pmjWb0guMS6+Glj0kRhtXfVDappbAK3JNzYXFnkthPhw+Mq+J7clxZ+wFNiqkHDTtjCCc8oTN1oDBqvLG9bTcgKFsVM6HK3FPr7QcJ5lTb/nEA5DOIrls5KxSsK0B5MVpuGq+1i3Fv/iUxttvM0hE3cWCR95f1wxI7oToTSzpzMlmRjdNuroOUGraSZvSbam60JvyTCQo8A9BaXxurZ2qdLv2SCObHkMCyq8UlJZnXb51dcGMpduIZWakbP9O61fmf79KRh9BG7wmehotC4wI5EJkSP6cxXvirmH6GRyMw== 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=kDRhyYVMPokhTjxNvUj45xw6yAEhct9O/EROsCyy9D8=; b=ernGb0j0vjuM1K6vROeDeI+1VX2jMOTyg1KYo8NTEGQqVsiLoEXWd9QTupHs25+dXA/97aynsI4kjXX/Fy1a4vbvAXkoY8Zd8T5rWb2LvP8Vlg58HWdhOeFGVNhaO9H3wxg9FOuVy+evmAMnqUNj0uKOXUz9rt/nhFFGXI24T+Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:53:45 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:53:45 +0000 Message-ID: <87tttitgbr.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 11/38] ASoC: sof: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:53:45 +0000 X-ClientProxiedBy: TYCP286CA0168.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::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_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f5954bd-40b8-4e49-86fe-08db92f2ecbf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fZc1aehlTJ5N+Ik/M9rGgtOxrWZL7rMBmxKEkKeNhR/MvWOrahJFKFbGixHINPaMHygxj/WmSOlM+f7VZvc6X3v1zLF2sY3MVRNmW1WucaywLZt9atWumHSw30O0JoMx8grk7JIx4+wVmKv/viHA9vw3CLeTf/2NGptSvfgChQWbpRMrTUsb1wA8R+Kua6rwVKhIkwVMhgQ5gAOBGj7o2bZF3b6NHFEsF9uvupjPbMtmLmKREthwwuwI1G0U4Bos83YeHmFRyMIdPSdUqSrC3+89TngFQTTCX12eofFfcFEcWHLRTYr3LZ571rQOtm5IibUAqJRNEL9pVkFY9jVTyfD2qdWgGEhhUMKLoEzFq33MGpjSE4tzzlCmIBQFg9qfKz3x1ijiyN8fz7/gc2PIHlrnUBpk4HZTCX4+1k7iELaBbK/OJqshm4KKPLdmSTxrE/gbIhMcZeBKWKtPWCQ30t3dZ3ZF0iznyqIXG25bRpjFhUvzBPv92zbIUC9jocZj2/pxSkTrxwZVYSqj6JYJwZ5mE//nYURfMgZsWb+hYZUFAmSZy/XuwNREGZvDtIUmD5ZvOIJjQaqdz70CtI3ZYz662NkxcLn83zhzl8nTw/SiJuBdzLbEPUE7d4WE4ql2XS03eWlye8aOT7tp1//jFw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(7416002)(26005)(4744005)(86362001)(36756003)(41300700001)(38100700002)(921005)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qAOYpt6qznmg8YvILh1vwvfusz+fLskTMDpBPbyIzb6OGo9RDF0dPRf0U0JH33yBoztleuZIvCY7NP3OTwOpnyeSWd2ngMTUxFEAJ7hsH6+jrL9CryyT4GlhLg6LUK26k1bgzmW4gP0G06wXhkEpGeyq7C4oikEO8ikxcex+l5GmvdcHTo3dIybScasRY73eS6USUclEW08VJnpyGppYr40QlLXqFwpIT6T2oAhwVljbHzim/UC0twpZV8SnK81+15O8mUkiWgUhP32AHrNtkdZofLJiAh2QPM+LuTgAj81EPKf7HzYMsXKYAdTNhoJ6S2BXkLMYOcFzRLsaMIMp7pYR5bw6jjo9aLl20BFl2sCY57J8V3+7V+bmj57rnDjRVQEaCvMp5e2IhVoUOv1YHNUPQBWXh/eAG6eYfHj9uI/5TWjxoiHekIk30XxUHXIRmVx3hXiKosdqbavbhAm7pv6VIlniKeoFk3e0KBqvQ96SW7J5d71nMcw5lRbgH1wYR6quTY57z+Zcj9WL1AQw1jwGpYXwmO1k4mLcdSRsgyToI4JGHUgGRPA7+SfehRM9Gmr0H5ZWS20/2hcgHukpI0MaP0ezNlwwALsyGf54uuhXHmVLhOZlAmW5yGI5fbZa+By3J73vID58PQmfTZxd/cykkFCOoSdCs6/O+OdVBo2wZBvQuQ2xucLJKdpdn6iUd238qzgYY/ygu28otcD6Mxv1IKAyhOMP9h44xCm9vRai/ndoue5XPoSOH5yKMAOv0gz7HtOdq3aMOSO6y3Dzk3j8AqA0TdWEeRBxM4PTbISCG56f2bEEqYDtx8Xq8DsxR/rN1QoqxZtGRbsMotPWYikPUhYyaF5GTtri8AgNfPuiOuLPFFbkNSBm+U7iyTyoUX7x04LB6hn8ZDPWTRjxUVV799EvHVU9nCIDfBEO20Y09mvuPUymFAC5rFU1QNKjQJcRmLz3Eb1EXBJ/XVs2kCXqSKLSl40fhV7IlsPiNvYePSykZfVXEdpbXtCXWnn+ilYga/WGorgfTgJ8Xoe8y3vFOuANK83jWJ9hoUTSZHQNciu40bjBNmuSiax+UQ0HOnNOPrk9JPN8iKvoET6NS6jYxI8Hh0paRqXTkAnWQFhYmibaotw0tbnHB5xnGwwZ3haa0imgkwift37ZGPxXZre8JjAVNRJ+yPIlVQyBW1tQo6WSWRhK2uXlZVYAyZuJBucbBQW+M5CdUmHSAZt52gIiyfXFnuHj8SW0iom5J3NFct72nDdn55AJRYgZh5Iq9xP9LjOYnLK1HtGj3ohLddZwiLqAiCC0yEsfz7hhg/pE4YX+0g+hobuKHNcayu154RFlXTCrpq3/j1PWV8FhSe5M1bkpMLy/oIBkPSu/IPH826YRvVnzZOcdq2JzlekZBzmioALDjS6LQh1aXDIYwtgacHXcmUknq3TALFEFX73nR9vYP34iko7T11MS++8tHXRWoSQaCkNw2JvJrQpVGDd0ungQ1rNLe5CI5YIsWi3MZMiSxkLQ1b0+ifE6HSGe9vd6FSTfa8P0/ZIRA/wGDFo3x+aPDmImbEfLL6Yqhk4B2B5GY2YgQOdOClENu4XyR2JlVXBdc/HP9reZgl52FQkMEChdmLM8jr/KUFX/zrA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f5954bd-40b8-4e49-86fe-08db92f2ecbf X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:53:45.6577 (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: Bg/MZvpcPb9MaCgxLscFJuTCcAI+qoaxnpOVjJuyLsmjUJsaK9MWekpASz0cA+KDOL0fVCya3iHNWREGycNY9wi8Qab4FyaEct1BLZj1JPeD9WDMeaHjP18E0VC58zOE X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: T6AY7AFCFEHNKBRARMBAPAEFQJLQSUJ3 X-Message-ID-Hash: T6AY7AFCFEHNKBRARMBAPAEFQJLQSUJ3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:53: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: 13337445 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 C6550C0015E for ; Wed, 2 Aug 2023 00:56:48 +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 13689847; Wed, 2 Aug 2023 02:55:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 13689847 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937807; bh=2aH9Y91CFOrH4kLtTsVtqfahqPUtoaInoiDaXN92hKc=; 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=kf6WonZy3XPnNTRoSptLxRSz+rVV321UusxPKGfr0TpefxHvXMPNFDgMdhstjRfJP yQyq4pk/lsIutJeEiCCLaTenaxep2avJUeOCPI3CQRXuZ0t6AjwxOfBOSRdzAWyYdl RKR7DT/lRnYsCiH54HBgYVNMFBduTs1PUyIFPZMA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 91C8BF805D9; Wed, 2 Aug 2023 02:54: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 12532F805DA; Wed, 2 Aug 2023 02:54:04 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B18AEF805DA; Wed, 2 Aug 2023 02:54:00 +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 EEB0FF80552 for ; Wed, 2 Aug 2023 02:53:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EEB0FF80552 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=MgDS9w6I ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XCcNUviheJM2rdwy1fKtmlt/+HFyjccGKELrzpL/rS/nLiq9hyAQkdNTo4Kz5Ub0mW7YzJSJAenL0UT/mqOCpW/tNDw1GFhYKyO3v4cw4mjlKIRFCIJrtmrp4bk0ee/YdZVg5raIOHA672qPpO0TTY/aIA5FNlz7XjdBj/LXWFBL8/bYo3iGr+VxQV80chsJpIL7AXERBygOgpEVqVKnRFfYjaV/6sJEN+eBz2QAsuxGlcwHxaUz5wFJ1aPv7HkqylOfQqii71inSTqYHGeSJLhTFn7r1PhWZhV4nTejd/9OPFxZbLebhHpF34oFKPjFo9EP6XPQrtYFcAStE+DJFQ== 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=HSJG1kWDBDyn8f+9w6/NGjB03z62oqW2aUUoOyJ8rlc=; b=R7081UkKVOuvA6J5ZALXqUkBV8Q52yKxC174ziZCXMZwTJeVZ9z1r3cojiQhOBC9CVnmPGhMTV9bwGDe3PJfsB8w69qTurOJ318LX/JYwT/D7AS1CpXMKnq7hHVqhJpU6xKVIt0zBoy7slDvAjzmA+UxCst/NbMPfzKHQGexiaaD2Ssbt3M+O4Nt4QurVKBFu6qf8/FNChis4ozuRRZHikIiGwC/GKchetO2j9Ow0HGzPbNX97xcoMyELpGkAVz2yEqeKEQSWJv9UAWP6IGoJuhDzPoyLW+dvcSOvO80Ma0c7AubD4unI06A+J4FbRzRdgjW+62M70n8fjeI9Kf62A== 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=HSJG1kWDBDyn8f+9w6/NGjB03z62oqW2aUUoOyJ8rlc=; b=MgDS9w6IHDfQxMHm7ozp7opPoATPQ62PYHGSJXmhHgkbyxDMZ3jr35vFWBspitBsBC5do8Gb17U9wMmvWxcPT3AhaFA3xUCAIM77uE5+1h+oC7HseImGrF1Y6/6189jTYHf+u36OW7AesYkyfJmolo/WpWFDzqOKxe05jxd3y/k= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:53: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.6631.045; Wed, 2 Aug 2023 00:53:52 +0000 Message-ID: <87sf92tgbj.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 12/38] ASoC: sti: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:53:52 +0000 X-ClientProxiedBy: TYXPR01CA0051.jpnprd01.prod.outlook.com (2603:1096:403:a::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_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: 37725e13-3332-4766-22eb-08db92f2f0fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ix0NoBil4Kj/MVvpWW/OndArBgiWnrXgdrzVZUf3cu6us6gdb5rFM5IbxirQkj403HrUv8l5dv5lcvLqgOLSE/tZq90r990l6y8ewATLK8H65ph98BEpNnAcCTbl7OTIZS6StgvvSZ8qZ/zk8p305GQIWCOpSfCKeWKA988z3Yf0Ffgv1fo5pPZC59nDlnwEIcUZjLQaXIrx70s4GkV7e8aatv1GKLZQ6xaj2K3GJ9+vQmf1APNGmwUG+y2ra02m1Wx4AUCStuD52OPsWJHNrT6fEnOGvSzuo0/1xoYn9i305Mg9DzeDepzXi4Py51sqXfiPtDIuMlZ33WktBFphzLWhVyPLExIwWVbiStcKqNGdPk0uJ2Oc+uV9CHzXsAWATbzCdtJp42lD0B5ngIBejIks55DL+rW2fANtJQ93acoUdcyR4m1f6h8RtQkdPn3GO/nzWQSdZqSRwtqLToYE3cQCUHuokQa11Rf66TVz7raErEw7uBFrF29sggdiEuG5qLTPocmUglhEPY1icQMn0wyvfCOGphivv/CN1TN20Am2g1TjF9bndi/xq76cbounvCUIgJoYOd5/TlOoe6qkHR7yNwDzETzW2aKthh4UkHifgm42D1nFfWKdDgH51ko1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(4744005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JEHkBr29o+8bQqolcP03ffZlIInwGvO9AF8dvFeERwnA1nYucGxs0uOHpprZSZeFTOHYzyke5zxHsYOwxiHso10ke/YD4J92jUdFO7OI3+VZWHJzRDNTj+o/v2fDo44D8HaUgkgwMWb/74wTPqf9xaJxS9wnmOBU3fLeD5sOpq32M3DfAFoPDzVnSC3Oabzi7UT6S4lcoean+NQftGWWgyjJ9k1953kB0ab8DBKGI00zG+BMrdLhDBffB/0fzZMcOmpXTnd555/FGQuadew4iN4ygMSSj8oLs6bPm2vUZiK+l3b85diWpA+C8qDMvPVYMmSq7nLWdA+kyqZEI0d7f6mKpizLA0vty+I3/vzidoDpAhJzd5pUF8mPrnjQi6qojXvSN+xs7b/EikR/tTSaa6nF61SwK1vTgN/tvCifNGvEKJZ0xTrBMeD+OJzBCeyXRNOLlXxK/kJnw0MpkwzA4V4j15ul7gytw3A6/E6vggHv1tuyCbDtkD4DGpZQS4T657LAabAOyjf2TmaBTwsW5QVm5g1+vstQEokZEmS5DJBwFOis1Kbhl6Anhe2b746/WrBmQ50RI0rHpn92rTk2S8rClRL2gfW8MxowWOS+DQM0RqoSG9/cQ2VjmlJPPBcHS6tmqvKWV0QB+QDSf0fp3QQFLObexbcBiX4v+DK6AJDSEoCyanFe+fo2gZKO1oVqxBsAbciYNAg//FNjxXkbmrmU2QXWMgKlrZL8TA8WTSd09OZbewo6WX0Gr+/yV/qL+2R5dkPtJPtmLrPgIttR3EU6MvWRt7vq67L2DP9F1NdHeWdimYLd9POZN8gGWIDAidefRjYIK0iajeUbI9R3yssyN3es2MMMdsXfEY5ohJlZhQFP6QjTQUYUAmg4/gIUpgHArgTZuBI76BYsyFF6wMyRtpz2gJT648xMX02b/L3XVLEnHmezj5xvlEu/TXHZQA/bt2N3+uMF4HKgxqzfbT0lbLepE0KhXNHcYxUgzWlHvwM9j359L37s1dcGHReJGtTP0VD5z1yHm4DTUJlHitvUwvyzFAQJYE3WTnUgkeusb7IOg9kk7EVPafHIcE1/+NbMI1RZ5XNzvH3ykgvKlNo6pf6i5quef7a3pcoi9Cesr5BkH6JeFfmSF/jytpqCKmCkG3pPQk4C1M46pqpBNgxZ6p2d9XmZXpdDYnFIyPjDHlklnVzOHHfYdp0pax18DzkUBQ/xkPCfqb+1uqCJQ8WN+sm71vELjw6gdUtZPIPIIswUhVlOfw1esG1jkMF55cDe9cTc1UC7b2HFV1IUY062tFBaZ19Px28Tv+CI1pUe24nieftg9sNZUhmL3M/1KJh+P2Bczqg/kZ208rOuZ8QNQCgtmzdbPJirsY6dE83LcypLKAoshn21KNrCiLHB5zyh/PiazEVksj1ZUcgWqwEQZbeoPzVTMS9NYMmI9KLBmNFkYZ8RMOsovlEXtSI4KGMBXljEriZ9Iu1od5efT0fhrLE2/24fMhk6v9SXIrof2fc0lD7f/ReNOLmo03qpRyq8UcFHrIdnAOmogZLNRkCvIbks0+K0syWm5DH9PcK2os38dlvIg0TSKbjLSg95Zpikyaw+KYp7vlGkmrwT6E+lxxZcyWBK0Y+d8Tvs2Ro= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37725e13-3332-4766-22eb-08db92f2f0fc X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:53:52.6825 (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: bw7J72/1W61c+osacm7U4iJpp4ptgs77tkZpwinu9XMf2R6njw3ke2XL8c02xIOZT93PbXYWAVhlZ1/ggdVRLytn089PtweaML3rPyUAAyqDpXkXk71k4CF1ykygf93O X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: LWYSNDY5PKQQR4N3HTMOC3MDMD6OS766 X-Message-ID-Hash: LWYSNDY5PKQQR4N3HTMOC3MDMD6OS766 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:54:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337446 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 CE9FAC0015E for ; Wed, 2 Aug 2023 00:56:57 +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 03EB87F4; Wed, 2 Aug 2023 02:56:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 03EB87F4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937816; bh=zyaD3CneJBCHPhjzHIH8xczflKIOCrBDMUTN9vUWLC4=; 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=AkZDgjcXL8J1L09ox00IlU1OC7iiu8ZBu5uQ4ykBUTWDZT+AfBs3qpj5/Z00mglfE zaVJbOBc+L8PR/7gx0dkCZ4ef+N1o/llKJARXZSF9uzUaleiuFmnbO4gpO7NYiYZid 7vmXLXpGLcFPyDqR0hiQtb/1bUQZPqHkKm6DlejM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B7BDBF805EA; Wed, 2 Aug 2023 02:54:12 +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 7D4F6F805E9; Wed, 2 Aug 2023 02:54:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CFC94F805E5; Wed, 2 Aug 2023 02:54:08 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20705.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 0AEF9F805E4 for ; Wed, 2 Aug 2023 02:54:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0AEF9F805E4 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=p/C4KR12 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xlr/xyejQcPv7cidaP8He5pizVNNhnU6XgA/5i2Gt42xb7SEUBwb1+Cu0jqBWQrRDf+HWw21TJuEHgyn2x9/oOXoxoEvQN+yqMWiV3hAWqMsiqIhkTcUAUh03fCySDiDhkAqtTm1v/qBaqKPtna7ryZzNcCZagOT6ippGFpnp5fr68GzoZvlMn9nLlv+TTjVJ3cBrlsGswWP5dI2o0xMGWkdVvl1t1vtTXDW7w9/niEnsUZzeGnR/oNGBtLYSeUr105PBhlmBL/UeOfuEYRE5IxQ26YdM/bdzfgt76j/7tjO8RBngnLIbhx6mvy85+/oXZ0T3osgIUdtWREIH4QJbg== 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=WorLyNuTyiO/HF4y0aCr+/Xphl7RDfKyAJg2FnPGeOk=; b=PbZs+FHxy0DecibiiOEubyO5UksuJb5nRsttqFBxgeXXrM7OyNB+YLrDdJ4xobEZTm4YU9IAU/Es+vW29iIsglHLmOPe1E/yUqZdpNyCb9KPD8AP76j1znUTQtaahGC22d51Ch5ybPR8FQ5otzHzvnR2+MLAS4IlVggHsvHQEN99rDtRvRuVmzbGaBicnB6lhAHBQ4L4Ry/9cZb4hNOi22ms39zixwWW7FEae7BT1KvHTMPTj8seAeF2a+TEKYwrs7Sf2x/xYabb+Cf0E2ujnjbluBN4ygtOV5AsakM+EkWhY7AWggvr98UKznDXxb8rSR65cWOGDcS9YyzLT5BqnA== 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=WorLyNuTyiO/HF4y0aCr+/Xphl7RDfKyAJg2FnPGeOk=; b=p/C4KR12k5EBVzKOLWTxocNZnk7sv413zv2nHdXV1bnvQGBau0PZzPIuyB/rxukD9IPrbjTF/DfcJ+lJ4BoupFmvrCJNSN3Kr5P4z0zf9vbRJLd50uGJHLTKG7dNN9gYFHGf8CgBTDFOlMISrcQwn+ShZHGvcYQA5ddMtVEsPww= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:54:01 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:54:01 +0000 Message-ID: <87r0omtgba.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 13/38] ASoC: stm: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:54:01 +0000 X-ClientProxiedBy: TYCPR01CA0151.jpnprd01.prod.outlook.com (2603:1096:400:2b1::7) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: 3fa5bc0f-0edf-4f24-cbc5-08db92f2f656 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M569lUEeS7TqaVEspKSvKglTEzHFMUTjwlQCCkCOcjplbGYxvoe8x1G5Tls1d3UXZ6LRn4jrDiz3TsTy4lBzpj4TFDQsxz/yz5ncrQXkBpQxMnEBBOkPcwfytVuPgFGfsHxLlI3IafBOsRihKmliEhV//fSyCD/pa4cJr0Qz9j+gVYVumcctuOE5E2Rbei5oUppDXTENhfBQCyqxYb/kZhbhN9HuqF805I/bmEhQX8OBmjKlclWobrpNbxFI9CVr5akyUCq1vp3n1BgBVOXqI550MKfXTjkniW/nGkPgOj3v0OIRwG0roKh6uDrZbxk2jPXqB+utT3CsI4atWYj8ManAUyXXaUYahAZNiZAL3g+Ie521YpIW4rdwckWvxvYnwvwTaDakXInZpC5+0FQ98hm66QgakpUDmDzd4i3e2HRKz+s7WY3lsk5c7+m5byciL7nYPwBIa9glAwwT0M+fSQD0/Cuity0gYi5oATaZsM0YN0us6a3GqPTa2PtNAKN9tDLKSdbrbbtkgHC8SJ4/AJ6eBo6ItRWOhpFMYpgbPBj0cNVXXkGn4yCxXj8NCh8SoZpsKHC+PnGeHdjGp4ByZ/e+PQapJ1TzvL2BuiVMomj5pXf1cSlnZExciN2jBN66 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 093OgwHp6GCEg7pNsRtSM6lXxLH2z6V0od+UAH8ANKRp/nJ7eb6DkIkW/Q8jdSOeF5xqUHunfzuvxGdybb0RNCwbgU6sjb978J44tn68nma891zUr26Re3plrgk8jFOdsKpkKXrC6Ise+AaoahpzDPeJ6J0SIzHmbo5rpCtvxLoJgdshTJ10pdWM1y1oEKG5MEHLiO59YYwZ4K7pegyLul3M6ks3qed4ZnQwEbgEaZzFErOkoSb3QB0ds2EfqRRAwyVct1d8bFhbvdRQMSHHkSLUew8L7J7L45eha9pvjOykcBG7BZWw+qANxoipuM6Sh4RrzPUgBleEWj1asBiCXqV9w9VLQDFjpZIYp4aLXXp/jRR7LP1vNlbn1Jp4rY8xdKoijzkAo7VerINZATjsLf0nn3nykHH1LWsaW7h3QWpq3PGG1P4/cWg6KbtR9q/7PEmnkiDUfWp8ZBwzMyQzP8fCiziF7479iY4YiYR7T8594fF6+X5ysm8jCzPoPqsyB6C+OE9Sw3x6y9QBmukrQf6wjH902v/xzgCFYJM5Gyde9l2fenboBjlku4LUxkP+/TWQUG2P6htMW3tn19sh6BCCsBrRAI/cG/YcJRS3kOjHKS3CJwzxCKu45CFUchTkKcv5Fhc/IjesCEhgx+N62+GaYdVjGLCddtaK5QiKLby2kZE/Eo0HGbW+g5xejy6iNIRlBGc7yufWsjERjE4juZCn4U/r/nb9FOB+nKVOguuUbZ4k3e3JyW2jI9xa416/ggu9E+zFx9HgQCcODeK5IfwNKKZiZF1F6O//rtzGGgt75NU8x00ziTUR72hF1tOvkoI9TCDdxsnM/citssNq4u2x3GeHFFNDaAIlpBao+NQWwDSmRVVGZFAsV4hG/tVs4UXAIqJWi0kKFhRbcuN+U/IUfv5P5L5s7YJsXs91zrh4j96G8X6fEkZjlpSkYeHTgk6DdbDwifQYVUznEHN5duutQTkG03yYt/dfuPvOkpnCkiVidcqiGNk2e8RagP34d91XBtXV/wuRqOBQh1z3jrfd0vyfHzg1aDqp3YOiSVS+F8otFrYpjVHg/pBXMxtj+34B19su8u/RAQ3nkR+boTtYwV2RRySwxM+U0ePJAIfgQrwsOJES7PwG3tl2WxwGmAhP4P18WULeC6PB0+R084eO0SHYMDmVvAOv7dJnhsEHG2LjZA1Mpz2zqQ4iAQuzkM1bJzXZTerYgYVccyfoxzBhx0T5IylrrdOKajgeaR+NV/ydrPslOiplGiByqpmNolRKvmYFZ+cCqSG+PkFpH+LJrFxsKPxi/pbRfVV0jRv5jOWjppqg/xpEjN+cpkOxk6NMc+LBDCjw/L2Pk8nkXLEEsRGh5BO90bemClmWOiDbcQ57ZY+h8boJFth1Yf+ymIvShM7OvzCBlxuiX5H/oSmdPv0AZ5sQeCIeDzRaOWJSIYVEW4Is4SAGIlOxSdtm8tsU6Ljg7RSrzlkQsp7jzIetHakPlve1SJZasQJmZ8NdrDfcXuDCX/GfEv4E6aHJa9/QUVVe/PfYB+3rlQG/CUQFwyV8glZXW3CyhUcdnpjBPY8cuZOXMNbwCEReuSHyO9icHzr/nyefbH3T3n7EYnX1F3+VBlPYFAxRPWzPfdw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3fa5bc0f-0edf-4f24-cbc5-08db92f2f656 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:54:01.7292 (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: wZbqqyqA7IcHGuqd1oTmhW6QQC7PIsVM8/a2Ax0iVNQ3yoesfS9CCoullUM0p2X4BP8tpds74wSUzZvaXj5ghXDWHmLlHavHyjMlO9FxUspZQQo2/InLJcMOriKYd69L X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: T3PPXEVFUTZ7KXLZERHFF5ZCJZ37V7NS X-Message-ID-Hash: T3PPXEVFUTZ7KXLZERHFF5ZCJZ37V7NS X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:54: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: 13337447 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 69573C0015E for ; Wed, 2 Aug 2023 00:57:17 +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 CE70783B; Wed, 2 Aug 2023 02:56:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CE70783B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937835; bh=qM16m5EjDAWwjMSB/ru251gjwkgD1NC8R1vJ3vIgMzY=; 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=qAMpXMJ+dPa1BoClZ/9lNDv1GHCmvn85pej5U9QDIMZ3kGS06CbEC1mG4eplyW3KX B4x8meZ9/NLkl4qs/wPj8uakJjEE9mtVc5RsXZ2ocr3zsHhWHG+IUmzIVqzVgB1NFk Cl8g9DiFryZvfWZ+l06+28mnu2s0dyKffpBmcwzU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5E295F8055B; Wed, 2 Aug 2023 02:54:23 +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 CCF0CF8055B; Wed, 2 Aug 2023 02:54:22 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EDBCBF8056F; Wed, 2 Aug 2023 02:54:18 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 EBEABF80557 for ; Wed, 2 Aug 2023 02:54:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EBEABF80557 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=VJQuXHC5 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M5P1qx+X+LRgaWF7DBtkOwjQeVIWViPSiRvsdcNih/fIBsi46PwWXsDSUrvkSVfgoApLuV2Pd/spxXGSIXGz5oULSiD2vOejFFL9MwOg993oBiZabzwg02VOda2A05Ci2DRspGyoUdpntG4dTz+PC+nlXpTcqPOoV/WBYGtX+faT3RZzat0Olb6DVlypCFM0gLYyrf0x1eu/trYea5PbJVM79rH4NaTy68tCtCO7HXjntwpTChYpP67PFVv9A1nx9dxV17T4P2RoYbXtYbgSCPBBDqRkAVbLMF2ZwowXdwgrAu/r0vDcNoHjwgEI0yLzQFjtA1lDqfSQY9/rBPHzlA== 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=sxPlbXNRUqKwrVsB1xpkS+JqBbiHU1d0+jz9z0zmXQU=; b=eU1tjdgfYS6PJih4q4Jbg9Pkb9Sgz+3TP4oVsiID+wGG9kvlsGFkCVv+gTO9Ha9dwZ+m8Qn0OTJ25giMud6+JN40UnOYf+lLNmkH1f6ej9EE7r1UWQsUlP9cq+NRTOQq5jTHb+AyM/KZPAH+WFJzJtBeimd972oAxM0jXLVsNUMOBji/Uxig4f/xsnwvnzEEcFU35ZmwsIaV+S7dlrYQSqIkpZMnkyoFMZiOwpx1pSftdl3qWpoQ7xie5utEJ2GdSd5cka/ZMwZ5JC60Oh1X5guDr0ol+0gGcxdvz6nkHpJ16LJgv9i4gbxBX5HaSxd+U0gOMb7435aQFKk0zKF1lg== 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=sxPlbXNRUqKwrVsB1xpkS+JqBbiHU1d0+jz9z0zmXQU=; b=VJQuXHC5h/J9ICpE05NLnJmIXUs1CwfkqRWK+ntgvKS03L2jATSauQl05Oje6SRXBVOFsCSCraussG311AACT7/tY0aOO5PqqKdPdcpLPQD38UXoqZln0guhCTFOTO/c6Le9oXO6Q5ez3r7uidKy6v/gFQfJXJaA8qBbpNqrsZw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:54: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.6631.045; Wed, 2 Aug 2023 00:54:12 +0000 Message-ID: <87pm46tgb0.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 14/38] ASoC: pxa: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:54:11 +0000 X-ClientProxiedBy: TYCP286CA0281.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::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_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: dc9028da-2ac1-423c-104a-08db92f2fc9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nPxw9bluv60RyhoJT1Ska4uQgfx+tGQQWWBdLZLXd6LdDfDgwSgo4CnBttYvSSt/4K1aOth9P1fq0zjo3cWSmqq8gv6vSt/wl2p9ZzNRh0L7FJAvI+nfF5sUWmGoah1yqC9QhX/o/YQJekYkMhIuMzMCXVXoAf5j6aulQ6k/wayOvhLIpPK9HWaOUqIYucouZ1hx8AUWHAk3d+KnVzs4sk99Gtu3Aq/JQ/B5WlEaQHMLur/gJuxNC7rgiFEQQsJX6JJrEcvIJjvqcwXwakTpoYjnaysbyy/UZwVlTq2BGeh3nksMguHdslzyiXrKhCrVPNIVuTj94fwot+O1GsDQEmYBxPxfJcQPHk2KhvL8UR3TQ5OeQlKZ1RkDabSL0YsSV6qWoDodru2EYnnlMWlir5uA/gVXRKmUjRG5MA+gOa3eNTT2oAgBS7UelMLZhmmB5QLwTPw4RD/BTGDksXec7Llpc+Xs8PQJ+IUbhTIRuNZq8dfrevOr5wMS/0Fqhx831yH9mhMpkBRjInrv1m8RrchAZiEsUId/g49g1A4fMT+kaRudtP27UFxqQwPj15BpcwMxsuT36nDzMxNZzQhnyDqhwELWzT6chmAXv858K4WOWJltIukBQwQTV2AEGT1ZmLVw6Tl8wb9amZDNRV3xrw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(4744005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002)(41080700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZzSFssnBEzK61/1DW05VRkmplHa0dInTdjri2Ww9HvVLtLVJ9IafBDXk9oUwjZaoWEGn+JjiLBiLEzEGpScw2z8CST5o3o1eYLFhp0VQLxPW7xje5De7BZ96+CMyPNUL9oKRdc/OFwK8m0ZIjma4edZKlczCWfgwcruUrHI+gFilwHZ8RI8Blrfkc2ccHFvbl0IywVK2oENOwiR7D7AjTsU/Q1A3HLMw9PPaK03x1counoaHp2TgYHQp2yFHaefNCkkb55xpcv2FemgEg1Qsc3C3GsApUDrfZYz5yCrsZBqjDTy4pMTI7aObAQFCX2Ys1+EY87NZqPDnAoNQvS6aWFatK0Ks6ZYHrEvDQDGH+0PgV6tBNo9DWoFvbW2Zq7d08fwgpYU/G/6GcfO86aXO1EDTHfRALQ9SEr6gVM40SoQCZxc0V06daNxctBG+TPw8JFufRlVd4YEqtC9GDt20KEsbB+PoTx544BeOq5nGIIxnfHKbMoyq+zRxMvknCGXgDBbnv4ywwkDBc4V6SISJiqRz/VU6Uym2U49xgqg0pbGr+yeg2X2VBcFQhEciFn3GPN5LqUnhtxKjM/N0MjJvTEfTw6KF13JhhjyCGbfiKF9En8UzwDJ0Kp8GYouvPJu/qyaphWg1dGi4KmDtEYNngSYOntcY0JoZq7Pt7oeESbSGT2ToFmh5uMR7ivSJQRQiOzMxGCMZTImKjJYRsoXiFDSipEF39KVFyjEQT9Q5kOZsnm2c0YeallnOy60koH+RV60wgmArlEzagr9IS+sbfvPverDOtZ4gIt5oSk+h0QWDopKeNg25S2BiQc2LwNnQHlA4DcVY3slUHoW25YxhdCKBTNnToWbn5NX9AajTb5fZ8J16E91OvCco+pNWt8KgVxMsKXT7FOkGDiWW1IUlYw+yYSb1duCxY3MvFn5R09qbCWvAn0hQq1AJ9gLmyB8VkMEugQ4JCqbp44O8jInA/iTY3xtkWFmFyLioi4nuDf30tyIDiGpmo/qm+L5QHxDM6bVmqs/hHKyKJnhb9lWjoTIPQyY9rD4nmIVNEsZwWbnx4rdvc6EF0LrZ+7BUriotdrOn7cfY6/fkVsYAOXP6ArT16Vv5bDQzStuLlyRLlGrAKQzgGQN1rkBiLib6AThKlNXsx52G73eNBW9iBybxySbY5GKDjv1hRUxRg570gkIdP+UtQhV/NCiQoJYKXA0mHzKPtdt/1hfmMPfaCXLuErnB6KQ1Vu3HNQhYr/64jOIymawBzOaN+0mneuXqXUa7dyQhNmEnY+1DyNnCZeVRzqJuyYFAg41Zdd85hgAROk0WruuSaiZqcAhHzdqNrx3tQXLN0BE0/1DxAgT0hAPxiPBFR2D0XCo38ELGhyqZKLBOOQWjPNcP6u/YR40zM6f/utDxmhSjitXMXvaTucpIF1cReLhzzZIeuuRC3p2bRbP7CmFUG5rk8QC5/mHrQm96QJ3HiwHmntAP0+RIzqAj/fWMY3aDtsb/m3wetYkQ0sUJePVKcCbV9W5r5C2hxB4MYVM70vJtQ78ewI7DuiFb/6GiJaYKSo3iaJ0Gv0J4evltc6VBEVAZ3DBmVI7oLYLHS8K3jqInnTlhjebLpbFGBFwtWy+EERplq6AhDNx7HRM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc9028da-2ac1-423c-104a-08db92f2fc9b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:54:12.2190 (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: LubEZLDe6iT7KjZleHQZuJ17yxZeRLqUW9NpAse7gG9bYG6DzoXdRkNr2xatZWH4OIIOU5a31ZTVflUBr6cXV+15iKSw8v6w50Mt/ctLlhGy2tmfLQT504WWvHhrbWpS X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: JGQ75OTB6T2PRVBDVPCX6G2M32GEEIVR X-Message-ID-Hash: JGQ75OTB6T2PRVBDVPCX6G2M32GEEIVR X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:54:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337448 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 54386EB64DD for ; Wed, 2 Aug 2023 00:57:39 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 181D3836; Wed, 2 Aug 2023 02:56:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 181D3836 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937857; bh=BUPBfK4mkXTonz9ttoCOMQsqjxgl0XNnJFhPd10p0b8=; 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=q0Z0qE7FvoeZSSdY4MRKMGMF69zT5PhTAdin+QQLx5MR7KiFzQ0YR18c5gCAJs9jT OyNVqLJC/EEXv/ycFYKz+XbzH7S9X+723nFcjMfXULtroyUKIuREyw3wKI4OQXdfLd snrT8jGKwn62Ha+3EHpku3oEAp6dwWdwkcqHEOOc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 28DF8F8057E; Wed, 2 Aug 2023 02:54:42 +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 645B4F8057E; Wed, 2 Aug 2023 02:54:41 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 77DE9F8057D; Wed, 2 Aug 2023 02:54:38 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20724.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::724]) (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 251AEF80564 for ; Wed, 2 Aug 2023 02:54:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 251AEF80564 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=AeZYPTBY ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VQ/usmsBszqD8oaC8A/pFORT0wG5LKu/KBaxMA0u5gZ6DXtST7so4ev3jaXVXKeKoXhg9ZXCDGKU1LibJpDsW7BK8lNYhyjFGQ0fui+NBDqOp8fnYMd9C5Unpa+0l9SQ3nmF6c+2fdUrCrnXsAhRwmpZAFc9/qd6RNOcpEHlzdSmSc4F5z7zvEWiUDvBZHobroe/NXlG/eCBghDA9v4PCP0uKmwa9Tn9q4WhtX0ag5c12bCBivji325es2AIqny7Egr6PcGkCq5ZryrNHnFFWT25ts2pHVBhC1RrCBEIyKuu10XQeVGOtXJKoCjqyhD11KmE+jYiLrIiTFwrH/gIWw== 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=1WmiUPVojK7AZdyEKKpFFk3xWkNAqbAL7L3XFxfcgIY=; b=nT+w0cMXIePz5uUeJUW8XFoZY7fRJGgzsrZ/F12BzhsHMDQjfrczip3nb/Ha/qDIose5eZk0ZbHf7Ywvr0JtFsdl2uB7A2OlI7bePn2iwZ6xPz/K3Lz1m1GMfU2apMfn+34iTJvVS9uzUaTIhum2ZNLU3G8DLOKFETNsb+3dq8u5MRxl4139LXuxyVTyalj5qV04ei7aPKEVsVhmUNY0EUI6HRS8TtiWWBcc4XmUs10RK+CNCNMFCyr152COtS4vWA2E+ValLiF1FuBUMYTJmgkQRq2o4C2Yj8M5U3SAFK8BNB3Smnb9GTZbSmf5Tg/rpoDfQ0+hs79NH4AHWYKW4w== 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=1WmiUPVojK7AZdyEKKpFFk3xWkNAqbAL7L3XFxfcgIY=; b=AeZYPTBYZRgfBMoqN/P3LJJq1ygMnzL2Qan8b9kn77Tq7nvJxk96MaMBsJMsudBUKcUBhlkHda70I2VXVC0rtgUgq0j+itB7E0jmpHMILPWxoMbk7oZcHZvciDZL5hftocr8ab2oyysAaJHledTfZLoW3g4a69AEP6FphoOMNxc= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:54:27 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:54:27 +0000 Message-ID: <87o7jqtgal.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH 15/38] ASoC: rsnd: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:54:26 +0000 X-ClientProxiedBy: TY2PR0101CA0034.apcprd01.prod.exchangelabs.com (2603:1096:404:8000::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: d0a6680b-112d-4da1-8cf3-08db92f3057f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ks+6KtBSvIXm1phTRqM1e7l1U5RgCmogJeIQr5Xity8LyzXPbTgqp72l8I60VTPULBRtKf5vmISPLqkijFOvzhQk5eqHxmdN5mSsNGMcZQgeMF2Z2siRKzXt4JVkrCCtaNdnBqDiftyxaCE1tEFppjRmLrfMy6Jwu0Gm92lnCh83piuGlja/1FZN8Z1sDh6pOR9tWNQOmg/paiGAT0tRgnQHqvXKe8L2Ojh+FeqsY8pNLaCUQdjTYKXiTTYpjLbzujF5hx/Yn9HOJJHACXHyh+4NVd8fauQKzkxrWYHmGpfihDPJ4u3MIJbi0gjJhqLGzibGtQ3io86QS7NQD37Ei4coNxsce1hJOehXhUyipZBXJAc7em1EoqwHi4d2cvT+pcx6lciVkq11ujv7d1BSz37NfxyAqQFT9tEiHYLZZKBFU45ZtEaK9546JorrVB9HZ15Bj3WhK8wfiYl4UFoJlZoA+ftUKVNqaoV7lC/+nvb1flWJvFq/33gbUiRCnEtnKBzLwa2aseTi1D0NotlxaSy5ipF0A64O90WWdJhxYgxwvqcVxWW4e/cO1/YZTOIUNK5rCcCAI2v7L0eef48845m/MD9b2FFY+QolEa3CMQZzPL6vJMNfXEwCIWExn97C 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MNSn/Ll3PEE7O/9sdkw60PVRL/WDOBdFUvHPduRjNJ8rJQLlJ58e3XS+cB/xnv2VE+Yc8Hhb7fyzXW3e9rwctDZCFfsDBU4a/Vqz9sJMioxB/YR75Wg3YOyM0sDG5s11M6sW0tysHTamXd1GwUfIrg5jmLi+kvlxU9psDeceKynLTMzzdhXm2GVdBtbClcHKsvi8XT/0Gyi4C7VDbTHrZp1V/jfhvAKg5YuorZOIhucVTMrjORCe+wsuxpnEiIT7/ly352v9/Z8llfsHD1ejzcL8Ov5sWWzftTyWjNKmFkzYXE+rz1UChS+Ev5Xkee3GFxKW84eYp3ZK78dCuAMxzhRLwrsWIsli+PGvyc1ABPsHGy6Rsn2tOMKssmGfz4Pk0gqECF9e+8oNwe0YV6aDsxSC/LmpXQIp+bB2tS3OtR89uS7VuwqzHoMITP/vvMc4FzCnRRwqnmfnQPyQ7LKDyDIiATrVZI8ywK4ZpL428lFBk+LnUlYTKwGbdZmd5Xjx20aAMJoV2lYepFEbzZFUXUBS2ycS+onp4Zr5JdpE2wir31ylDr9vLPqbnn7iQ52r5woy8UjicYM7XT5ft4kuGgjsSg9is9dbZKQAqChp1dgFqn5Tz7RkN6lIVJVfFB87RgXIo50MM2NheL4rwNjy1050rKCA7/AqHTJ/QXcoR5OYfgQ5JdRsCH1siDa9HbGIHGJrzbAcM6CcAcu2yB4lIWO8L6qtyevtGpEWjamlEIDDxBYD3JqZ+dUwu8W7noehVUmjlx8uZ8yXMk8U2anHbDnTYQy+HsAbRlBYcHng7HUjq8exM7nwUQlgABCxlsHfpM/3OF7PfMtDos7anLTJTwm1omSScVD23Vl+22Oc6tQJIrKKl5i01lbJ4q84/SgFsi7wlfADhJ2q5CrNE6frwi0QJOy4pMoNsz9+MF372zQFXFgAm6zl/nZwZ5Ns1kRTZ6r2rShX4gITjPJ6LCxfbBT+GjEMbSRPIQraEoTTaMrJWQBFKhpDsBxe8F2SYhX5vMxaQ1xk5l5flx3hzDALry/7l+yc3eX7zR+7mcq3CwlP5ZyTA821g5H9pcqO5oBk54MxJaET4HsBcciTDZTcyLocNjokBAgsJgRctkA0+h0goEshb4XMzZCUJ6zO/C8aum/0Le/3gh+B6ssfZyHT6jyh3d1HuY5YwosBqzPRXTmj9ozdKa0pgrxwrxf1y/l0EvnVgLZyryICXHihx0wYA7TRg3/GM01mDOYInxgOCgc/Nx3TbPJy63kRa16hFoR4qtjj+0FsVko+S292lVQdbIW1O2gPPviA0DEJMiDeRctvRbLfjgNKytwB6+d9oo+bJTGvyz6Lt4xUTUDfKge10KXbJf/uXmzqAK5U0zFy9p1HHNoh4aWOsVNqFzP0tCgkzFMfNbjTFc7B6uOg6Wk9vBEifRio9ehgDyR9wEhEe6bDqjRrJwzYMGrDouNdkdh0wSJA/VHNRQHsWjP1mTb40iatwQEeGdOOEIdvjvY4CiCZcCu72wpODJ9y1Ou8euJg1Tc+LKB31F6fKUnKkYv/i6f5sUUMiPz7wGVZ4QrATuHXhU2HAHO4pW8xoN3cPJkuIZ6XXkcJF2mMODHT+iG/4otfWF7w4l2QvP8gDQpM5fE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0a6680b-112d-4da1-8cf3-08db92f3057f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:54:27.0991 (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: pVznqQY8M+tZp3oDQLa3H/lkR53c6Vn0dftdv0dEOXAAQYzjlWi24iEqFZ7vgDuKM3pYEmOFWarhnoOkOOI7jueorsQgPAaP2XSUTEqBrhWOXh2gK8RCzlbomPOZc0yI X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: UP2LLQH2W265WLSH67TE7POWM3AWPXPG X-Message-ID-Hash: UP2LLQH2W265WLSH67TE7POWM3AWPXPG X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:54:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337449 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 C94FDEB64DD for ; Wed, 2 Aug 2023 00:57: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 1114285D; Wed, 2 Aug 2023 02:56:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1114285D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937864; bh=qwACQQge03dflkh40phCAj4Zi1/szbx5zSl5Z8yA+kA=; 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=nxDJYlK5f5yt3BYkYPy4pSusuOwiEU/MSVsXVTvJp+r8MEeBVofNCPrvmYZvqkiUi 9P2CrGa2EITlcM+M+M9l9iWy4ppfNc1a0wMPg2bNKFMOOE2tYT8Cwymy0jc8IND7hf yDmeUI62FcQiu+IJfA5Ma2Y2xYiUETblAlIGQh7Y= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6BC46F8057F; Wed, 2 Aug 2023 02:54:51 +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 05E08F80578; Wed, 2 Aug 2023 02:54:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 53408F8057C; Wed, 2 Aug 2023 02:54:47 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20724.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::724]) (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 C6737F80578 for ; Wed, 2 Aug 2023 02:54:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C6737F80578 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=oJlYZtrj ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cRxhTo6wqdSdBLJEvCllYnzHJTSBYNSUyNAGf+koGKjVPoqZKJ05HLwhvMJhCdV6svRaWdKaeR1aQqByXlyHLYIPb64WRtu5Gc5xagaz+VUtwLd5HjTZYtXqr44stbmEUjUJlvMn8SNKLhqVAnD+Xg+60xI8lmJgr0aO+/7BWoh33yalsUApB+29tbRdDwmrXaIaQ3loaKqlDgKmQEo/A07aic0jCj84MP5EbTO+11aAXxVEt1E2ssyhb4CdeQTp/ydTg025/HrT9m2/WSlpKLCRiaZxcDX4WgxFfN9pFBEItdyDcI89d/HLsQpG3fLdF0UCGYfdoKgbTpCpP7/HqQ== 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=qofU/XLmHGPsiHn1xk4R1WS+XQXJndsBoXm3ArnVjMU=; b=P0NBfo+9sVnlSiRJiHAmvR8WE4S7uhwll40ksnwxdCFatDdaa0UYb+5TVAF9ypbFTOfLt5n4EBsVB2LYwSWugNLqYp/Pz81eDxgsjYN3HBXdVCPPsc7XFgrl3yQWWsLf25vNsCQ+EiErMQcmJy8ehGlJahD5GT3yhWE34zjRuWKDCiyQXTm3irM+AJQnITZI2cKpw3fcFUZZv2J1RNgk8fWfBxdBcbi52mqLWZRcBh9+3T9yVscCkAjHwe9IGopweYpKKdpIyWCDp6jFwLdr3Eia8tg+62rbp3qax8V3ew13Sprq/GKsAeOmSV//wqhor4409dJ5ubUtzmIv57XqrQ== 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=qofU/XLmHGPsiHn1xk4R1WS+XQXJndsBoXm3ArnVjMU=; b=oJlYZtrjiAhl80sFRYwdO4iuimdtu7O1gKX14A/GhnzktTmYRQGGEtnw+1ntViQdem/oqeOh4Z5e4hpTdvkp/RqmiITDeaf3bpbyMwzIV1awP3OR10zBb95U1+DIgsuIsErBmAd/pBwa+r8cu8ZO45SYo5WtLTNyQ2Y66RAJu/E= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:54:34 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:54:33 +0000 Message-ID: <87mszatgae.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 16/38] ASoC: qcom: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:54:33 +0000 X-ClientProxiedBy: TYCPR01CA0143.jpnprd01.prod.outlook.com (2603:1096:400:2b7::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f7d3bd7-680c-4b75-406f-08db92f30991 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aApRLWjaXt6Bal5qQsXlpOG/6tGMO7nLSyl6h4Zs1yYCxEtPlg8tMOKM010BZsNYtnDI4y4kQKKKY0dhDkkF9U9Ah/PmqggKqrp4d7pJrvDNt6bi75hiVEHY8spIrS1mu5TARgIpIrgPm/h1wG4tWWhDxmUyNcqpGAyicpct4EFljcldmN5ThhMyGoG4+KNcLekO9vC5WezADjf2mxAAKDnjSgY+b4GJqo7FyAlZg09g9fux5clVL+4XrUWZlCs6gnAkDyd+XR/9bfJOpngW17pR7HpvCGim/oQ342cg2meM8+J0XflYCjEPEjkH1gTsq21ad9CErgkbKG17rymlSJZW3JnB4YI+AQ/0rOIX0U2SuhTiZ2f2tQcecq2qxj4oOSCHOiKP93bOxTCDmjxEIBq9eeE/CYuBs0AOg2v7wWstc+oCZ8/hnnT8QslOEgloqlHzRW7JuBiRJky5N2PUFn/eY151GX+REVDc1fZY9pLHYj/zVZzWmC077yBraXGdlzyuxJArNm4rTQIA/lzSWfWYM9ae+L9aHa0Qr5l9I22LLfNT3qVQyPRdBI4zKbqW4eeG+BfckY6DFl3A1cDHzhGPUX9dJ9Wgmqa8PFscVf3Vu2wThiEhRWrxP9vLDJ1M 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(30864003)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Eq2kR7fMLzXniWqApEtL6XDLwqitdXyvrfQXLBYeKYmW2JbIzNJeEnx4cHafPysXIk7pOvKJ2w4FiJk134HYaY4HL3Muym9Y5g/38BRYFcHCCtoyuCq4Nyllk3H4VEFgbxY2a8QdvrwCGwm/LrLwG3OR7av+qXG9Bf/vVTtZG7+ExlOakAYDZTxY9yg71j37rbEgjFOWKh2MLJFD6zjM2JFV39HbN/uiHsgfvUf2GbyawQP4xkil3xvb31O90OKl8ZjDWw4sIQSrTtlFv/XQC93ONk3CUMfeHvLqYPXJ3N/NSCTWYrCLNTiJjbAmx6oGn/S3ZnfIJ1rO7710gabN6bmwUye2v9cCt358bCpl8Mmz8VnuRkIWVcixBVxCfqPTtGOiB1D9ymB2yVIwSo/prJpQwkkY7q8JFvvc2S5dST5FAt5xPDaJGtTYMWrms7tn6zSiZBmNc2P3e/z7yTYNwRxhmVcl0FPjLFniurU/30NYO7R0q1iNZscK1op+cKuJKemfVlVVKU0+ix9mTWEotUajf8MWebNt2BgnIHaGTPSFnwykEBAt6IGB7+7yStz7mGpH7z3nqY4gT3jBcrND9awmnJoX3QL057OCoYV2Xr4AJP1a/z+QRCQ/NoGFpHoAA3PXroHz+Udou9XNaMIRtS27bg4HuzIj+zf+wYUC0EBtqDM37Um/xq9FvbX+NLH5RXpwP3baIlkDBqD2A5Ok3XIy3NEn1t41/4x3H1MyS1fmjboi3ekXeTHC3rtW2XSGGnCEY14R3Ncy+ZDCRK1TUaYAfJEVoPeY4zXFLKTid6B/DaB/Iyv/PHUHOtfm+wltqenqrujPz9jvdp7ycIOA/8wuaGSCIWXqLF20qDbFLrynAomG45zeqvZh61/Nf90smILGHiaEzCBvF/N/m7MqT0D4iNmNUvzzLxNh3q/z8wk31ugwKCYMMz1YljUj+qXq4vv/P32HptceZSNXcMbq86629Z9EL/ryHykNun3L0K7iZxcXQYAGKVIc3iYCbNMVHhgEse9eN+MB+FiNXHeSq+URKvFwGnCXVtYC2HEWVDqvE6x2OoA5uyCkPNGMPgkIJbgF9dYFO6khtUkb4oXo3X85o21xvILSj10UQo7qRqzfNvuInP8spJ40P8UWEBeIkFfpGA0hFbYc8Xu57a0NJHKtoSl+/DNuh+AG65R3BQQJ16MrPdtskoX3BroCQaPt8gdkv8D4xmFWLVW9wcBOijO//i4hbtSItK75BlJ4+QZpUReGqcShL4PS6KTUGPYcm9DB7hPvqeJJ1yQlAOnm1V5dNdOt3H8E3Fe3SW8DBsj7HaylgUqFIKe6jJI93St6VFQMqRXOwYHx6vgOYtHplO8g5N76xy+DakT8VVfTVUTkRWuWYRLKD1ycOuuaF0sa5DLKaaPXpxBhq8qfamPLCTf1POsz/dhYzbdRboy/3+XQ1nHFDEKXRANX1uX4nTs40mGsxTr3C6ykw7Syr3kY5RY7aeChGVNbGY/GDg3XJtZ9iKIw1gWoz3EGjASXUPpIcG4wFcLwAHrh2jZKQB/9uvIycR+K2AleK+fKgElOXoMY2ViXJq9pxo7HVOTfakx2hweOmg1f4lydEdoZFELBshDl69+pXR8ld1N8iVp8CUs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f7d3bd7-680c-4b75-406f-08db92f30991 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:54:33.9087 (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: EZNdOE4r+dR55iZfXiis7G8m8FQK/FXujJCBPhVMg21JmRb9n/JW8nQrw+EYgGEy6dHXK7M/1UOBH+k/U3SlnpH7Xc5yY+mx6EGuR+3L5nSF9u5XdBmwakZsSrB39y0x X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: 5KVIBSG6JMTMOLPA6JSQF3UPUGERSMD5 X-Message-ID-Hash: 5KVIBSG6JMTMOLPA6JSQF3UPUGERSMD5 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:54: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: 13337450 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 3FCF3EB64DD for ; Wed, 2 Aug 2023 00:58: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 7F64186E; Wed, 2 Aug 2023 02:57:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7F64186E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937884; bh=kRqSs6jt4N3ypRagLe2vBMEFLvD7gMgV8JjuUQK752c=; 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=eUHSjVuO9a19YuoJ5MUZQxKFv5ApE9J+PAkllG6Ph1iSiVkXXXwq3PtPTawYY+l6Z kSuKBiOAtBkLt+kX/V1onvonffCyhtBCXdoXRI9cFJcLRaWnkln4FCHMkg2BCKGZyx N+4YdZGI7IkrBkNskl42geWa60tCRa9wLsyiYgOs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 98387F805EB; Wed, 2 Aug 2023 02:54:54 +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 50234F805EB; Wed, 2 Aug 2023 02:54:54 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E5531F80578; Wed, 2 Aug 2023 02:54:49 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20724.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::724]) (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 ADF1FF80520 for ; Wed, 2 Aug 2023 02:54:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz ADF1FF80520 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=E8YlguMx ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gkSZlj6NCXGgZjYHPwtf+qaiVeJXPCxHuzWj2MrjJuvkv8eFZks/JzW+Jv29nBHtHYzT7Z7Cm/1Kd+JuQi4/KCqokybclOXqUgdhrOWGcdxMTKon1eIQANydbq+5fFhWD9ZvY35qDD8LTw/ArqUWH9v90HLMwyM3Vzoni3SF+97h8Gn6TvcodKwTrLTG8u2Wyzpv0aBGR40uG4xvr2CdxqFXioiLeULzdf94Mz7ivQu/91AQJvqZve9J+3ZYILhif5k3EUxs1/S0q57XH+y0yNKf2ybGndHwXZibgyZn1bWM/aUB3Y2BRwp+jRI4W7eW3G77lzM9j61LrGZV/pH2yA== 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=6UP2eRrn5W/0brVTeBcezl9YApU3z8EUrdBWpxvnLvA=; b=F8e244BLrn8RDpznzd27Tsur/TSRgcxre9pKmVnM7FtWb/yNLzG8FNie7PY5/bB94zo2Zq5kiNP/Fer0EYgxwMmpzN51EiRbUMArp3Dvt6qvwsX3gDRhqyOAmKpZVwJTcpRHGYwPYOAJjDlGiGcajfjSYnWhhBpBlVKRgp8B8eDVKPuv1Br3ZTos2T6AJ+Nc0l7X0lKbyciWUNyIadrRQ6qZfEtqyIZ6KShBeoCLkNz14csLvNzhvaP2rt12o8bn92WzJAh/yAkXZ5M1maw45rT3ktiyO084q8g+M5cNhXv6oJ6E/H7ipLBdOmvW8jkZQIec8gP+MirAcYOSKJRpiQ== 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=6UP2eRrn5W/0brVTeBcezl9YApU3z8EUrdBWpxvnLvA=; b=E8YlguMxO8i/QIpBG1xCajBB762Ql0axiQZ3Ji++FC7DwjXGytMlOdufpVUYEqSpF9j6oS0mosQaaY3kojV3T2St5GpJxaDN95FUxVsIcO0cbZIkvRnjWXN8C9/5yRSe6d1KuUmzj2KQnM8TdZFRXCg6DVBsmXlHCWQG3RjapAc= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:54: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.6631.045; Wed, 2 Aug 2023 00:54:41 +0000 Message-ID: <87leeutga7.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 17/38] ASoC: ux500: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:54:41 +0000 X-ClientProxiedBy: TYCP286CA0087.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: 0deb61c2-1d72-432e-e898-08db92f30e1e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +WbGOMbNt1PSUquI3yjlvBOqjJ9K7h85ErrJ2gLtsDe5rU6ywu9U5GCLh/MSDs+S6uM601fQhcQxv3EvLt4fPHEXrINZlsEbmhSSDSRGxgpIOsrQFI7lokwhYP3e0qawe6uwMkUskbow0t2jkI/hVO/WMvwh3KWhU5qJo//cUnUf4X2yFWyzRH5WQYxmAn/4MyghN1gztcXr62hGfXmZJTUvPjH+ZKWHPERFZt+L+zEf2VT7qdsE+ZUdOrp6kJzebaS0GAa2mnXeKka1NaxbsGm1RBV8YD8hEYvD2+Z0pxMZ3WhbAOjqyCqg0nhwKg9+bwpQ4mrexDOWVvilHf13vewgrYi62U3lWaI/F2BHrRYptM2K7LR7N/qsHHCWfjSLbYja1PCAeI8wRw9nukGFMvqi7DiCeL6mnWTS1CQy39FZoVCVR965FAwWOlb6OR2hlf5tcxPu/lO74EI8k257UCXaKkTpmtaTO+aEQPlZIm+gntAM8hOaibDnxEM0LQ00ofy3YUBY9cwf70D+eM6AoVIszN8xS220YMvufupzCv4/daCTKOSUDgTUwHL4lFpWBzvfsLgCcTaAi8gL/bCPhDCUvKHtu2Sfp6KSQrwd/DCQrbT2m5JfCiMt9cKFomqh 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mRsNqw/jeolUJsXAOv4wm0/8vw/8mt1eL8LWWq6Ai+9V70Xz9uLvL7qVaQ5MuNf2t74rUnq5h7HFHyjw63QCNwu8gaDs6r821Ux62nYbz2oVpfylGtySfFLSmuQiRL53uShvoy7dJWfcaOGcahYBpIomdBiVOwY7Kl6Voha77YDHZmr9U86HuTRRKQWxnzLMviZcOsIFzzOdABZVSNVHkKucR2yImqtiP61Ar2QnmKdGcvlNYoim4//GGsjp9QatyrRQ+lpA82LQBUOudG+tyr82M38lr/vLA5VkUFpAF/Suwc20sUcU41ltnsmnj5X60oBIhAkEXtzx/AP+VZcxqmGf3LmF2MNbL5zF8E+WDiTQ01Py20TamBoUiqo3BkDq5Q72xPgx04niYljGVfgjdPQT9rUgvhC+SjUExZGKJVTjJKBY9nAUgQ03lvG1hqNxT3WjYOMVNWqZPrVd0n8tt/VfFgv5DAiheXXcyy/BfMp1y3nGaKI70BNxngy+bdmOVmiltPEJCg1Y+RBhbw5SMbNkemUzzrmhrWXBRMvmUvwIUZZEbSIsexnghWQ6M55eUjToQgrYc7nHqbX4jr33ucJrwWMs/H/casuRRvD+FkvpPj8vqO/lm/6AnPtEtPKZFrFd9o+WnDMu1nYFDxOKE26yXYfqomztOlMBjkWYY+u8Luj6vzS0Z/sEP2f9+qRGkHjqUN7UdeZZzlmtB2uXfnRISuW1qN8VhKPiuYx15Dewt8KIfXrhY4knNEyC9SXb0ft7sAcdxs7REZnjTmoP176l8mFrLrcN5V5FiLd8YYSG3Oz+fYHbMIwOeO0BpO6aP9TZLFGsijDWkjjYjYNjvVJLGrqd09Ypx89QQdTrH3nub8BDPpZsg1gUGSAKj+XaUGQRUEmJlMD7G481yy7LbfFOW4gE2d7OTgYtzs6WCyuTT5OPuLDkHFszi7mglT4YRFBYJlNHATov5MLV3J6q2CDH4V+pamwrW09r6BGN1Sm6rBHwDVTh+n1Xsan5hfoBf/AZ+swS/q4uMADQ4PmOEAw4bqmxvg/8KvCOmgXdj5C6GbRXl8n0YrGMBPENF/B5qPh+80tlZSbc5u51lCgleSSCFwASmNjFBk5cigE8m+vCMmN6Rlp2gCdVO5dNfiZivqm8Byx1Pg+IF8EcKv2+NGtd+VBQBH4nDMiBgSN0cSZPB4ROlGWMz1GIxvsHXVFsvlpSqUa3si1hQi8v9+BEpQJqKk6q1y8CjKzMU6pqlXidX6YksBKmWJC0T3BXjoXlISkOwD5+VS6yvlWgDnEbKROpBGxJo+NuB2Qo3nfmgRoX+cIsBm9e0LZ1i+JSN97qgrNJFUmbZudF5tQjlO5Y7VnUCrLF9N0xaIN+qIpr02iVeRiPN7vThX2pBq2W4XKvsUcmAB0JqzNHBL5wZUdiwdKFJzaJugG/OJov/GcjtDb+xQzxknIIKl4wFEIUsSZjHeqiRn/HRNMfXdIJgrNJjZEx8wC22i5MjCnObh9iWmPW4jXemcrL3r+2tvFuyzOXUI6wKeMfbRx6wjTbLN8BMXiP7UL0r4v2gvZnXijPJVeMrFoZmwIDhctJtffWrjmkQgQ+1G8hZCwDsciDdmAM996uQWwxl1y7HSucpA05aNQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0deb61c2-1d72-432e-e898-08db92f30e1e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:54:41.5754 (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: wx56telO7IMfg6BLBIoNr4N/IUQTEWwWYILQuqW+JH/l8H6cmRdA7Hcy9ikwcFQ+mQ8CXFSLwn60p1aMED1QN2A6nZPUMM4tqtO6hBoxVBFwJFgiKO9MMcjXJ4GQHrtA X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: R2CACZUY4EHLLUAO5ID5WYLZ5EEJRYMS X-Message-ID-Hash: R2CACZUY4EHLLUAO5ID5WYLZ5EEJRYMS X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:54: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: 13337451 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 1DF56C0015E for ; Wed, 2 Aug 2023 00:58:18 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0A03E832; Wed, 2 Aug 2023 02:57:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0A03E832 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937896; bh=1tssLB8s1SncyG/VKkpVypke/Xmef4dq12lkLT728AM=; 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=kEELQ54C+OSI5JzhHfOrsKbuUULz3VFpaorNOR6lzVcSpFMg65vFlKanz1D56J9N+ yOXI2bzmIsj6tX276zXILJHL0CbcEakua6z20wM5YSSqdInJR7uFdOjUBHY4TEHabo QjSZSAlctOEgk3M0MXMsRd1+f8Lt+2xZGBCihAaE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 50ED8F805AE; Wed, 2 Aug 2023 02:55: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 0318FF805B2; Wed, 2 Aug 2023 02:55:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A694AF805A0; Wed, 2 Aug 2023 02:55:05 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20714.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::714]) (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 A04B5F80535 for ; Wed, 2 Aug 2023 02:54:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A04B5F80535 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=RznJV4FT ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g0lvL59QNC1nSHKCitcdlTs2QtE1Ql8kdXB2K4bwCgLWipVwnz6x5WFgwBEIFFkRmqGiCkeMqdAOZjPYQLxklJrzsWg47XRhAxbU1HELkyCwFUvakkmMUlBbRVMnmtk1IKiVJntJBqOiEkupLgOUdHmGBDPUNWAUrLh49K/JCqF4NL0YHLxzTsErfMmj36pXuiHIjQP5IFxYvqdttaVMaQjNNi23XWhGZIJg0HPSiNG00md9vyk1xvRiYJ/phHJnnu+kn5EaADh8Tq/HAhvm+c/LXccPArjzdXL/3SX/2MSXwQ7M0KrC9yxQxLs6jofrV4pAdVuNWssnCvEnoPBbrg== 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=y/a67ST9VSaFBJGLDrllDQIeR0IlpOMroh3cZ7C4noU=; b=i16lztC7IwbnyYYQQBn5PRTZVfkMKTXQgNSYvkAnKZoeLFGBZrWIo1RnVnR0lFfh42x8/orQjkYoyq/udyK4wg0XoIh6j17QMm4FCyTsEtpWnNKZyJIPxAC5EsC9L7/IOasR4zK0FH8j9KN7xTXQF+jPps6XvFkEYd/uYj/BAA5ed8prOSPt51ZKxn9uht0v3/4d4kdeIzcDpM3tIhhpzggjLp8JcoYrLnLeirKkZe6pD3rnmsTT98GIkK7lHMr6j4MNeYkONEKqyvlDruNvdJJc8oTd8Keh+2B+NqljZWW097N9RYF7JSw8N/GMeg/haACn3CkNXCKUOptn5gzFZg== 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=y/a67ST9VSaFBJGLDrllDQIeR0IlpOMroh3cZ7C4noU=; b=RznJV4FT+5eOG0i1P6IrhAh7wax5kj6wfl18zRjZKitcOPuTCP1YWe1DjUq9FgBzJy69jeFm2AxoKL5G2soE5eAiuFA9pYQOr78s1Ajyxd+Sup5j/dJbtDePgoWsTd0ZfGtFYF8eb2qUnNFvvfvNuN+TqZ1vIb6cBTP35RTH9MQ= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:54: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.6631.045; Wed, 2 Aug 2023 00:54:53 +0000 Message-ID: <87jzuetg9u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Uwe" , 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 18/38] ASoC: sunxi: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:54:53 +0000 X-ClientProxiedBy: TYXPR01CA0048.jpnprd01.prod.outlook.com (2603:1096:403:a::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: bb27e16a-4aa8-4204-b3e1-08db92f31558 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tKqlYUIq8JO0nqdHzMC70INU/S6zUinA2ts0peohFGCyiHhOlM27Er1i3K+d1uUHEc/rSKdq2GBxnbNOXUxrBxJXor6aOORhaM9lBaZsM8Fy0V3j+/f/2hCzN59lvzhEp1bTU22yqh/Ulyd7+iPzta+cREATuAE4EHGkHMOB+uyUB1AVeAjgHEy4CqOJzTOmWLhHijTIQD8VqWQ9gDQZ1lbc4pstDr4MEonyGV6R6YxJtziqB0Ziw8uDYBqdhxMb8l6iU3KQx1evNXg9gmMQuaEBW+KHoUcwX57xNAIFmXwnbZCzf5zd3jOmHF5qfJzBzrHATE+vo8Ma2hF6+53mCMjgegowogruBDL2DxsW9bW7iiIObwa+2pusATXtAnxU/QVzsBAPyhUnUCbdt79vyQGXeAlF2b99j1ee7AMRUpKxjQ/ZDCXbUxKpOizuI0QhDqsLK1bTHGj8pIja7/j1lNLLMBFm4XkVpA9vDHOR9gmXNI2AHe88ZaIWZHRuU62+xi370nDuBd+6plHvaDspWqxDTW5iqFW/OTN4wPqKYHjVddmOsCpsmdGYRp8x5bYVMzhencx/Vo5T7fo9SXM0cqWxKQDLZ1t3r88yaIek95ezjm1S4Bzez74WWA8C9zt2 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(5660300002)(8936002)(8676002)(41300700001)(7416002)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rp1V5+/mBFsMHHFhDs9TcFBQvFzIaEEweZzUwUbCMzYRPmDiAyd9EFaU+ZK4OOpnV1EEAtoNcMylYrxgLryNl7W7rQ8K0rkhjeByjGEt5VXmxBvnjF81sL525+l1PB137W12ZmsCWtSsDcf7ofsngfJSE0Q8Cj1RmfC7wR5zKEkX2wGLMkXr8rbFYHl9J5Atli1TrsOrJid2acX8PInXR0LzXdxXjAFDkgHUfEqUfnUM2ULY0TKSYzQJgDQ0bzdyLLAFticAkgXFAhd78X1yKi/FrN1HF5wOric5VtR5USloAsR8yORic3pkpmxsPx8VPGN0ZT6unPAgE3sfMM5fs8FKT+dymam6tTT96JuNzqZ0JnoVNTJoNG+xxXuFYfd/+542ZFJ2pUgC6mc0Db7XuJDjfR2nFKkaP8opFRvERD09ztbDr0bRZmGEawKkzZepL7ZQIg2PHtseY6d3qSzIrFo4fn4bDF1gTaespgs8o6NEEpVWXmZD0Cp6WNQ3r1FQLAj4PVcCExKzq9wi6G9j2V6ny6jgcF/k1ruIhT5KyUDtYVn0vDAVYzQraVlB9jQadfn6zw+HlKnwlN9B20uhfAnW9iuC5NbKY3dijcDE2V+7d1QkDzfX4tfe89e3BcaN4MXQcxg/bTZ9nwQo/U2R5ntN0zYHau+RX19QWSy++Q3Ac1jLKlv+IFSWJxbcmvqRdhcOa6coOA5kC1fFW9V8fjkr3YPjQ12bEoJomwJ859CTPFg5Z70OKSoZZUmKlfXSwBXBM/1Ac6TwXjXd62jgiwmsANOO2om687cMrGwjPU2Bbyei3xcj6jEmxLTlHYpXmfASHJrefBHFNG0knsciwSgI8SXKs8UUTV1c7cB+Uk5mDWyNEo7v8j5O1ldXAL3q6tJ7uUXJFL9JbI3cYzQNg0ucX2oKBWI2losmwiY2AHfDfG9jz+IUe+1rYqaI/WKk4JkCD45yNQh5bCj26qjQMS08v5UV6d0HeoU3v+oWYcna0k3yNGicvySI3voNlouyKC9YGeo1zS6avhWnRNBGeFJaoSWmgoc7zcm19R8o174eooaN5BphDd1wYgUe15asucxbvKNZ0sC3jldapP200akOSpRWy1EOTzxXCrNNLf+ir0kUvV1z+eU0QsV7Aorm6CeVOLHSKHkSMIYB46SRotJQ9Xpie30570h1yoP+6xHvm8QI2CihNjW8AHRnFruRJTXMdxG82bCbCd21D1KZHA23n9d0s5ZauYZdfQSDEpyGn/yVugHwmfIT54EdOWFUyI6DWm8pW6OOlZ9GspyPsimFPPTI1R1/v8mTW1DFjcK3si/UeKOxwMMB+l5fv2C5pOV6bPcLJZeLt+JTEXI32mX20cqU9JjCFvkcUUqLbviBkMaL+XCU8y1GE7c2tMgnEDwEFod+Z39IZm2r9WG13SpkGcYDNPjThEet3Zsxi8+/TszRSDwGwd8zbpfIBdcEKARPWnK7l137Kpxcwkt7VTMnTgObJl3H1PcCky73CQEysrbSM9Tg/UAKKtjczN3zX7UOwci1tgE+L15Ax19VwWJ34zVhroFewdUJ0nP4Xi451bM+FQ2d3nXSVh6QPVCrnT+OiQQjrq7erPkB6DakajmJwiRoqefckTsG6FQ0UhU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb27e16a-4aa8-4204-b3e1-08db92f31558 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:54:53.6921 (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: yyLcft0cGiLsIsJNty5eufXJ4NfEIqwSkSfLOYSgZZhTpS0XohXVS/zlyYToXR2wxLEv7KsWQiUDS1Bn9+a2dhGUjTfNNkkwJv3xl9PmMiZjoxFlZ8zeCstsfJwmyNkj X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: 7APR7WDCQNQ34HXXBA2ZOCTNTIFLF3TE X-Message-ID-Hash: 7APR7WDCQNQ34HXXBA2ZOCTNTIFLF3TE X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto 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 Wed Aug 2 00:55:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337452 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 C4D1EC0015E for ; Wed, 2 Aug 2023 00: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 D703282B; Wed, 2 Aug 2023 02:57:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D703282B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937912; bh=Q3F2q+0YPSAxMGw4rk1VBA5Qi4ipUj023nUel0UaJS8=; 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=cuiGcsiiKSjDqj1igpcagEK8GjxzaGUE4hiRLU9/YOMgNuy8dm8N58erbzpn3YIUu lRMZ0aEQzNxXOy4tdwMnPzZv+zkd3Vs/h7EOwUV8mEA+hGjEEO5VvfpUcm5OoPkalz ayzddFuu2LErYhrXLX9JCMjKaYo4+zbfnzQ9mVnE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9B9E1F805F4; Wed, 2 Aug 2023 02:55:17 +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 78319F805F7; Wed, 2 Aug 2023 02:55:17 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 64AE6F805F4; Wed, 2 Aug 2023 02:55:13 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71f]) (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 96D68F80580 for ; Wed, 2 Aug 2023 02:55:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 96D68F80580 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=SlMGTKfD ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HGKP/p/AUTB6qM8mYL124P3wF/dBNETsHChpnc8quCgy0Qc4afd3T1JsN+du6wzLYrL+L0YfoPusJrZ23/vjRRp6g6FE9hXbMQ5ZmvugzpCK/MGESjSLEKkXlE1r+L8R5wN+rzG/CfIG2n6E9OYcOZui5BIsHu7YqZuAD5lq/2TQE/jGJ3PkruW0m4066JGyDIJdOOfLKJVMRIdvPtWB62+f7q1Oqx3ZFZ0C3Zet81ocoob6BtWIEjcza8FsetQpn8Oo6jtLDHtHagb2szhhbTXgZopTar3BPpPOTny50A6ZW2qrYsPZJZbpHi86s/iDpVPwCpKFquZyiNZkxWokRQ== 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=jHUn1EaLPo89PjGHQHwgON9LqKYAm5zbyfzGcB+CPS4=; b=mKiYCFaDHdfHw1y6o+qo4KpMZfHA2wqYCoOOEjy1sdJauki/SNSWUKEMHrm0OhbYePUUKsQLTSU+ivRUI7ySML8mxcXyZ2CkHseROTNSBsDY0T8InDHSPu6VZdlV9eCF4906qgGLvfxUIW1N/GNKb6c2biW3HCMYAF+4cDHfj3K0AFVXahFUzkb8bIbmFC04fnVNNA5ZLTB98UHnF9eawGOU/dhNbDtBF7YRvPP5Tt1jpxB4jJ8SgrZ28C4jgY6gj6Rc8Cac5prqVN9aHdV9nB9p0wCdMZabI4Q+c30+XeVnJ65b54Doh6YY7KD5P9nFjS110142XcKKkUwXICYuIw== 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=jHUn1EaLPo89PjGHQHwgON9LqKYAm5zbyfzGcB+CPS4=; b=SlMGTKfDCYLzATOHx9lWikCPQTbemzCkAwrA85BBiR4S2Dz0DuDJ+wNHMaFFfXk7EkWqlJhAFFNM9CB3VVS+N7LnfNRSaqZgmKrZ/nNBhOgY20ylkIsybp4w2mcpqOjkyKti+Eu2CFnm/Kz/2d79yUwqcT9BDFsWQIwI27iLV/U= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:55:02 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:55:02 +0000 Message-ID: <87il9ytg9m.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 19/38] ASoC: tegra: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:55:01 +0000 X-ClientProxiedBy: TYCP286CA0240.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c7::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: 71dbc70e-e7df-412c-f12f-08db92f31a40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oWl8yWkmPNrH8dqSEeC10RFaQ5b+N7qV0+4yIiLNu+N7cdslYOBi65M/218LXUYCgqXwd2Fk3Bo3MrhAGZ7QCUmu1PVjQZnWF8hUl0AjfxB/Slh/n3DjCUI4TBMfaXJ0WKlGbLmsuQL0EsJam4DkcA+Ttiv4K/Xwq849/DlM3giKIYftsvKGfp3I22ikH7Lyn4edzVFBMAtOz0dmArbri5ncYQg44mOXVL4f73mogTGKujlj4MghwgsWVkpE3hPvY2MBpLgd4Ej8ckyk/kgBjHg66Cil2yLg5VtTkAiQaFEx1yVXFjceJr3ACVmIZl31h7Oug/6q10np3LcUtjaSCfwzjqgwSXxbm9NC40830rdUqzaCR5pR44/rorkbCs2VvdVMwmnwj0CisYevIiwj1DQvWagrr7ZomiabwlnQuyINEsGOkcmI8px/I05ChuauV4N36FyIBlVxSM+UGpipykDbz/GIcethkOgoXfkdqAdlTKJCDxBnALmAlIDJHrORjhcOQDhWMJfohYFzm06qewL49W27sEmACXjA25HsS/rlAs+tUoykbZokLJLuOozfrcCfim8sL8nkl25ad8wA2sNItCAnoRI2Zj8UXFXBadydfpuzeZwn0W7e0FpaSUIu 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S1WV8Irj7q1FkSZ8xlynXiNBJ1fUOjxHuip5fG6gmvq6E8Qst+x1pU1EAHS3Rrmf2+MkW5eZcf84+pQkLIws5QNfZxT3uOaY8lNDcJuqqSIGTN5odp8+UGay63w9wh+Mbclymxz6rOlEkqca8yo5hJ88429D3MIE9exNV07MsT826syYbjkvagjGtfrubaiZQy1zGgEuyk9pOB1gGX4s7dCuZd41zSrgICLI30f0y9AUABKF08GYuKroK7hO8wawxp/1cVRSfjhxRB3wFyA11nW+/TBLyR14L2EAakv6jonQvbQh6DTDgAbBXtRDtapd5c8TXCsn4Fj0s/c0Eqywbm+0sgRgmt50+OMC6C1o5qwfDeooMSJWk4FSt14Xr9tegswYIqoOpNsddY/fO1EUiSuGp/nAfmYDMn/9rbd1fg0X9jq8Bm1717JqqCTY9dVFJI6PmlNs6QpU6/yFEZVdMAzN9g7BqytKQJ4yizG0iJWD8llvqLHefxLZLdRAd6bcDzopsDGRHfVjrromGJ+fNN/0MZtW81XNQJz1FJQ4s372xMf78PiMzP0mBg2TsUvFq0aRl6AGCedF91O4OENg8qqao1GKM66XYPi1lBz81w9/cbTy9V893fMm+CViHoXktW4lOKzMLNc2Wgi98O8yfR8CQFPGxik1qheu4/8nhyiK3vKIebwnv920AFf46vGBS+rx/K8tMLI07n/fmcB1xQ9QXQ0PaUU5Ssgtb8AKX3ZwlefyQyNt6lTOK/Fuf1mfRPizObNKTBrPmKlEKKs8bHknIgz8Y+O3WTQdDRVR4pRvk51nFrxZRjoWZpk5dmmU/cFJLPtBRAbD2WDFJuOef6iXnlDC6Stj5YZRQtRursghMoqvCyg/+lj5Y2AxStSNJxDXVT+iw1Sync9oqkwp0YoHq165hR+Ex+eP4s8ZTNg3QK7WbL3rlVn6mG4bXuDyZQKFO4FIk6pZ0+wDSd14qVl331ZuJ13nsY/i8/NKQUPNIxxXhpNv1U8Pnjnjetf7MiKpKxczuPXOVYd3DlUh1mtGRNfCxPIAUG6R+7ji7aA9MUmFQolNcq365rsKFBUQFBbuxj9LImKeRiVtmZf0AgWuPP7o2tthR+w4/X3aZHIqEA+2yzH7OuybLv/++UewPfpugBaA54KRlw4fc1eHFeI4anHlPIs5/zmH9Gm01SGK5eOX05+UAkHvLZZwU+quMObRmdUIlJ+Qm0oyaDDMVYlK2dcObsnqMEkQXUaNIchXfD9uBYQIIB8hR0ZnjaHALkJ/dMfg608F2ZcAYo3zAKb9+xJ6TpGoBe4JS8LzGVSaOFHGPPJyi2caVEF+9kmVCnLNYQWVle/nDskwrrlq/va/IrX5of2VkTzzhdblj3Z6xUba3dluKlw0RgRwQQtBsegXIAy3Q2iod8pXEArms/pslmkcPBMDVjjLf0RNgzCBFcBiDOjE/+bSEH1cKBqx67kOjCCXwlAMCokfdHpyGpDAJ5WIbQ413cW5mTus96SaHkbi8pBbAoajXQSLNQjla0pJO6ZKZd+/D3FnlJtMiuUPuadAnm+VPh+9+zpt3S2y10evdy7wAvSNhJmHAC5zVTgoPQ5lnjTGrbbeBuLz/kUKFZJdTA+Sb3C5xX9M11k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71dbc70e-e7df-412c-f12f-08db92f31a40 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:55:01.9453 (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: Z4x2rRAm3yHXWb07XE9Pqb7h9zJrwJWraQyz5vofG/kEaZFIfJSN4ZTZQY/CqvcjUfLcXObSmx90COK/0r9ngI5FnlHtGE1OXrQnPkp1BN6xEeWced8qKcBcKp4LdgAg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: CYYAWIVY3YIMDB3VRCC4LZTCMA2AYHXW X-Message-ID-Hash: CYYAWIVY3YIMDB3VRCC4LZTCMA2AYHXW X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:55:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337453 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 322D4EB64DD for ; Wed, 2 Aug 2023 00:58:50 +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 763B91DD; Wed, 2 Aug 2023 02:57:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 763B91DD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937928; bh=lptviGAERvVnwVKJ7LTYAm2FXK94eKR8SJZamHmYrGI=; 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=FWc6YUBKWPsHN4xJQbCLWbWdr2Lasy3EClaU3ukiYESL2DyU2TuSP0+P6w5CaX2eS qvE9Dqy/2KykyDii+8iht5lG8GEQZghOIFqUCdz7hhNDJVNN8aGzIf84LUGKnkLZzM oZOfMlUpbknlJSMEmxCCyfnP8xXItH9eliO9W15g= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 35123F805FE; Wed, 2 Aug 2023 02:55:24 +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 D41F8F80563; Wed, 2 Aug 2023 02:55:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4835DF805FC; Wed, 2 Aug 2023 02:55:21 +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 8094FF80149 for ; Wed, 2 Aug 2023 02:55:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8094FF80149 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=UgAzJ1b7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ztm4DwcxOOdz1OJe6w2M5wGyldML24Q0ox27OA/CSInKlXYlNKHl9yFTp6mNHJOxJyXDcJhHRWr+776rmDCxHQ/8tWW86dwi1itO6khDb6vO1a3uN0bHCe21THk8Qhhr/e2RAlksVE5tp9tTSUlI+2QkWiCXpIRD3u/dSQhOqOsack5D9bavj4tRgvPO63dWCBRTmZSySd4n8w3AY6GvmAW7pmZWH0VQU8zcqnvsFf+uRDBimtOZr0I9NuX8aaXWKtU4nVrqy9txQkiA/6jOLC7O3L1P2k71ruEweBTo9etHw/cpCTPp2YqvnRLzCM7huwB45LMCWx5xLPhe+e8f6A== 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=JbAIO1PkUaIeCrGezk//JvVkf1PpGZSGF/u4vP7S5RY=; b=gVwboOBYdbSAiuMohG3XpYOp7985gOCAeUHWjPF53blvbRSzMSVsrDx3oeN0dtMZb3F00VhBINeKPeS5/wmAvOUd4EaO95VcgRAJkvydIruR79xbdyVs/IcNWklJbijvq29Jr4Ej6EFc8LJNKGEYS6VC9TmlbZSAuk/nILviAyZ7jO8dy084zMoqJeMOskfsX7uU6HEG5tbqxJaJxW9Kqms+Z7l/EgXeqXEeckWv5ny5AUFUptp42gZOki0Ua/YsnkHIZEA8TGZrMJo9RiGYt75T3s05VAo8O2fB71+oKwYonwogjWPGLmylwarHIT1fa1BcyBa8AZ5NS/kUc2fc+A== 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=JbAIO1PkUaIeCrGezk//JvVkf1PpGZSGF/u4vP7S5RY=; b=UgAzJ1b7TxxjNEanBkz6r/GcX+IkGAYNPrEkG/vJmzWcIHvlWNXkg/wxZjxCqmeZLTOFOD5BU5vcI4Lq/R9rphpIYw04hFS+xX87BrRNC8FuWi904Du6sNIZoc1j/+z9KTepCQyFLrG2iWR7INuYA3I9XiySHP2rETPf5RraiZ0= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:55:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:55:08 +0000 Message-ID: <87h6pitg9g.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 20/38] ASoC: atmel: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:55:08 +0000 X-ClientProxiedBy: TYCP286CA0122.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: 41ebd0a8-75cd-4fea-335e-08db92f31e1e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XvbYSB9VL+abVrY3xO6CcFLDqpIly4QP48BD6Rr8P4GtfZrz4CBodhHK0Pt4W2roVsvKRHm5vxZfE0xIE7ozR1Yqu+r23C+1Tv9IYBMbJGYHjuuHUXMfyTOkIXD1Y3U5/bhvtzhEvrLqDbJtxkkLRoxfIMSSr1W1SnbVX0khS6xsljjdkOeOMZAV1oli1pl/iAvI64BBjt3K/HqVhl9pwqV++5iLMmVEf36fJRMKLJr8o2G9LrM0+OcXjbSyG43149Uugu3JwbFcqcFWYWWqoy+9P3KORR/QuesmKBn5LPcZuOWKBxz+Mqt0vBNKnwdHH3n5y556zlQsGnz/rzfpSe5OMUQzFckOV/8V/81l6xNkvfuOcDBYKCV7A98PtTymobZuD+NX1r/tUCxSfsOJ6TGERvc23N67rpD/V8+G4lBW2RzAkYMlEe+pFrLcD1H0Un/cxL33Lw7AM5J9S18kaCOPVCYwOssFhx5R0TY2+qEFm3rqI93a3yj6cUhPYAMupbdB3RNuZGVQPMusMM8ECFssQMD+/CrUqHWwtV1i1FXKdvAmO79kAJY2ghXePzloyaT2phM392nH7nX6afyVt0sxMyX5vOmWbh7yxWpr0d3ihMTi4y80C7B+Jik5fQ69 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7hRnIwkhI/PIe4tecWqn+5ZkJ0eWKGzIagZlN+pEL2TvfuEW5HRE/PeBjOiEOrajQWFQhdI7tRkx64LyigSFzX9xpksMaaQMSmP4EwT6JeGylROD+0Npym6ypyUKszZzEA7G+7V5H3mKs3YR6PzALgnoyIHBg+BsCd4QH8bk/Wkrb/+sg7NQ9NA4y9HHZeqffFP/4vkG2QC2Nk6LeCwhsQEIAh2a/CUzmT3WlmTex/dbBo9XijnbOyZihIScCn4AKpi5zhb4aTNgMy3NLktLwJJ2legFFfPcO/0qcCTBfSpORoXqkZwdnryARJex81WiF4gdzzoU2htazHWcPZxTJrTlewAnU+8kZAI062uIcCPC0tOC6mE8ztWI74ImMHJEEFvX1y94ZunpbVlDQrf19Oo8RUabidpQ5+EB0N1eFpI72wTY6aZ5yyyODlvTWFx6NMYXl1o3wF5dSMPpjWC8XIqH9XXbHbEq2+hvBf6uYhMV6cFc225MDNkv9mL7szUXcYg9m/nHzyuVhHlrJ/i9DV6YEmbNGg49OybBI0ZxohsA80GLQsIK31pEim2ThrorV2ZkNE/Txhpra5LT9AcZ+ZePmuV7ELeq7Mdvoi4lvn/0CCF8eDOuCa1ACbECIakfkzdknGXOO1VZyvUdv/y00i0dkvp9lZeubVS616Ar5mo+K1rlDb3DCt4TOgGaTsZazKTh2KE4YyYARMKQmI7kWPCvTdV7s4qnDEcnNGMLzjbmg14BOppJo+QOiriyOmUezlmRERfiK8d35PUQUfAN/cDWhzkw8x4aMNCZFRX++ALFTFLs79y9aLv/rC3I9uFQPDm3vp29rl7/7+SJ15CNCXNdBzxylA7meyelX5FkZBaOfssyPtvTGE2FIar6DhoN8pwLkgm+HGBAP9d23th3xeTC/qpBlo2AszotiRDvIfBZoP1+xoXvRj+9yfcGDSdhMf4IMRDcLi9BaskV/5RW4fWiGgOFUG5SHSC4cYJxk8AEBXZVHPN49y3Ofmvv5z8wU6+7urOU+KMPuKJXBuR5/y5hs/1yIPJTWX9gcYC+91Qn673aIrGTNrxQGBYeC9lIedNa50PyTtz1SlDBLOSxySztDM1d6AqWUqh3FTKGXJQXbbiTxuQoMPjWgciMBFk8SMe1oZ0NPDyRpcvcb+uSJAV44wmPngoyCHKsoVjqBTJsFVlH3e9MhKNIxt90PcNE5MGlL937b0ibs8aSxYMRc5GbQZWtFfCswYfZ5o1z5Diu90i0CvUnlBpQzaor5L1w1GuV2jfUyudgxlJENDBSopSWDt44e05B5WKeqU87kc9bUgVp9TbAvfOxN/BfqNUGs38f6a4vrlIriADJH93DoThh6n0JT59aFaPoloTbZHFjz5hAAEySkqxuAzqEwhLXOPmUBvl5INVqIhgNlf42P8anw4Wk3GfiN/j6RFbG6Vdp1dIR6zeoSoiyVS/noavqQmNdzsaNuqalIQhkPz5m6gksj8Gk0Et5/i0hN23rAx3vIaBjIfebVan+ER75npzl3X99r5P5aX8PPJVl58d5y5oqusC+swzf9GQSpUQUfxYmUwyt5XseomxA4amo2A1XkCC0Jz1LVwNq018ETfIpIMF8+/B0ClLiSOESuQUsuoc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41ebd0a8-75cd-4fea-335e-08db92f31e1e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:55:08.6222 (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: 365zwNGBk7Sz/2I+/ec2vtkDu+MlEuCPKmSPIwK+u+lz/ULn/r8el7aJp5fzrr7K1gz9bVOQE6oNM/Scx3GTR0vvRSdaI+lzZ4P/aLpmhfDIQU7s4JHvnxoPsuJ0INf0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: 4XVEJJBPXSMXS2JUPGYOPF4Z3NCVH3ZS X-Message-ID-Hash: 4XVEJJBPXSMXS2JUPGYOPF4Z3NCVH3ZS X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:55:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337454 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 2B895C0015E for ; Wed, 2 Aug 2023 00:59: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 66E98AEA; Wed, 2 Aug 2023 02:58:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 66E98AEA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937943; bh=W/det5opQCa+9+AWg1gi3QtSWJgXkB5M4zQ3g5cNRJI=; 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=lbjllUsVgoKZHhsCENCU7ZLBzJbPNjDk5K3+PMtcAC1JCBojcxSfE3CyEQK55Aife GJP5mVs+pvS2hHDZCFE13BpMXcDjAVCBzTdbqTN7wvQS7Q8pBTbVY6AF1z10L9F9b2 2BABUt43tVFa5RTS1Rz0d7vLri1dWvn873xRNyiQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B1734F80605; Wed, 2 Aug 2023 02: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 55C37F80600; Wed, 2 Aug 2023 02:55:30 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2BC35F80601; Wed, 2 Aug 2023 02:55:26 +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 97D35F805B1 for ; Wed, 2 Aug 2023 02:55:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 97D35F805B1 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=LiXS8CI2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SnVNXUqSe5/Um1SqTkHhzi5h+6kBwVTKuSCHh7KowL5HnezyxNZYt0E0RWIOtuUQBEzY+vtmlvDYKD0Uyx9TlxPqFubbskq2wL5YVQ2Fc7m0nlZeUT+CdDzsZkW2mxEySwCEAVowwuRRx0Ws0z6eZbXiksqAyDx8fBLV5cXk9xVNGuK5qJ1Dh0/tYf6g+Hrkq602Hrhp+AUUo4PC3yoKpD4LtFespd3n9Rbv6uEa3gctRwRpq6odY2tR82MQqpQ4cjkNT8MUeoyNn2K3KPQGjoKBGKfs1nqNkpwbYR+jYWlubKuShK12Rz319N2EzNCTAjsqwch2M/1mOjINOHfhWw== 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=wESfwL0qmudg3Q2IRRPLe/QRf4jMu+z+ht1SlccGvEE=; b=Y+TOF6rT2KddxuX1M40Pb+r46geHW+aYPOJwRxDuU1iuZsO8tCVO5WD43HQ5cfqRtE5b2VIwzkLXEm5/XDmpuOoHWuP8tH3172DL1xhWI4/8Rb2BKhwaV922LNx0LAHlBOfn7q+PYKigz9HdhUiuyvuKU0i64sPIb6Z/d7tqtsijEZ4V3IkOe4YeIElDhW0W6GfjlJHkQ/+M97pzFZPDHLo0JGvBhEsge99RH4jBK6GdhE7mVe31beyJmbPGEaNw4Fc1tZHIZAWpmO8SVdtOA89R0EPl6tgX7+IaddlMT4hiNM5EWZcvPsyVI/Cz209HCiPqaVAF7o9jTNRaWd5HFA== 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=wESfwL0qmudg3Q2IRRPLe/QRf4jMu+z+ht1SlccGvEE=; b=LiXS8CI2+DWAG+syp/o3hB20wctloy60QZY+A1n5HLDPs7wGKLrtvXHJbzt6JvDyq5EJ82pFUE8Y/W2hVrNIFn2YCK0WJQrNm/KDGKyMxBG6N378/uXT4KPk4+ZGMwP8Z36/M9Wesr6/tBfDXPaBNxI3ZwcbPzZOWAS1bwU5KsM= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:55:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:55:14 +0000 Message-ID: <87fs52tg9a.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 21/38] ASoC: intel: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:55:14 +0000 X-ClientProxiedBy: TYCP286CA0128.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: 19d95252-4f02-4017-a205-08db92f321c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WVqQ4dQ4pwojm1ScxE+6MRYFc7Wgq2CPZqwzpq1tJGEhjokCtt2oHGYHYJ7AYOmr6Sb7pCyoRx7VuqCCBf08b3/bP9i6CGB0robwJGZNT8I44HHK20efTYGwY0yuTAQ3A40j16fTE4B7O9fEsOgH4wXOR7J3t75u+k1Gmh6W9hZ2A2pmD1AiMQBcVCrzmkp1EUVQBkAcjoiLtA5hzDnNXzCWIDcpWNmMU23OB8ftPI3QQ8sIKgX/ojjsKoTrTkw0J2aFwDaZf4GyFVAOno8Eo5GK1DqW7XifVZ7oRMH6bNVgT6H733lL+j6cqgNN5zvDpn1FWVTGiLKULwBkRsICmvs3kKc00ZWKa6sYmVl1oWsrTrOwbeOUFL7MkUKULGlqyuLKHm0sUJfmcyPJxcMh+y+5cdkcDbNtaS77xDBjPJ+Zxkjvk8wdZ7HmhRhQCupwvHv2bpqqBsGbpGNeijfU9g10irBEO+upQf6FL/mKKKN+AIPSbP3E4y9QW6ahG3lKmE0AAOez3+g8myWIk3GdBlwbHURf1jMKnIiGTQr0qQm8Qdev64gsFM6eVPhd5jj3chnkzA074vFHZ6gg8e3gwCJjWifGfYSXAaZ+yO8ypSr0yK+b190NQdhkmgaek3aY9bwNXxTC4iWzsytdHLsc3A== 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(5660300002)(8936002)(8676002)(41300700001)(7416002)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(921005)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Gkwf02jr2G815qnSOiH14hj06TO+DBHxN9+vKDlVqEqE0sFeziqWJ6PBkaKvNakQ+NoDW6dLxkjtYeSiEbxINTz4czSCSkti0edK3A1OiT3UtCSi+VIiuAupH2Ld/V81GdLmNuo/CJEe2pR3L/NrTgUcULUF8niicnYcbAJAYA6pEzMQ945Hgv4wt67dmwn/RWE3RTlrpw07skNAVl11TDgj4bXytEriEr/N3abk0uyzRYdKBI2gdknkOFv1VgUR0HD7H/GpooZcaDVoFWKq5etBemo8mvG1rFf9NcZmNPnu8GtvSo7fA0ztdmtIiNEy40L4XP1ggPn7aOqGbCDpkCqilkq9r+bbXvmZ/4Uu4Fi3lDn9HoxIuGFOR1AVDbZtA/lqMM/Z2yeSv9QR3j16Yi7DF5UHkgdIi+Nko0ehj+8fwU29DAHcB+EJ9ppZmlD+tf0Iom4SVhHeymx/xFkLStlpz2dvRW5fFLkkhsr5j7NV7Za3d8QgkLMyk0ANOOw5Oz5YMNOzNAUfhKAQmL+xNeheWVUTczkD98lFL+77WrScTuczv+3tcpMntw/pXONHg2lTy4U0SLTEbi0OFockFqLg92oe9S4vzpKRV5Sr8+STCTUKO5ebaHtBQJEVrIGFAKbIttX8AVZ2rHmd0ceXVtvLl0tzSQC6Kb1OMPtJr3Ftt7eYzIiOpjOt8IKriw4xip845/5Ajfe2OD3Fkkhd9ESEYOhm4Wzu4UpzdUmUE3USNYNMiHtPR0vDQYDHSdyxSVovOcUZNQ7Ef+BgAZlF7sitHfHO/1na1sGXNzYQv/I3Anwu54ta4aEZ94uZ9CBoVKa6XGNZ2rVThh/GkgSG4P8lC4VQ2NGi2WH3MtMDp1E0WbgusrmzNbMrNvdWY16OMGMqIvl+POI/mbTakvX2ZyYlkHvCeB9RnUY6T6jk5yr/pDgAvbAMiUitMFlgBms4Z+HD+QhxViOwQwCAo/NzTObliPsp+beKXf9HM8aQ68Yo2U3xev0u/Xc1jTCzckHwmYFDPOQbclkDTMDARFtwQ71W+3q8TxQAt8SqPbFYYOIsagWuCw0KRcY3PhtbeFs1hXlHF8m0fgxnTRtqNwjlH/ihm+WPvr9osDRgTD+fVmsPMzTUh8ngYxmYp02WS/lmE+kyqdWqenLiA1Rtz8bOeiPDOWSGbWWv1nbbbJONPluRwKzQzuuGqr17eKHO2LX20B30TUAc0//Bb8aLPcfvpM02fZ+WS0gdI7oV8sS9/KgvtRjDWR1VNU6WIk1Re4Vgj3c5yG8VzcnQcR/4fPIB45SRWOChuIMJGwDPE0V6D54Buci4K2WRDX4cVIrBwxACH7gPwXE3ya9G8G0M5EcYTjW8YdDwMXqYCk7q5KH7uyUWM2Aj4fy9sHfUGpXW0+/PBngybWsM1sEkOjbQqFp1Z48+AoSWT8H4SNCrtuwmh8hJNYR511zHhgA3AnMGKYgV+TRCLFItmCUWKrSAdZgOqri+S2dK7SVe7U4dQox5selcYjOiC/OIU5ndegdst/zues6xpI97PAjvU+fOYsaTztb+I2g9QImPD0YyTm6FQ91m3bFwyAteLm+3FRykKkj9TRQksETVvuB2KZ62tahdxxVyE40OvKj81exED3l2T84= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19d95252-4f02-4017-a205-08db92f321c4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:55:14.5518 (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: I3fp3eZ0A5bYZAZ6PZY/5c8+9vDHoVnZNGtvd864TiW3WFpOYb8tvxlMo/vb9vdCjM/5bWuu/dGqIG9VUBBeaiczMu+4u4rnvD6LZvJ8jyCcePaFR54YvOzNcUchs9Gd X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: 5MXGK5PB73KKGQ75FSDHBZKHISBV64WL X-Message-ID-Hash: 5MXGK5PB73KKGQ75FSDHBZKHISBV64WL X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:55: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: 13337455 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 6304AEB64DD for ; Wed, 2 Aug 2023 00:59:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C8076DED; Wed, 2 Aug 2023 02:58:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C8076DED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937963; bh=gVg66U9/wT06nXLLyCO4wP4DiBF4yQ4qUysZauBmi7U=; 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=QRCUtQpC9knWDDW8W/d44V5Q9W1ZuRAYZtoaISQPqAes4Jcx8gKWeJuA/tjkCZrZv yMJo2mZfATVk2wrjgesMuSAJRzq7hvcLYf4R1DDMOw2yLHqmJyfy1w9Qm7uohC4xcQ D9FHqXTe4Z9Qzv06EPmE+7PeYbgAfHi4MgOHLnIY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4ABC0F80549; Wed, 2 Aug 2023 02:55:44 +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 CDD74F80549; Wed, 2 Aug 2023 02:55:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 16688F805BA; Wed, 2 Aug 2023 02:55:39 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20713.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::713]) (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 9C484F80604 for ; Wed, 2 Aug 2023 02:55:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9C484F80604 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=hsXiK7HO ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iO+73fkK7cr9l7m3dN9MggwzC5lW7Y7FL+mp/wXgWg+dqi0yhlkyrLAe0eqcjluaewTtSeevvdr8/OXN5bCho4xF8pdpzyXr03fqKA+LysTjfVEsCa3oGwcyGVKYPoAIYuRUBh0UeF4C2iW4Ym0yhoRFEVN31RrvGQYy/DqtUe6p2xtiSqOd9FmW7FRf4D23sGCgv6Ko14RIVaotU/NwJ1SKopHxkykTf6aofrcSwzqQ7++0ac5t0aJJvHl6tZBLtRWh+XJ1AEqSGvWZ96ktMp6fxKTMpJ5C2vII1+703EyIj3WsgKp0YljuqJvploZLZA/6tJrZB+ktVr9MLug9WA== 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=sqR/+dupUu86dvOWHm0QA3L9k/Lx3CgRqtnM70DH0QM=; b=FL4RSEh9Ap/Z/LPzVh9RJDYqx7B6/I2i7Xx+2JLsJwH1gTngaPr0VR1KBmEdb6JCBYStcz2zpNbrIuAPQ1ygbe9mc6zDuc6tddNsxYb2UKE5bIWa9G0fTByZoXc6sDdMVnyPQ7CJqZIG0UMu4Y/FPKrThQe+qDdKgZxcT7MLD2lnpD0qsw2AatL3ztztopNNSeICcFAVBqb1Xf0WGztN94eIIwOUvfvkAd6vBJneHk/kzMyjmNwlSBiHw1GB/9NlJM0jgFGtFSFOsKG81bhtHwdElm4bA95afhLUJDqsqui1IzrfT1EMEAj6nE/IhMq7ztbn+ZdwsQAhqWNyB65MHQ== 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=sqR/+dupUu86dvOWHm0QA3L9k/Lx3CgRqtnM70DH0QM=; b=hsXiK7HOwM3X79FMU2IXd0YQcwISplwyct4ldY6nU/wb/6Ky7svSM74Bk7X87w687Zz4TGrCyU2VzPSUuUCrxOwbzmB7/DlQITSGdpgQN1fTFvP9V4eBvqk4oe09kjGT9kmD6NaVewBD3ALgRcDIFcDTTY7bpWJDgIWnVk9n1VA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:55:26 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:55:25 +0000 Message-ID: <87edkmtg8z.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Uwe" , Jaroslav Kysela , Jerome Brunet , Kevin Hilman , Liam Girdwood , Mark Brown , Neil Armstrong , Takashi Iwai Cc: Martin Blumenstingl , alsa-devel@alsa-project.org Subject: [PATCH 22/38] ASoC: meson: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:55:25 +0000 X-ClientProxiedBy: TYBP286CA0026.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::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_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d281d1b-d992-44e9-2b62-08db92f32874 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gge2qUr2CTa/kbnQIcRlC3GjgJcKs1uNP1QKVACvtQzUt9KfReJd9CC8tWccMJr1158Drx0CwK9zQOkt67jvfMpScIgfoMnZRCwpAFkGnXU+/OeFXFjz9gfyHb6AsYRxyd91YpxBPSPJ1A4p8vIbPtt4LLyei9C3dL5r8MI8v6hemHT9NYe4EemVMTwkAmMmOIqraThC/48QIF2YXYuTFRFSLnn1v73EOw+USN1WDof2FS4OmP0PPfSqeiWH/pv91qUZHFHBLd8O/Co8EkY4xzdZTwQUQwQn/SOuHMJqZl4sAmhyfX6iMUHuVWdQbFX8Vi5GbxRFpjmOIQoKfgxh6NHPDRC25Prfvaof+EGwUk4cGR9cwLw2OWFi9Pmih0ziXerKcr6Sj2UzOtN6p4g5sW/UDEOg+PyfJgi5lVpuS6DRi6Xs8UC/s8UQBBQCGIyFJhaSdzr7ekp1j+//9qVdQfAmXdFfe4h2maZlQQOhDrWCheEtbU4JpdCPdanZTa5UhNu5yefJMIcA4S58p/JtMk5nH9lK9pwifVEV86QEdF9ukJDF/tgX02N6knwmJak8qrSqd/DP7ZBl1InXwXDLW5TGUZxYhsjATGTdU4ZvFUfFa5K/txIGar3EmFSaoZdz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(7416002)(26005)(30864003)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pyeB6oZvUFy7rHsIVE5lhXCwHlUNovJGz1z4T6ApMYcWYYQ53JM5TyFMFoTL3g2O7prAUcGgGkV8IXzukCpVw6lFsFMueH7g7XQ6c+J0UU+ocxzmaa50HJIQpc8sKx8BQVaTBbtebYyqE1EdfuJw3rZ774SHF69Zus7TavhL7tpbOdmX8eKW7AnGnyYkof0iKIKdlKnbA61V5+UG9L9xrM4/adxzdsZtmhSP8zDt4/Uk6GHqZGFo0hiMxRiKTzA8gWIUDkjwaV31HMlJouV/SjX3XiLsrLfIRijH9SJydJ3x8MTT+G2cegxfvqRXWPRCe6grJOiBd1hNIahR7m1H+y6h6o6w8X3WyzCl0MpkCYYSsPiiqM1ksMq9czeNLdURZZpQVpp5+wtTuS6z6cCNyTqU8qEw3Te0rv2H4awIRxSeWblz2PxbzzS99BSx3QOBtvYc80wfYpeNaRK0vz38wjFENwNRc4O70cZLKANPYAuhXytEeXHLXWvkvmxDMwjk3XhatzaLFeRm52/pxturREUNslGUZDx2TDpaxnWznJE2C78u5FYR4zrsbEHL4dBp4O8ix1x0QbLAjj2Uf+g5K0qmi/9jwKoUhoRDlidg//mrfnedhHYtRK9gnfNDUq1sTJvFPfggoZbYWo3Jk237OJAdKXz+Uy6PVRDrUHGzhCkhJ2SJgG3Vw0S3hAEElLTs20p4rZ5eQcc9jvl9up0gapzgtlJr3p/Q1Ia67aJwoYTtD/hoddaQzoWyYdN38DYd1/LunrGKcBdAc55a/69IGZDUj/i9HVj9uU/Obz7q2xG8XIR4kirGUSBTJRpcMc0wHrEvSfErL82u8PziCfXlP1m5miLGz2g9rLOwiF/hbWEypkUxi7sc+3DN/sQVdjW+W0NZaRlkIVLAaIs8MqknJpEg8ko7kAiHuSp3HbLlqgjMBWsldYfDn5E8oHvSPXOVwc9xMpjOndC2LB62swiMzS7T1yASBmr5D4CZvv+g2hDm3pBpIFoOanZSPQdry+qnMm2FI9nfvwBuOdx8KaYE7jOihBXgGNw+mEkv3BqqM0fd9/yOsnZW0mOUkL6E3ODJ8NEcDkC4JWR+zKUQ14jiU6x28Epknvs5tKabmgqUhq3xgaK+VyCH7j2JFhY0+311JKBLecT75PDKafIwl9Vk3zwSLQZCqHnDxUwP6poa9LUVPHwNhpCigb5eqKs+DWLCpkgWiddog6qaN51rzLe5mq0KZYfKyFjz2h2nn40l/bx853rR1ZbAmeU45YCNgis7KCd9OUWyjPeTqqVa3oq/RUHdRWAnigelU0C/AL2Z/YFYLKrjzbVy2Fhgl4m22ZI/tapR+RLBneEisPxF7/Wq1lOIrqSX6Fjf7ig8UnicPQ92/11km8TeCq+2gjwNqRzid1uqn3PUlelEf1wnwmLFRLgLGkAD3tTSSfESU6aPZV1+OzNmRQqcWPxyX2DtRvu04wG7N1OuOaJG9q739lk9I9AqoFMF1gKBVrW/ivjveKCBJtT2X0Xf7oWmFuY8VAnMX7RsORqUsEvilMAzqJMjpf7sGAOiY20kEqka4oIAGFfR5fvoHHXgXYcGVQKWHFMWxT3KTxvJEQVVLUbNWVHIzPrI4DCotC5LhXuQIukiZ5M= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d281d1b-d992-44e9-2b62-08db92f32874 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:55:25.7988 (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: eD7BwjIHPfRSFGotQqqyXyZt88/P8mX37Bpl0umUe1YDZFR6s5uw8NvZM1DIs7B98OlyZV0n+Ses1CVnOaBjOcI3r5ZX5yyuXhsAdi2Eqy/RW6KI90PSaGprhnh2h4VF X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: F5UFI2POQYDE47PF7B6G6BMZTDCOQWRW X-Message-ID-Hash: F5UFI2POQYDE47PF7B6G6BMZTDCOQWRW X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:55: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: 13337456 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 E56AEC0015E for ; Wed, 2 Aug 2023 00:59: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 5865C84D; Wed, 2 Aug 2023 02:58:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5865C84D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937970; bh=CA/Y8OcN6rpxKNt7DKcyxbkeY0tzXlWWfJR9oI7bUsM=; 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=OWZuLEvRMiWB8LBgZYdrxLB71XysBe5xDkE1W5LxLNivYxYnXe0wh7J7Y61XB3K5M q7CsM2hRthCKUDdzlUhEHxcXe/oOnjksw+/wmjnKHkv6hVxGe+Se/caHVVHBsKfjMT CVUR0zRCk6NZzauvAxaj8576+fkqGRIoqxOdkrzU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D324AF80607; Wed, 2 Aug 2023 02:55:45 +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 510EEF80606; Wed, 2 Aug 2023 02:55:45 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B2699F80549; Wed, 2 Aug 2023 02:55:42 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 15BB3F802BE for ; Wed, 2 Aug 2023 02:55:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 15BB3F802BE 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=S09FCO4K ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TUS/D0HZcq+VbSACOVGCufzyOvDB9/0EJXL3HXsauwGI1FMyaK11PeYE/Y7yLqn2r8KcRc0TnsG3AwhMvreNOb4OXJZmQB3P185CVu+kCAYqiT26mTyr8NlvcU6P8r5PwA4GirZg7CIev2aKlRnu4kC7rw34nXOvHcroo0WGbasjU4B8Kikq0BHyp2klyJjqDdLpAOTiqFiQ8UZVnk7n1kV/niUr0AtYYE+qW0cjMOIn9I69LlEC9tuVXg8oTfMbEOCJTuZ9ZItHnB7bu58afc5igMyXSbchHKsGG49OOQuQEerSM29TiU8f1LATjWNdJsnX9JYFK0oVCUkOKkenbg== 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=1dLzNzauJRelucMaq6e0/H4LrmZJgqsIkmtTaY9iho0=; b=P6Au6QoqzEzKfBTE4o+Jsh1NLkSn6uFQ9VHWAifuBZ4u1JH/s3uPN294t+fA9dX7ZrZJCdMkd6J/grVAfWfOcLZzLYCDiJQAUw2DqAfgUoUHIJxWiUlBo7pbe2sBP2pWS3PKtQhnrRd5UpdG9A40Lc/JMGPHOAZ1X0c044jstsGkOHHgOI4CyBhUQz9rOMt1jk2Wtgoql1hZ2pcWsz7nRQBKPxxuG65ngdosPBTuzpiboYYB6tjZmfc+hV8/O5imk7zCoqQMdXyTOVvdJTvrW+ryn7NXVxgAw2RBymj0+vk6ZrOWllMM1jfDnGYnSHudhe9LZLT/eSr5uyUk58vKrQ== 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=1dLzNzauJRelucMaq6e0/H4LrmZJgqsIkmtTaY9iho0=; b=S09FCO4KhFeGjKmKSB6UP7uc3RGYiEqdmyErRGRCC5upzjE/AvbAnSB7kJjAV3/uvzTLfqBHPRfcmu2OeUWEnLriHM+KEv55QQB+m6WOWBO91umldTzsWMAzbCi93bGFYUzbQFSJaQ0rL44QcVRxJ98JNCCxGvGOiOagUhM1N1A= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:55:34 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:55:34 +0000 Message-ID: <87cz06tg8q.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 23/38] ASoC: jz4740: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:55:34 +0000 X-ClientProxiedBy: TYCP286CA0172.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::10) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: 3961edb3-10af-4137-3c3a-08db92f32d93 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CysrenRC0d1gOPokczwOaqXuwrkz71CyW5K1o0O703gvW2xz3Wwl+YlN/B+Wb/VUtzp/8GQakPw+LNDkpPkvN6Dbp1Swgr+h8nJ/EV/rL65hUk5/QSahGxwsAsY5hkzJJUslVwqNTeesu3/QZ8z7iHz9DYd59hvS7OluknmMPbjmK/BjXgVk1RagwawOY/PzT4A1v3xU9koG7uC6lDAaBaGXKqHqg5sOcgC8fAWGinNOrC/r5sHZ0fGlIwW9iz8Vc3xGPSB69aoblxEuUXeoFcqEaWgQzsxEPdHslbliKqQ52TfR1uJMTjFTpmIBv9UZBKSzV4s/wCgmwboTYwv6oRs4HA8hDoXQKyXlswyw1l+K9sYraKIi4mcWnvGwckocvtAsHP+EsG7binNOmJitAEBrKqV3XGGtP1wbHlD+qjw+i37xVT1yqaWQZ/V2XgEqXGv+GxB8Jq1JGJDPKeSC7+WxVEKMsclFDJK79j6Gac3r41S7pwNKyF9brHxzMgyyBw3ayGCRIxdQe5swxIJJwN4T08QMPI/CAJpZW4oqQwsp+QQGBiWKQwjKQ5yGZMjEinkfagQwaTtBk3QxnN4XPkplDbeZbuPlEOvIDphjPtLNNw3rWkekrsZMZL16hNx3 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e5hPW6rXHkrTUxW75Mf+qgZ8MtBNeMCRgLIHmyW/zwlMDN8PoGKTc9hEqcnxXyn6uvzrQVE3IqpHRDznP8o7pu6HbfnQqCFVc8hpCe9mTCa9pd52F7InThzBu/59AFU8wJeQD4sYkfnzkcS0j4nGm7LRrjFfZJmAG3TTetBHOjxYxxbQ2LQQAMGlUX3cwJ8TDpqYzu+RpnAgnEaZ9oP2a5Z24O0RzwrNEkdnCzzNEzL/+iZQuQwsVcPXDlmy/C53cjFChpsD69Ug/bih0ovIkHAiRlSG6jVXjURVmGn2tTwMwzqCIb6o9FYu67pw6YeOPgzacxCcdGDeREruZknilZVYKzKdFzXxXwzWUIiILc5g45K0HXC46DmwFKm6t+glYI8ygbCSPiTeucAfgRCzYSJCDzElzSruqixTxRmrB4Ymr9GnvKa0ncOWrEdcuFKwdj1/Chu2aWe11gusEetl03ijiu5Yusrb0qTpaa7gEdcDmnGy9k81HNjDR4zOJyjnzXko11wwTd8QFOHvjtTnb/kgFKBJ05wwlcGnnZlQRavVxbqRP8xuIobZCDRRQMiJ9ve5gD4HLoUCCqSntH73OVJq+FTux+sXupUWk9mZ+GxzjN9J5Efz+FfzlmJ7x5qqDINwhq38+93SdH1ePFwWB2RAuvP86muTidGbFMZblfWt6Es29mhnOO2KC1ymqjCz0n8p0xxFob/vzTx0oIrh/9XrwDVt4MoSnkkKAxgsfuvG4uiE7+9mq2s0oPjUow/FCl9ZlFe+aAWhIx1V1gN/ZoBbGPdhCiGVP0vI6FQYHjfkl1/zpseXfVmSOa5IjMHFGw3CSFH58fqU/eAxDdXj0aUl29Eeyg1v0R90wPIZV7XykUsSfi7JtVFwA/JOST2mm0SwlzL3Xf8t28UYibvL5RsnnBYJulz5d07UEkE6XMsgZdqYWtAAlL+i0nuMDa2/+EqtNcRvaHo2qwm7+LBYLa0F/jKECjBFTRaxi8cBNyGRlxCvUXUk6ojX7xMbIFBG3/dcmTLM+O3rGMz54t2cicTEjvMXbNdK1NmJzEZdczjQxhvJQ6SIAIIBkdcbfQW/9W32ddxlExrbmT7q9lGMSJ9cx5w1jY11YJvGJ/M0f/sBKXagmN7EvG1+HWtXInFZ8/Q09KFMOkNRposdKRWIviU/LQ34epLH2XCbt2CyvuoW2Ip6dpvuAE8U+lepy0EcAPAD82D65GjnYssEhxC6mhXwf+gTObLH9nKHdVkqRVh0p4yZs0oCES05EnQjwm7m1JfsNPAeMdEuQ/AlQysK0HBLeAdL7VGObbFUzKRZVP6/61/xt9NsttF6C2LpHGalcLjnmsfDgMkN7ixlIK0mXpCi62Bg5xm5JWJcvCzYPU+6xsIjWDPguRShF4kVtVxJL+af+Y1Hgh0UKbN6cxWOrRT0D3dfW0BUONw3uXzYKT0v5jbzdEYYdr6SJAbp3+sLdlFxurJYwrIC93zQUdPaEyNM5i6xqX6aa5425k+uYBms2x5Coqf8qlZaAnUf1pP39aSNU6J9OGhUo3sMcX2zcWDvfW8+9DCaTe9rbycWKAJnylNI1KUDurSJERM4W1HHrC/tTfSdzA8NratHGv9xkn/YScVu4bdd3sD7zRKmns0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3961edb3-10af-4137-3c3a-08db92f32d93 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:55:34.3192 (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: KfF3r3h782gZ1/5qxm4Vs+GLzqI3g/vcmP+j/k7mzGxUrfZ8zfbAXImTyzslX/moNrT6kQ8akwrZxp3sQ5duTTJ6OFPH5UMAKrYcfXaz+Q4cZvpvlHAZtsQck+FMF3d7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: Y3NOQAEBAOTLPBTEIH64Q6R2BWAYQXCD X-Message-ID-Hash: Y3NOQAEBAOTLPBTEIH64Q6R2BWAYQXCD X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:55:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337457 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 81729EB64DD for ; Wed, 2 Aug 2023 01:00:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E305E823; Wed, 2 Aug 2023 02:59:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E305E823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690937999; bh=7FPMac2Bbsym8ZD6vK8cSe6C1gmdnCd6gzEJ+HgyT58=; 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=R15Jjorx4jMSotRq3Vp9+IDOMc1sSLxCs2GXsqUcBjzjBiyBvinc+/nXEmS8zYS9d ysIRoFyhMUPAl64fUA0WNE0VoMivr0RXbIj4kuEDvrzrwnUYbKQBr0R3DT2oxEhIVu Pu2Ps2TiUUMehofFqBZZTS/k2eNpEyIwnk/Y2keI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E1E67F80614; Wed, 2 Aug 2023 02:55:51 +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 AA3ACF80608; Wed, 2 Aug 2023 02:55:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 757C5F8060F; Wed, 2 Aug 2023 02:55:47 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20716.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 BAAF4F80608 for ; Wed, 2 Aug 2023 02:55:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BAAF4F80608 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=cTO6xezC ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a986aAw10sfmwRswuFdqikbzv5ME7yFOopPDXgqqhKyS9DFDK1NecDZwt/jQn9lGFgMWd4cCaAM04zEu9KaPq1BjaeAHl/SO6q8fpiraE/7zb4AvqEpvD3qvyTj8AJAbCN4+Dt9pYI/2pVFUnpeG/DPsl0HlMRrsisZknX3u5tdwHwJgOzzvOkEEW8KRJIjfTPbapWIfU6Q4S2sMuVdjJqxpj4XrxrvPT5zOIPm4k+8VisHe09dA/ZQn4O9UtQgQLgaoHjBaZJGBJ3hjK+LAZnLMuxpQggvloDgx+pWUiAo7Linc9CklGL9xMmMgDIBXmm9L6oxd8QgNgSIQ9Xv36Q== 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=G9lt0t4H3slQDmuUYV4/CiZU97sPeSEz2mtSgkWlo4g=; b=QRwQY37oy/x+UvOgis+XZssLtgx4Q0fM/Em1QXr5YjK8J46Gp8gXHvoI+YK4wN/oB2JqlD5G7ofU9HTCTZoQctS7/S1M2L+2vrKBsSuX9aBzynVQYfXRxx5E3/hA/8bswg3OCn5lCAF0o9id9PdnmEne26FLy4VYnKKUHPLIwiaFFewJnbt4vgUGE//VfqYGFWihepTshNlNHD8sw/iAMo+oy+JkZ8ki8DzXLlEp5cEZC2DGf/inlqoUEuzIYh6B3n/EAtHY4Ppz/NYkXOpHYyeXYAtt3jLF3BEETn7UqrXlIf4VFVUfAZyH3AftkPPTdIxHqtPGlc4jsszTsF+tsA== 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=G9lt0t4H3slQDmuUYV4/CiZU97sPeSEz2mtSgkWlo4g=; b=cTO6xezCBbhojKJjrKn2zAxOVfk3GP4E0dBWlwJRRgmKSuJlLXnsS1pQJ+359VmAExzQ16u2DGcDW3F6AFOZePwZONpUuF8sPWEZZ0c54US5I0Cn1E5QWdC5ucObtnsse9lML2hGe4b9mEtWjPwOJx207T76g3p3mgxLK+cMYzE= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:55: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.6631.045; Wed, 2 Aug 2023 00:55:41 +0000 Message-ID: <87bkfqtg8j.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 24/38] ASoC: cirrus: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:55:40 +0000 X-ClientProxiedBy: TYCP286CA0124.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: f776041c-7190-4264-8a84-08db92f331c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9QvnMiQ3/KNRQIpcGzAiSLo+hJYmAJm4rRWeZZwV39VZpmeh77qsD2dYMZgh6o8UcuwBK0lELcXNCdLR9YEvZv1t/YKH30Le7t+5BQ8AYsTaSr/bC5o7kpGqXEdcfj9zNdJVuZjEAnYiOa4iU+C6fzkf2EZKfeM+3iVfMQ0CPfoWgJxvm8iZ2gjW8hgiDcWdxruz9oMEsBxHjwK9y6PeosetRB4OVQeQX17irSJ+arL1g3geY+PJn2/ZWkvy/pvigc5wJkJ4KO/8BCBq/fkJCOL0bpe0l9ISNZg2GrCvTHWAo+9PxwIcHeVIQ3R7ZSe+Vytqm/i3WGJdDijAY8Cm921f/LEpqMmynVWDXx8fLLd4cvPvlox8to4FwejTikIFBAbuMKbyw7nCYAaA1vYI4QMpbWA8UVT3FQA7wlH66B00jaNoCnw2Nbppj/pJvTsnFZbD7Ng7u5Au+P81FCPvAp7ZdZIfysqj+F6SH9MHQxWa1Fa0vA4G7PO9JhcCqYmYSZUfILQKEFM4Z+ko2YZjb7jlP9dAYQIc2yN0VoKA0ldNzoa5mttNNSNkEhyrEnEGT8mHDyoBwGKgwf+O38DWHR7AyyZZxtFznJ4M2YQUq1buT5si8CHQz8uldD7mQMrk 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(4744005)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YKsVqMKRvJSLu543T5hPvglgieJVr3nmZfEK/VBET48toPGmTqpSM7H2EXEMpStFPqvFRnw0PP1OaG3xYKiMRQdN3PWSQzyX/k5x8KMH4Fil2uP0frxgwRTZgBwC3G53daj69FZhT8A7MOuzlCxBafc+fab9it1EfUhW2GBNJHO4xd7DagSx01VV9TGrjh4Y7xfCyS3KzxIIbvPymX+2raV4xPlewINrQFaLk4w9NP+ADC1GuN5We1a5mcgvz+ncjvaoinXzuD2lt2gsj9z4vBw+eR2wEL+EX3ave/rUhq8t5QYCHccg9zVbgdcQMiHbkf297pdD4bMId3dfySGUjyV2G4LzRGji2TjjudQOUwFy5gMMTqFrzxYCElituW9mOfyvc/DYNgU+8iwWKbaYqSjcjnj6H5uhd1hPSk23Oi/EXskecPjUevaIoMfvi8yFoyqdlD3y4BOW9BoxsA2YVIItshKS4MsjqSiBjMOR1TDXFX/1Re7Q4NtHRAK/asU+jP2u+XuOM2ISIGnPdZvTRdNrwF1oc0uzyJXvNkyGJM0IgazBILSojV0fSext2Hy2YaWZvXQo4yCnrS4awXo8+PgudUo8hl67nOM9BW/54oiG5Tc5g5DFXMqP/0hGFLYryTYluc5j4li4+V7F6Pn0laIWZ1CkTZDpf3xB4McmZn1NdHHuc+DDb98xd0zvm9u9OP6Rdo5E2YuuqwzYANUBNDilSh6QRGD2g9h/OrmOoquSITGSnmh1iBNiLyCzGSAmkJnEp0+jtqexH80oyK+GpH7sYL/2XWiiwQN0PMGexwUI6FrsDwb0nCkuTziwxnUn7BTvelDmqIiq5MaPGI2atxT8d3m6P8VeKKRkLu4SuJ9qMS6CjidV3tqHi1pnSV7mhZNJmQebhwir5+NcVqGdvi2Kk8qq4w0jKRT61yAferIu/aHanHe6M8fCI31xkF3WdpPTgHq9DCLVxlGKaAVHB7/1hcV25YwQUOwG0GHPRysPF7tnhyHvcb3mnBDhAoJZXnycVQuymkGxXkGTvF5rrOYN17PL+tzZWCJNWZfgGpc3lwummSVPEsVW0u12Jmt+SXc6aaRTA8CAbF6BNGKkoVWMWwnnb0Q/vkqqP6oVDB/rVYsLd64T0kccAi0KBsxmLFVmAmxdkCmRvkwbdQbPhI638A+txnHN6lpOb0e1V9SrlCLra/oPrMpcwBqL0Ch2m394eq6OJmLCZw5yiN8ebK2JSwoq6vjm+K8t2vjJMm0OtjGEMbhTXJoxamk4mi8aSknVNlpXg0X76ga7l1ZqJy8ThlkL4KjaIdA0fo78liEyuR6hKUfcAcAxDkp+HpuA2kA1jvoVaY4V4bafqzbHPSlguMl2BozHe6lPmNZTGoCZM9HcAfPWHs3k3pLm9FgxJhSIlLI+UKHbFpk5X03fzF15eK0VRwbYQPq6IlHTFWi9LLICk3aRyHpspxJRcmQVovBhoLcFeL1XHN8GmrPcLC/Vc7KTKv79NTSJIxq88Yn9TLUgV3Vppc4OLe9K982uOv2DaRHf7niEXuG3GWkkoWfgaDUJWS/mPFVSdv8qSRi3rWU6J3k7XcYOLbKtqzL6JuuJwo+YFEDMOsTwx7i+JXfsmMRRNR3XlUKD7iAlV1U= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f776041c-7190-4264-8a84-08db92f331c1 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:55:41.3767 (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: pfnLdUmKPVOwvhi+p76zITTKwuRMWFBzPWo4hw3DXCAkJu0OYB/7TISeNDOWMHPUtS/Rf0mS6cj6v+jPgoirxFHiT7NaQRL/4q3JmQpqQoincHVDzsvx+ub45gRqjZGg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: YHFRQBR46BQFHD55ZCF757M5LFWZIXIB X-Message-ID-Hash: YHFRQBR46BQFHD55ZCF757M5LFWZIXIB X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto 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 Wed Aug 2 00: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: 13337458 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 5CA64EB64DD for ; Wed, 2 Aug 2023 01:00:32 +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 30277827; Wed, 2 Aug 2023 02:59:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 30277827 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938030; bh=gwXVxUdKcJNcMA11McE51xMf9y/2uDYOoHApZAW9e9k=; 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=Qx95EO7cJkLSfLpwMWK/NHg6t0ntgIUyr2kTX075VHkzGiAldMLpvn/3S81Goy97j 8CjpMpP3fi/eXtrBz8UXBIKzrzsaSDS2u4cEKqM0pjA0gU2dXP2gn83DcopRhsEZne 0p8vrruL/c07oQWpnc08vni1Twaofdw/Pu+NFzDw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 55895F805AA; Wed, 2 Aug 2023 02:56:41 +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 8764DF805E2; Wed, 2 Aug 2023 02:56:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B142FF805D7; Wed, 2 Aug 2023 02:56:36 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20725.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::725]) (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 944A5F805AA for ; Wed, 2 Aug 2023 02:56:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 944A5F805AA 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=nvaK7rIj ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eJu1+3pR+5GUN9OOoSxd4Vlk9HZvAlhHd7lkiFkkaZkI2J1PBycpvFacsQm2pnZMee8mHRNlwEoZtNCnTjXnqijqd4SOGJMxL6wqZn216VzMjOPzhf+5/ij7ATpfvnv4xLAW11s82dugBkM7VFYahq4epMz38iU0uL+0b3qWgF91L8U7H+ENJkWZy7rgSDstCiYqT3DduDuXfoTFBjK23LBJsIb0G+tqH+V7jdf6Sur/xj//DuBbhsKcb6bx1bheT7Z/1doXxIv/KiEtN8zcetb+XreAS20UhZ9J9166mxCp5gtqkA7P6hhc8ZkDpMW1GV/5tG+mKH5cKvAxxPR72w== 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=cwcKjdaN3u99lDr0FtGzXA+mKT/TnWiCxBDq7YJxhtA=; b=K6J5eQigZ2Qjq9ypGRpZVNvkqRN+I7cyTtmzpvE2qI7nb1IUI/Mevd6FocLbV9duUHmkBTD7V84LZXAdkbnEZSrnPEnUGAZbSc7c5ju3F/IUDplXjb1IkN+Gi0Wtcodi5HbINX0EYdB0goXiQc9rE2AI88fkvbthPGc0lWHVSEDN0TNlL1JQqnAjuT8Jc1/gn7FBWm2IaLKp1tES7Kl7z6kfMWHDYF+R30FptI4hJWcdGsQIOOXR0IU01430w1dQoHn9ulMZhXNJhWJMkH0qXMcc5ajeC5q0ZTnceTazwBpKZy58FZ0LneVcakrhytSh4m17nJG/hE35O8RHaUAGqQ== 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=cwcKjdaN3u99lDr0FtGzXA+mKT/TnWiCxBDq7YJxhtA=; b=nvaK7rIj4k3bWaWSCsb+KThyt97f5le5qYrNAihRPwCwuJGsBHJ1QegylBUW/UMZNz8JBOFaMZJFvcf4iPrnwo3y/YSXylDna2XzGLNcV0gVzoqfFwyuS/fAY1HqxvJQ0eIZLAiZbvCQPqCSVpqqDWHdS47l9JA/MBvSUy+H3OY= 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 TYWPR01MB8348.jpnprd01.prod.outlook.com (2603:1096:400:177::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:56: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.6631.045; Wed, 2 Aug 2023 00:56:29 +0000 Message-ID: <87a5vatg78.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown , Emma Anholt , David Airlie , Daniel Vetter Cc: Linux-ALSA Subject: [PATCH 25/38] 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: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:56:28 +0000 X-ClientProxiedBy: TY2PR02CA0004.apcprd02.prod.outlook.com (2603:1096:404:56::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_|TYWPR01MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: 155c02c9-88ee-4885-a26b-08db92f34de7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dlqm5OUyfjZnw/9bYAq/5wu0/tsQyJLRqmJKc6XloZHMClM8PleeNWl/pXYsHhAASnWovaYH+5VO0mYcOjlKRD3CYxDjmY5ZptbMpYaukfm/i561JUaRuh2Ay5v0Vryosufohn2gGCkiZzMP5OpJZtw5d6KGvlqj9tpYqEZshSYH7Fnq7i7r+4k+9wQ/g5yD+LBMarnlTCotv8hcKNLZfmQSf8QQSR7CPZ90klaXKMWBaOe/mcG8yOPchcDwXMWjW3eBag0AyQtFj5k5EQaJgll0ppaF3iqNqrr0wOSWvBQDbJI0MzLuEC3urWCT9IGRLO4WlgnKv1MdL05EhLbnCa0I0SyO8IyyxNRauyYrwmoAS0bATMNngwKqa4DZ09xSfuCu5uE8Gbhh+nIvYQpjGXNCiBJiGZavQXkDH98RtUl5jj5jWUskBEkxhBY3WYdfIKcq4u77qSouQP2x4rkxd6mTDy6nTJRLp5gyqTsq34XsZctWzXq5NcZRKZA5jEozwBisAa/52qowiiR1wxIE5U5P2NwPIZ+2e3kJN8zovUz/iVxw1TJ19zA7OyLUBTqeNGXnWwsIS3um/eCmUz4HAZm4/bAyUMeAeyUzS7jWJg5jMl2HgmreznSWZRqYyGoI 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(4744005)(5660300002)(8936002)(8676002)(41300700001)(316002)(4326008)(66476007)(66556008)(66946007)(2906002)(26005)(6506007)(38100700002)(2616005)(110136005)(83380400001)(6512007)(86362001)(6486002)(52116002)(38350700002)(36756003)(478600001)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jSLXI3P3VfAo84cpLK7oTNBksrWvdssRBnF283kAEA7IR3N5vOPgIVmzsvJbZ2A9wD8n3ccQ0yv3Ux82O66oR45HZjzf0zma+PKbdGneIS3jPcqmq3mCgzvC3o4NQLq6FHKlTL0gkagQh+wurwywcjiNEUI1XJHExGPB/ERkHyoyBCg6aa2Xl3jcUxH8D1mLzxHA85ZZlRPv06kLdloxIlrrdyEEsDWrguM955Hv5GLlVoxP+9h8Y5I2sd9060SxvBH4El26aSmDssxKx9rQd+dZcg0/0+FYzHbVO8DCJvKS7Uc157h0t2Aj31m2eBeraE+I9EKyYLu8b6f+fuUqGal0MgKa1RlRryNk0yLrl4ovxd31QA75SCjDGj/BC/Zux6yyZbk9Kbb5SoYBCSdhm5G8NbSLU8pQ8BIdS9su5Ote13ZO6mrvRm/wO5uHGy1xbY0Alv48cjaau0Hn3GCiNBtS6w3Ka/BRMAZ1tmdWwnvOYpqnNrzYDdHmkCkW9RIdS6/s8eex+IFnZPjQACw8g1DUQA/P6F7qNJx3D94BBwL8azP2fdOH2CbPbp1VgN44GHvJWM/Mppkh9h5r+dqQQbQHEkrx5eQLWFe3RaWCO2fWI6sp/wnGZ1bYRHU2o8qJV8MFMnXsc8g33lb7JolFoJEDWQQqF/i66HFDRSTZ2D/v8LJ++JsAewuQFP6GvnuKJPlJ9G4tPmaQd1O5HfqHz+VAH+n+b/pc5O65bZBUKdx6rCUbZkvRrAAd5wxPSzE2u6r9uoDiHm0nge7yvDTDeFEyiupxBQqSWDFsHLgZNL2370+MxNANd0UvZLCPt/QT7MEgZMGC92GJ7WRXJsgxpIQQumYhhZ4DlAU2jVRG0Z6B2BysP7GnKTsIGswjM2nSCRNVBVPkXr4m2AC097uDw97u9AJnMTFbMm/EKUUVacbdqTYKRADPwz+Iz/CbBGK5/4v+nTunlBeyaEyksozL4nMC0Hj1zqgHe4zhrwexAaIPTTTC2ngSiVQu6wVqigeaTET6CSkxdQyrAEtUUxN6m6XrvtIQE5OxJoFvgD/GxP9EEUo7Qn4akPfriDAgUEo3Ij4Q/Q+SAs99CUfWZSU8wvH6R9VCQAq0fEEt7HiKAo7D2zS4a/mOnD7vPu2LmeLfUzuxDd/jkgDHq4hXgKwlklXn6H2XaVCMSU/1c/EIiVpoLBFSiHX3pUmVrLTqjntXKJmZwyrhGCPmiGrJ2zNWdVDCHSbqw3TEws4j3dFitVzLDzq/U9k6XoJCG0/LXE9jg5LmibaJ65UHIZlmbt01kDFepxz7+8OwbjXiCUw/8IkPKbLqWvqCwHy0II8hFGqTLAfmOaJDgK54kSXTBoMltvK3oOx57hxzJ+En4ryXz09XBsWMl0brV82L6s6wkVzEMNGN17y2OLYRHlTP8HxTgnFQg3uab0oMjgqr2ydF1pG+G3c0eQ/UmZZFMVg17O+dOcj3m/JUoZtOiP8XeU1rdL7Nqud3cpGtrla9carOfg3DO0qDPxnbMRyPghNcMv0QKlBU75xfK0hn7+sgtz/DAIpnfAcrFHJXYWCnZfwMZ6Wp//ZG0Ni+hdBACDUxhGQs5ftW4MpV5FdOqobaxgqH69CRXtV91Ab5UYa5zLyqork= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 155c02c9-88ee-4885-a26b-08db92f34de7 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:56:29.3426 (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: 0V7RZNhS8SacQ22Ip4IaJtSOLH/U60LjZnmqu8wXbCQlKxYpIIuZUnXU6t6pHeZugIDWORhSSwVs/0EgRunxRg9oh+/O1X2N4wl9eheSUVrxh0MK1u9zpAmWfoP5Ss/9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8348 Message-ID-Hash: LYXDPNCFDIK6HYMZFL7VWCETMV42M423 X-Message-ID-Hash: LYXDPNCFDIK6HYMZFL7VWCETMV42M423 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- 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 Wed Aug 2 00:56:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337459 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 58769C0015E for ; Wed, 2 Aug 2023 01: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 70D3F950; Wed, 2 Aug 2023 02:59:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 70D3F950 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938049; bh=z9r330xFjBOxtKFIuYSrv5JOeU2K1COzYNgUm3MQuWM=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rYFcSd11iyzDAFaVOs3E7AGqfpNxk8KcOctQHPNZzT6wUAVF5sEaqUk/t8mI+aKUg Y5oAmhS+UGmoZUu7UNochZ/dyQ2/a1dhu/AVGY2mgwd4oFb6BrTAabb1NPyTdxyO90 1+or5yvQk1CHzLsIjJkp3mkU0A50ztPa41u1xiFs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 552E1F8053B; Wed, 2 Aug 2023 02:56:51 +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 B8FAAF80636; Wed, 2 Aug 2023 02:56:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7CFBDF80631; Wed, 2 Aug 2023 02:56:46 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 CE07DF8062E for ; Wed, 2 Aug 2023 02:56:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CE07DF8062E 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=kyY5y40A ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GWFL1c34QONTYZd4ocOiNdX3911FRywdxrqwZTbseZHzT9hBQZrbK4QWUCHHuCRvcoHsHOjAIcLdSIpnOcQxO1CoNVwHgIVhx9kenYpFyYISPgl59HQ0cKUdB2dgREluD2ZsBKq2wUqFFEh/rnyfEJ9zkEdKe8GAzIoua54VkOero+Ux3YL6R4MBFsJcASs5shEg42HsQq/E4yT9mBcF6kJ+4RoK9S4zq8/n5udklu6Sq7VrGNFNUin5dc09ZPIBMI1GNJU4io9q6c2TegRkVxaCQlPN2+lu6/XWp9eVfcqoVCk4m8EDMX+13DhCyHbCLuzy4BSR/FIm/eUxfpUh8g== 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=ydmZ/P1vKnABLLAxksIh2R5k9rL2ZzeMrA7Fv13c6zA=; b=AT4fCOKgJY8QnzqNDDoHtXJBkgWNshG2u8E+IS+dDI0JpOII+YbbI155RLgVPhBTTM5SXaS84VUI32NSjMC2JUfN1A5OPX4OvXt7scOlzz/Cj8XTF/C5EX+5FIC/k7yeEhVQgnePPfGBcbYIfQEqAqmCiRzOLVPpQp3cxEFH0WQeiHVdzQY1kkI5S8Ft/wsDDRVkTXBWLtRDK5tPFywRTsFu0RPquVtFs1fqdUynKCcJsrxo0VauOnbOtsOjvZ5d6eaaiKzLj3rhTJa0W7Fq1P1R29AJw+M0LlEcTQRK1yAd6ZeDhshSRc06HZ5ycORBYQ5KDNCKbwIj7XD2wTsECA== 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=ydmZ/P1vKnABLLAxksIh2R5k9rL2ZzeMrA7Fv13c6zA=; b=kyY5y40AHYSHagWKGyMeLwjv7Tj3zsiXnBdTb1I5tus8aVOJ44HdHKmW6UMF5f6/iX4g+HJRlJJm3MSo45IT1Wonn9yl3xrVA1YaG3erfLcjHyvokJr1nD3cJvVL70loeqMchrnk6yC6v75CRKeA3AlUg3KdX0o2qoIVhpEmfdU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:56:40 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:56:40 +0000 Message-ID: <878rautg6w.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Padmanabhan Rajanbabu , Sylwester Nawrocki , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 26/38] ASoC: samsung: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:56:40 +0000 X-ClientProxiedBy: TYAPR01CA0107.jpnprd01.prod.outlook.com (2603:1096:404:2a::23) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: 79d564cb-56e3-4c39-f99e-08db92f3550b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FqmscHYnvlZ3VUS6cKYvKQOvRhJsLNstQnIbYzecoWEnEDCxGuNrgJwBL96OqJWcCfwlsQ/YGgKmwvJILRyEa8OfLGrXPf4V7JgdoChY+6TzVKlYb/f72Yn+XOysUdssqvzsSBW+vwBGgKvSAECTuyz54vm2jesgNVgeX89vuBIkEvL0dCC6DUvxr5MRgJGXqwjeTX0erqju34NyhButx79EbqirW9lj4/2razLzmuqN6FoewSicWmQcRBIAiNm+qpwBC22tF4+cwHjm/NQiCpcHp+tE4JozRQDXGaT+Opw/zeSEeyGenkChHJstm2ZOeqep30jdqmSyENrfJOWloBZOMcxl6mnF8+T/+xwYrV6KVR2ZYhxo4kS5mRW7cWNG138acKqZ5i/Ghlxvd3xKvesPY9ss+SzGlXUV/zb8ink+2MmDpMLQOtYjxYTqi9ICSEHPlxg/P4NfTTJmavPmyroozhWwA8ZaEcVhTpygwknBvcVHkaRz6cJeqCuUUA+mJb++vN7r88/2VxXYeXpi7z3bF8uetHhCdLa5D1gIPKPbLuQIK30WDc/oIGgEQYiRinqn5UFZeXe0d5hYHX0VU3sI/so37IwZCxR1A+iopvbxbW3LebYzBpYEwUnWOo9n X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h/0B5xx3Wty4lPJ5n+hLwMpEJaOxN0fG0FA9ZR+TdhTSIhIvzw8cB35KhojT7DkI7MP02ogBV6fUwIu3nmPheM18KP/mAamNBOd9XDoxcxUoJk00Ksxj3PMZMt+E9EA20U/XB4vtkUfcydHJN5G8Qdfnz549gPp1Z7Gq7msEuEW6gBLThw8mpCxcjkYRS3Ct32/eyVjP8SqddrrYDy193/RWE0S/n/UeTH1V/T9lYdp4VqZBAJJlk1Lhghx+YXXQ6PZkcICYeubvOrqVQEBko4ppGy6O09yK+6Vc+yu8+Zx0HYUODsbX/a898sgYgKkIiaCC9yuwq1050PgJz2D+y3tmSzgAZh/XnRBvGTqfJDC9TJzGGAQXTBLstb1WPjlBNbMg9xzida51vn3eoaV8QRAd13Pyg+HZBm3ZxQWGlMLX0iBqMZ/Nfxhjsnvl+bU2IZzbotISyfnMU9lQvWRjoGz042sbi36+t74fbprBXf1OTa5ElPwLJthkRlFQ0pfCDzCxJjjjA7eLyh8otzpx6XZftqAAw8+LKMdFa2UvAVYgq8zt/HtV8KqIa2DNajgTH1YGuwZNiMK8vww3pQSc9THibQWBtGPaH0GGqjTjyFF1GqY6blqZh1BDjveQktxcyCUZqs+ZK2faarlTU65djkTttXMaBkMoG8/bFBn/GrSRZ2V5mmCpNDG8pvhoHD3CSuK+DMNGFSyCQ7r6CDpNdnyCVyR41wUzuqY5Hb/raLSiBOWVVXNYw3DzRCny20xoXtXj/6O/kiws1VaV0OZF4FBOmcb2ydzqnU/Pl6Hd45CNUzWVLR99Tscb1sgCt6rG5Rda2/XepF4PYNZKghxGwPcUuwYqyIvqqFc1q8Zf9XIpNqqMiwAeMhh+ic2BObLyOv7rfL35pr81AFuaOw2bM4KmwnVnn7f03nxRrvxs21dzrl01W+ges6bUt/v61wUlzGse2soIpJZ2v43cl2+9LgM3VoQf/WNkTgF+EswbfcfKtvsBWJv6CLhfXT9pBgws4KD4RAxCQ9OdVvMfH7HdRFOakFYXgZ6rP6bOAsLfaeKwVhZ2DKipVeX6V0yxVXmuLWzk7reJVwuXq6eS7/cwPHv13p/3saCVnYmh4qy0DRyA+XPEQJU1dZOvbVI0k5ynXey3GBgW/QaiUMKieHI5l/nO1rOIb6KlUo8WWZKc6ZZBHJw1FHxYiZy/qhMYzqIXEA2CFb5o/j+FYNwzBvSC/PoCY/43u7PMBcbnhRRSe0QMBLqXEpghDo+xZ3Qzf6p0ozYIDGxDMR+u6IYAmDmJJHh1g9U7ir+3BSK5qQVr3Si8KINtDgv9FoTw1VF+jMyoIs5DNn3UB1e7siou9BSh3ysdstfez/HY4Fgqsti3vC5hn2g8ynQ63bGTiFpY2KuNhRaUgc8iwsVdtZezVa0UOyti6nZ/abORhS3U5PlOnNPjvo6Pi3zVZykSLYMXAc0/VSFmGrLqSl7EYBL6ibeABcbp67yAq/duFS1CluaxhskzJPW+c9SvpOnpF/yyXSwLqJ5qhzlU+1YnKrOqsKTd5ZPQfxyxAccCy3MbckOAUnI4RFb78IZTq8RHCtnBHJdLHIN/LRuMdqDLESQ2XJLu/IMBlhMtOXTJIJV31LAEGBw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79d564cb-56e3-4c39-f99e-08db92f3550b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:56:40.5503 (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: pakr95EYzPgVnkX/PofIbzSJHJ2JRM4D2gE0WntTQY46v1o2rqz9/G3pPm8S1ByOXvcH4f9KTEJPXA4y5lr8bkWjOSftNgvWm/ploDtkbL1U6f11mXGQ8fSrRlanr61u X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: EOK3VMXX2FWYJGMYPUEO2VKB7IFOLJKW X-Message-ID-Hash: EOK3VMXX2FWYJGMYPUEO2VKB7IFOLJKW X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:56: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: 13337460 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 B5B9EEB64DD for ; Wed, 2 Aug 2023 01:01: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 8E3CA820; Wed, 2 Aug 2023 03:00:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8E3CA820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938071; bh=eotOy8HB3kgdWjjotZ8Xwtl+a8vaS+K4CgTCS/NPes8=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=nrvhXshQpKLAaknhdho0vlUCWegj08Dipebtyt9Ar7aUTogyul6ZELpEtXya/uJ7X SQG+GMdho63qNbdPsPL4x8PTskRxBU5mqQH6j29GIy18ozNretwU5T6zVBk8RDcIXx zoYMT23SIvVagX/PmI+vEFIaotl3ZCO+T+9OyRMs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 18BD2F805E8; Wed, 2 Aug 2023 02:57: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 6A02EF80553; Wed, 2 Aug 2023 02:57:04 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DDDE8F805DF; Wed, 2 Aug 2023 02:56:59 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20706.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::706]) (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 5D78AF80553 for ; Wed, 2 Aug 2023 02:56:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5D78AF80553 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=dcvnxMnf ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bRLs834kE76NTIDd53XSASyF2FinqfeKTPo/zXPOWrSBEv6IP86r6P1/LV0QMKfgyw8OFKM965/bQHBJiaZasUI0q66Q2Up/3N1w7UHtFCm9rRjO/YiztCUjAiJUI3Je4jmvzqw9iq/Gr1uLABgmwL1KuGO7aR/DHVwWrK5KxcbdqpVddDI9gFZ1HC5AqcmfpOC2c2cMuwYLWhTIAstqC+Zj4oYmCJT/iJceFGGCpJhXmsKgya/hRuvXAXpJKByyZHn3GW6srCrwo9e1ZyJfhAM0jHg6t0zPfSDCGwdPZ0dACd+1OQiKff/etNwuwRU7m5v5aoTWOg7b09hpiT5J0g== 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=yCGZniOyUBCOv/d9HheAVZ3MVwUET3UD3t0K6zlC1MU=; b=gb4cvawhhn+Gjk9vcGNMG8yvxAn0/chqzx8X1eP3eAaI8dtYxJY6LS8FG1uBfo0MFfxvylI9jzQnq09dpVloaUg0AM2+2gezUAS8vAdWqgEjR1QAPqP5U8h2c0MM/H7GR+HBJ8qpZeBgtNz/gxhNZ2m9uWZ5i+AX+L9Z6jCY6o/fTS+yT+An0A9VwZZyznLdGhf/SHv0afnX6cSrDPUD5Ixsim/zMKz5kb9QQwpd7N0rBsGL5qA+ASO4ZUt1QWqgyCI99lwESc0lZnUMRz81wi+SEc4Iei0yhTdxgfY80mtyQualumO/OCSyP7zaisF2gAP/JucBFGtCIpHYLnZiwg== 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=yCGZniOyUBCOv/d9HheAVZ3MVwUET3UD3t0K6zlC1MU=; b=dcvnxMnf6DlE+yjH//Ls+Z5bRvpeRxjs8LUTA87Gg1nqBMkw5OvfdWDxqOytMg+p5VcqmnxxVJN5PfKDoN5pcnCkzFZVQ+3dAoA6OIJStV8TSs6INWEP7TFKoXjK41aSsCiqznuXfA+oGWUg+ST/J8PlrUpA/lJGImCHdLmvEqM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:56:51 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:56:51 +0000 Message-ID: <877cqetg6l.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 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 27/38] ASoC: mediatek: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:56:50 +0000 X-ClientProxiedBy: TYCP286CA0117.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b19effb-1e7e-40b0-1753-08db92f35b49 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QVVhwqhCD+pXRR5c4iPNFklQ8ToMo6DwaILr6Npiry8ttQ99BpDJ8UwYRzTGllVkv6EturEtkGj6lT/RSAlB0utSEzWWzgfIEUx69KQMbjF8xgop96odV8QNQ9+Q58xkvIGjCy7aB1hc628v4POnGrtdoUTjzn4vm+vIY5xGl8yJR+uA8aHoFKSVbeJZDr3XScA+7BdX/6kV7rPucpTL30J3jN6UXTOjaRQ8WyQ6hvmVliDd3bmX5mC/d7UQF/d5mgRtiZsr8Pi3sbGIeyzlCQCuPrpJ/LmYwkArNZ+JcZzvy4sVm6Ct2kwQRvHlqMzPR96owHUqV9bjPH1VSakMWO84G8zqafkHxb4EHzx2wqqMfVufhUlHaagbC/tQV2ztTJyW+4n4xk12JeFsPyAVipWq3Zfm1bxDbI4Br+vr9086inPvrwppNYj55yhBXebCwIQTD7sejXAnBlk2TVjdO8EC1GR69EC2/VBsn+tYi7RP33Ma3Q/IAZZoNCUosdmUer4GyJY7wM2qqQcjcGhomYjPZ5NR2dVxs/RyBwMxa6O52puJTONjqEiRhE8wRXjOfhuILANzrILKVZdwdjkX0u8//nJihGUwEwhmbYzANlU3iGj7BfZuqzWkeKUH4qAe X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2iFu0CNvU2TLIL+kdh4FjBaogaWNASBjKc9PDHzMtxJ106Be6ZCrcpIGxMZ00IP3YntMutNaqdJvS8U5XDuVcjU/FOa1KYYOpIaqprvCcmiq5oQGnlljypn2zy3FuTM6ZlUCa770gipCdKfJBzlLBFRdLVPrGLn6ajiolEp9ot5qzI59SxHlWONk8wRoOV93kZKlzbYYmYJJzepGHaZv3QfsqWALk5cfe5N3JJKEKTJbHD1NflSaVbMQEbWuns3UWTrq98/d5aBmIxluIWBpVKQYVdb9pa/699mJQ+bNLX1uFqItsVkwpzYliMtG7JMKZgBcOKi1X7nOJcaAPINRHf19o9ki0WcSNpnNzdt7kyiGHCyD20/iO6RqRs3Wj5BXnKonQ2HVkHcANKtxvUVcBdFZ6slRWnGS65504PPDig7zcGqNZIeboH8u0M5fHj3t9qG/vbfDEVFREgYFTpOYUFHfJDPQ/lTSGuCNiO2jEGA1+yA/sbISEkNR0308QzHG8B2KTS/o+0+zBdC6ur3XNA5ROCgchqXjQSsoTmxpZ0CvX5pC47lEDgqU9DHBLuTdlh6lMOLeaAPQCx8KqQhUO2BIVXlSGFjYSTCIJXr0hm2voxOU/rB69QHqSGaX2j/83g8SMqYqFTOISzSzvf9w4BBnLVWVdSn6mqr+pSUkz066DuIfLbucBrABTZY8YSTHSHBQiF2zG7UmNyDOyVCLDshFWk6JYai2KIkO5MFO0RQurocenD4az/8uxu7gPDmo7KyzxlwNBo6Yd2XzEnd9vNkx69wcq3WMYq1EiHyeDH1hL3R2G9X8p8cbMxC+QiE0+eAamKSnjVHIi3ylLwF2ffe19xPbjKhEn+g16HytroMITszA5DzhJ9YYr8tWLGBTkudftMxHXVux92MRRNtm9s1of3mpTv3CPpyUmLwiLFhbOTjZcLVZHrjyH9PseMfmiDcm5p5W6U028SiNNhQ+p0psWoL9qQmBhPVmwkjx8JxrcwvfcbTMyZr8onzq9Vo28IRSTtCpuyS+TNAcW4OfaasduN4Q3jv6oN9/x2yCMzJ9NN96vk99QqcynAH3hn8C1oNGPa1baNmfC32Qb5lrZID5yaUVYMjnSiu7k/P2B+wUmBeriEjqcp1iVQzPbBgy2s8KVI251uXp8g1fhuhFPgQ0nuFj8LNf/7huCIWoHWiXpXtKpNXhoC4jttYSlQm0jVKzIeVSTNKBTJgJbBZNqaGyZyhEfLd5IaKXiGwsdPW9YaxvoizTOaFEtlg/Hhm2rQibmga8nHbveZICeeGgng+9VH+OpD4sAMWOFJPapa4ttKTOgTfz1GCgnkZnlvl0XBPwYMfPU32J/nzndB14q/y7bYq+wnEu7rgMS/RCvLqWq3e3DqYpHCFKH3GG8eWvWwsdK5S+7QaFe8wCAV+Sx70WtMTSx2TAWgUaUSldMpnVOO+l9GJlwlbPoNW8IJpLVgJ8AnOHwttZMt5RPYJtUdwx00akZWQXqXdppKfFh6mMFxVwY/6cc3ppzcglYA8+kxle4R71seS6nKuVV2nsc85m14TJ9K8rAFTYu7Ul2eyxBKKrxaxbsTpMVrI0xQK7l4nGW/8u/qTEH8v5+ez4SIoRD4krB+TP5IQN20An7lg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b19effb-1e7e-40b0-1753-08db92f35b49 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:56:51.0323 (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: YldUuLe5BTSGSMRRZn+mVvnc+wblcIMWRON0kFxuiiPnZvkNHnXVdrnFTlri2jDnas0tU+hL2UT0PGvE9a6PkKdGU8wuwrxr+ubrvbd7cA5YKd/5vyOkxeqMFU/ZFa+9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: 64D36RUXZTNGAIXUDEL7VCFZD4PSU3JZ X-Message-ID-Hash: 64D36RUXZTNGAIXUDEL7VCFZD4PSU3JZ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto 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 Wed Aug 2 00:57:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 002E3C0015E for ; Wed, 2 Aug 2023 01:01:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CEEC8828; Wed, 2 Aug 2023 03:00:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CEEC8828 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938083; bh=uldxkI2iLdr9p4jBUoqbO8wtx1ZGAeyLCoa+nXHB1b4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hSMSPiya6H9PccH3WChm/Wg+nCTK/erCDBATGPIKuriGMj+OWSc48HaIX9+t7A3jE 3uFi7uE+S8e4kjf8C9x+NGn1uijRPkkFVFKKtQ2l7YPNoVJa03hzlllhMQYztaklTO Zbif9X6D8Wj5P0MVVYb8dGZopy60+xfsfVK+ZeX8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A326DF805A1; Wed, 2 Aug 2023 02:57:16 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 17DA4F805A1; Wed, 2 Aug 2023 02:57:16 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E637EF80638; Wed, 2 Aug 2023 02:57:11 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20704.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::704]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 92922F80578 for ; Wed, 2 Aug 2023 02:57:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 92922F80578 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=WA1Bnsc7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P4oL3M+9g17JztYXFPYaz57xmre02fQvFroXD1n0qh309nOyq5CuVKXCk+LrSv3EXw/st51hMlk6vM00vxyS/n5RX2BLfSSEZdDbdpI8HU0OcnZO0magxjGkXmz0SiFM8jDhnlKyI2nYLuhnaR7IFcspmghl466BKJZq1LB0nbA1uz9GMvuOtOl34nlAVuOUGln2KsoQ0+YcysW7JE8LOip6f/0V9MSbEVB0pSl8RnFb7JUBIOgALTx20UNvu/6dG5jADLTFo6wRnRx7cJpotn1BHsi6Pjm+lqzr+tS4ejvR2GdyQaGxG8MmV7qfR944RNAP0OW3jl0KjKsFYYhjQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Jw2gzRbconf/WYexs5sPIOPf7oDLSXhVjZZ02EV61js=; b=flRlwOca+VI98bDLHYSGc2z+KqSAcHW+u2cmGqN8VLkytjKaDz2A58hXPdk3IFACXPdo4RT5iOE2iGAknKK0wCn0uXQ7Gj2T+6quIIoUzwRB4S6z0QhCMaDQ0/79qn0P4VCo3ce49ixDDmUX81hQEgeF5xblnyjVrmPrrcKX3vooE+lEKzVBoWYgFytMkGg+094JFABy1eD5aEh3C7VOLuvvtHvlDQvhrrZ5iutlXt7Cf8LcMaE4r5CjmVPOD7hLSJOqSEvpEN6MOXux3UA7EbmTy+9V+IjAmrcYkPmxm+4gcLEDlRHlaBM1mtQ/QVCL9gRB5dv+bqto4IBNvozXYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jw2gzRbconf/WYexs5sPIOPf7oDLSXhVjZZ02EV61js=; b=WA1Bnsc7LAPYBpBekEcF6h2v/vKIvp2KxGA7nw4Ym8R+KUUrAr6uJLamJf3w853MGVx7x/+RuqmSHOWMASMkoF3oubblE2QHQCBY7DepywdcL/Eg7SA09UHAPXfbN8gOuOtlRnoB80VqpgXUJCJ4ZHOt7qcqt3VLzCqbht5N9wk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB9381.jpnprd01.prod.outlook.com (2603:1096:604:1cd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:57:04 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:57:04 +0000 Message-ID: <875y5ytg69.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Heiko Stuebner , Jaroslav Kysela , Judy Hsiao , Liam Girdwood , Mark Brown , Nicolas Frattaroli , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH 28/38] ASoC: rockchip: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:57:03 +0000 X-ClientProxiedBy: TY2PR0101CA0017.apcprd01.prod.exchangelabs.com (2603:1096:404:92::29) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB9381:EE_ X-MS-Office365-Filtering-Correlation-Id: ebe0a371-c27f-4eda-631a-08db92f362e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hZ+8IcssyhoaTMpOzPKrp1kJn+7BHQi0V92DvVXIBOJG7+wIuxkmWfzHabJgBHG4Zf4zGLddBKeaxu9qRd2MQnG6XYFY8zIOJIitWLe+R+Zt39zAuD8YFV60MJRJubgTVcjYDhpyAvgEGX/gtfTHu0HF71zTdNCod/9bkqlXuOJupQqrFzmHXocodxRJFK+QCkRwNBR20+gTF3sSxp7LX7mtCmNsPVbw/NB66rdLroF900o7Hrcy8rmbLINfSpo1aHZJjo4Nz/9n/GzSqxhQHktdHWhlyau6y7WpdiapALAGcANJjWJKUpPeP2jNkzS4O45tqk0I4EtWGF1D20SdNpivbZFC4WnZRSmZF25vUly6KWHmnFmNxKrOsMXEVNcClZT4xD59/mbIzjxO/q2N+EAiA2/FlNcr8sWhjywIYk5IhMzne05itFI3cNC2iFV4pnS5M5Y19XX/Jgk2vit5jyVdjuiBIvkO4QzNqYwROGeHmUmAPRZ/1uZmwkH/HoaPB9Jjh2f71yJaxVXxrtQhOj9qBSK+ffZ0g2Ud0WprpwkM7BgKojIQ4hm6SvNzJPNUNA1/CeWac7R8gUWT0EuBoOp9F6F4k/KlZJKh+k9nOqcQKlUQshSpjOHtUULcdFIr X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:OS3PR01MB8426.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(451199021)(38350700002)(66476007)(66556008)(66946007)(2616005)(83380400001)(4326008)(316002)(6486002)(52116002)(6512007)(110136005)(478600001)(186003)(6506007)(2906002)(26005)(86362001)(36756003)(41300700001)(38100700002)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MPmHMQO7XjrPSecVwMaFqfHgHZexOa5yoYoZWyJX0BewQG/Y76nMnMr5ybirUUywovVCkeBF4aonzRoMPZdNipKwzQghJgTpmFfDBByMnwHQwWTAt32i1g4mJ7EU6/rRv8BcVp+HFR+dGKJe9G7LcoIk2mkRyI+2MBqrUbbj1PikzhIDB5Qwn69fX8FWI2BKzsmzHiZBxs2x6yvw4wY2CNX3rNXbd1KOK66uUGLYescnE7L8KxBKNK98M3Guj3nkoj+o59UemJau317petC3F+FXxd99g5uNsbeTy0Vqt3lIFogi9Mj+6EK/d9ctFzbcO/eM6uXr1KfUyXV4wL6XiNlg+SE7ivWq2s2G6MHdxgqYXPjCxARTARSeE2kAsajSt4ExIqlugdqWCABIMq4PdVzjrCVSTUMn1yMFfNC0EkB3kIKi6UFgocCfWqjqRdYtuoFfwRj/XqY7E4OSliFsU2W6oDlRWo9xzazEDT4JmCiQk2jkInJ9W5RTYMP4AMG+xEVePM5KQBT5zZfvPJsrL3824Ka7WT7vtJ0cBV/9jrKpZreP4QowHHT+pekSRVTSRe4cx+bvEFGkjTiSxfpeY3g1ZDBcry4CKiRxthKCZ80y/NszFyQp6cLRcUyq6odc/fheN2hlSHcPPM+XI4nrJAWq/oTo4M8GSF6N34hH+WnRXRLm0sGmqcjFj6JXJvN7dIjUtJb2HCe5jn892cqoabYlGmI0AqbqNvE06tOkcg0zaqesPkTsMxkXGJFNDwKCp2p2Ulz4CncfKr7/jfJdhyrvvKLdo052RZeXBGh4mxJGIqa0YWJhyzRz30sc3IAkknvbxGikHUtb5cX2Mjl90ZQwymbN1jQytUZoitMUP8N0sB2xkeupk7XiY/iq7Ilk0kZ14N9Qg5V+1GmVmfAGNkn6xdXO6oU14qrTBpi+SLNY14EuvXOcK+hB75F7KOoVQ0MrawONi5LVvVILLLB90dyeUXJaXUxgucdC9iDVOuRWZWZSUEiIvKfnXtvtGgrA/hdI6A8Use/ufDnbAlZzd6I89ee1+uEYkp021xb7UIHW9ra5mc8Y0r/fzuXBqL3b5Cm5B0ZieqsknhuiB+H1wV8dj/0eECQeU7ekwyuUqDvGmNMsuKb0bcNQEz0oNi8DBk90Q9Mwq5LKEMvAZpDbCSL7/8cxNb/+Fmjix8UvZ7lpThen1jHrGH+jDejbriqggZgKpjRHI0VTpnwIFu1dejEBjt07QZbs0GnFdM7A8UkQDitWjoJDt9wXbSxG2WjByv6hsjBUz93dQedmGYPkCa3iRwezR9eDrR2QtLkpZr7QZlxWxMwY7zvxRRsLZclBMa5dyCrGrqL/a2ko0PQvVh8REP5xdRenUpWW1n1+l8L1YAD0jeS9GDcUpBYqZ1o115Dp0DOCJC3SgOXJgB5HhwQUVN4sNnvlleJJfJFasU58Mf6wj6eeFm5Sab1v+8hSKbYEADe0mHF1sk9Y5C5fsPGv615A0zqG4PF32htbL9XCrSEv13Ox7zCfRH9+1xjRE8uoNb42WKms8Jr5/rIFyArmPMGHTPOyV93tOpaa7hlmj4dGd/Ds/CxGQHargoIMhOcUFvK/huq90F5EGy2vmVhSAo/J3+UzpAEwH7c3/wQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebe0a371-c27f-4eda-631a-08db92f362e9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:57:04.4282 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uN02+4AED+/uN26KKz72/BYn0oirOGkyHxj1gC+qmoTgLjsh7b9+RlJPE8vwMvvnXvopiEH6RQ5hA2tqvKsg1JrA+BHEl5JJwOEworBzRWRl5OnUdCKmobxYYmfZQ8W4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9381 Message-ID-Hash: EWVIH4RIYSJYD4SQFU3PTPDSO3MK3WZG X-Message-ID-Hash: EWVIH4RIYSJYD4SQFU3PTPDSO3MK3WZG X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/rockchip/rockchip_i2s.c | 2 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- sound/soc/rockchip/rockchip_pdm.c | 2 +- sound/soc/rockchip/rockchip_spdif.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 575a0b9b01e9..834fbb5cf810 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -539,6 +539,7 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = { + .probe = rockchip_i2s_dai_probe, .hw_params = rockchip_i2s_hw_params, .set_bclk_ratio = rockchip_i2s_set_bclk_ratio, .set_sysclk = rockchip_i2s_set_sysclk, @@ -547,7 +548,6 @@ static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = { }; static struct snd_soc_dai_driver rockchip_i2s_dai = { - .probe = rockchip_i2s_dai_probe, .ops = &rockchip_i2s_dai_ops, .symmetric_rate = 1, }; diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 166257c6ae14..d3700f3c98e6 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -1114,6 +1114,7 @@ static int rockchip_i2s_tdm_set_bclk_ratio(struct snd_soc_dai *dai, } static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = { + .probe = rockchip_i2s_tdm_dai_probe, .hw_params = rockchip_i2s_tdm_hw_params, .set_bclk_ratio = rockchip_i2s_tdm_set_bclk_ratio, .set_sysclk = rockchip_i2s_tdm_set_sysclk, @@ -1324,7 +1325,6 @@ static const struct of_device_id rockchip_i2s_tdm_match[] = { }; static const struct snd_soc_dai_driver i2s_tdm_dai = { - .probe = rockchip_i2s_tdm_dai_probe, .ops = &rockchip_i2s_tdm_dai_ops, }; diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 52f9aae60be8..667f2fa65c3e 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -379,6 +379,7 @@ static int rockchip_pdm_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops rockchip_pdm_dai_ops = { + .probe = rockchip_pdm_dai_probe, .set_fmt = rockchip_pdm_set_fmt, .trigger = rockchip_pdm_trigger, .hw_params = rockchip_pdm_hw_params, @@ -391,7 +392,6 @@ static const struct snd_soc_dai_ops rockchip_pdm_dai_ops = { SNDRV_PCM_FMTBIT_S32_LE) static struct snd_soc_dai_driver rockchip_pdm_dai = { - .probe = rockchip_pdm_dai_probe, .capture = { .stream_name = "Capture", .channels_min = 2, diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 0b73fe94e4bb..1a24b78e9e02 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -202,12 +202,12 @@ static int rk_spdif_dai_probe(struct snd_soc_dai *dai) } static const struct snd_soc_dai_ops rk_spdif_dai_ops = { + .probe = rk_spdif_dai_probe, .hw_params = rk_spdif_hw_params, .trigger = rk_spdif_trigger, }; static struct snd_soc_dai_driver rk_spdif_dai = { - .probe = rk_spdif_dai_probe, .playback = { .stream_name = "Playback", .channels_min = 2, From patchwork Wed Aug 2 00:57: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: 13337462 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 0E047C0015E for ; Wed, 2 Aug 2023 01:01:37 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 29438E74; Wed, 2 Aug 2023 03:00:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 29438E74 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938095; bh=RkmO/PPvSq/I9/GU18f2hF+h8DVtGJQTPjqni3Qk6Sg=; 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=tVcc/JVQRN6HCgSWVfiy5K47Z+MwHc7v5p+uh7ZgETxxUxtU0UFEsWnKmp/DqFoh5 jM3OuWxCoAkFxw3QLI4LBNeVrc45LtC7hAF6MnYUteg46qFsvSYHos8psFxa73JN0O fuEgxRRqCwm8TBuQ80qOj4NV0Nx8J2Gqu0Pr34NY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 70395F80588; Wed, 2 Aug 2023 02:57: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 CBD6FF80425; Wed, 2 Aug 2023 02:57:31 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 186BFF805A9; Wed, 2 Aug 2023 02:57:28 +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 83507F80544 for ; Wed, 2 Aug 2023 02:57:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 83507F80544 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=TUllrFcI ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d4FOIIRZFbjWHrPrOcV9H++fxGJdQpIc2mWnMGxhiNInUeZ4qL1169pauOOFNERd+VNkHbxX+9nZIM2FZ7qQ/Gj26FIwWDfMejROXmpvD1lIicwt5ycI23CLIZ7GY9zTE7G2+U4rtXhsY02AbLuCFi3N/dbaCjeaVY9ynQGHkXDuIsNCGXNpFwdAdY008ApYaQ0k6D1eAQ8dT0xxLZUw3ROeBWqiGpnOIxE/Igh7soSbaievWfIe1iu3Uvu/ZLQ23Pbr+SmUpGH+ah3SdnIclUNJGxXvWI0XecYlNtjcOOtl1wXqKTcZxoYF0Bizv3RYL4CTb0TcQXbJrJNMEUvkcw== 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=up1e8zvfZVYET72K1BxMUcVZSIMEu0rdYz7BlRXTx18=; b=Y6XIZTZeRsttS/V+heU9O9olXCAilJXYve5FpS8QFpWQtLEDpGfMfMLZF6JuH6Y5BywnT3Q2T5mSqIbstVW+3MG4vEg/djPf2Q8UVp50i9YPbE8BfbfkLb1b5z/EVA7VQiXMD6ExZlYf0E0nngeaZHFGFRCGVQLXpMGGIcHxlqUS0G2UFT9O/W59Z1Nf7f8D8YG/j/vItWMU+Iu2Kj6guSNrrMbU895X/p56oWRCTPFrsUXc4L2UiNhPf3bqCTtBixbR6hXb8Xpb0tLCIzOkBK4MwWZAYLOA209h/EBw4ds167nGpl1DMPEb1FNB1IEsTWyhxQ+XM7R3YrD62ZH3hg== 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=up1e8zvfZVYET72K1BxMUcVZSIMEu0rdYz7BlRXTx18=; b=TUllrFcIpUdr4n20YQSyz3/2XKghq85PlMxb9fBSD2igj1Ot5A3we+ZlLHrbWPzpYGREWWqy5oBSJuBEbhw0ZqxGos90TxEmhprM1vHro5W30WkozEt/sC298f/VoEAmHiqvhlbNldrEXW9yquUSdr6qS6AU+jXkA7IpOeaZwPw= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:57:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:57:17 +0000 Message-ID: <874jlitg5u.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 29/38] ASoC: uniphier: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:57:17 +0000 X-ClientProxiedBy: TYCP286CA0254.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:456::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f852f3d-a6e6-49a0-9d9d-08db92f36b43 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: srQe3BuXbci0aBVVO7Fj3wJCYnHAie86gZoIrQHcGClO4GKfC9eyW7iPc8l6E7yQk9NasZIaP4ij5AjzXrrO9RzdYB6WuiAIMNe25Rh0fiajDBhH73KJwm5iVBB2HNHL8bS5DrKf1LvherqyZGDb96YjJqOh7O6icU48Qet3G3DsJWxLQPxwp1H+d+Bss6HxLRKY6jETqYCH8y9GMBNjEaEyZkuksGt5YLri4YJTtIG3oQ8QNyzPR+AOMjjUcPpf7jVYN7BoOJvMYvJTzk/xBzxrIWbPJDYvPuq/czWa75ApMjhKmLGR/tWfc2Tv+kMfNgMwrlYT6ykDbR6vpGBtRpTGNnyO/8JIHhP4xCChfjU6m8hg8co4U1Ah0jUzYca6P6a+U0DJPvdpwz2qAA5DL/LYhLwGtz4ND/uMWaEesoeBJ2DYEpHCeWxut6EZqbvJLoTycOVtazL1jzXGf4lhwEjxDDzyCUTdCzhoKrg/wxsIF15lBwubEqRtIc7vwPMYcJPitM/s/6yWvUPn/RhJKWwH7uJcExYQkrhyx/M13GxoNrAoKebjPiHlX06HHbCOg5jZa0smil6X1WlOLsF4T2fq2o/fjYcK8JQOo1f5/1awg+jsOIKh+qxVUF2kL52V 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(30864003)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vlS0Omtzm+n3i1vD5fPdzNfSPCk1rYvxoLSmFbFRm0sTBB+9M1tePzqd6QETCyNj9Xpb2+w0jnciEnIWAsEghDXgwq8OdN4exMIAXNyMmzL0i9kaPUr+zYNKxTpWa5RiSNagJNKy2CfYhVQBPBwzk5AzIGIgTnJBIUppIn8i0D7IfZZYQZaLriIdc8tlbys+Deku5OUNtiFq6c6/LnJzPaZOKw6g8kFi8zmW1kLradayliHOu4AEV47t38Ct2nk1KMwxxWFuuPoYws7eheb6ZV8cplGuOvm5/1FZyREtpkw5Rpe9EmXZYohiIqC2qbCEZSUk3ZNxB1A8W7XtfIEIwTXNRPExI78pBcQcHCWkq4m8jhjf5NlB9KsnCFxfgYU1dqQbNX1zHXr1HfgfdrcbJH3sDnk6f0UyKsfzuTceXUQojdB/DONl9uCX6Da8kqjrHXpcZfSanZj8tFMsJpxxcX6Pg0WZdOGAv/nyaUFAYwD4dlkUO52OxlQC1IKpC3cfBsQvMJ+GvqAKfPqcwUzOiiWazCsCuNmasgLId6WNbzwV2g7g+8ItVRsZC/MMhPBBfl3EmtrWtVlWKls4DnqtW+OZKFzzGlHkfbZ3ifws8gDaKXVTGykRpHBUGoraZr//Q+JlT6aa7O9+/3K/ogev9tCwz6vUYFgNK+kBFjIvwqUUUG79gKfTtkXFd+Azu3r4Qhsm5ZPcpAivdLzss60Wz+M1tgQgtzViwwnR2Xaz0GlyiSU9umvR4m6+W8nPX3aA3c6+8K/SB6mvQNeCbK+WcQZn701Et+Zgtg3l2bANeBySNOY2oxVW+/ahjJR6KWEdeSNbShqLXdCa4jgYfjbPsks3bHnejAlx27ezNO7Yh+OXqDNB56FW392dB3ETTytBQBLraOdm7Fy9mYKljiJDcP8L01v8DAZF7Qs1bezqhSHgSz3OGuUztCm5YXnmY9qbjxxPF01QW+gQ2yH+1KVDTQ8bK8CKUe+Xs3TVgeAtrGIR1Xafauk94U6vZD0ntqq7vmfnjbOtb4xQ0sKwaTWT3DLoA4/PjWZbcGAEDO7pIwWEzo01D/hSxyBbmYLyXXa2LNQWwJTVK1zS8XoIpqvSM+pFh3B3CwHuY7nIgxZQyclkTdiZprJGUpVeXK9y7wUk2VLTr7k2+WK3M52YTcmWDLCXwNoHp1wO6CdtbgIdKGXggQdVVQxl0yF1kvEmYLq6AYpkqABB2ykf5hmj6Bo8b/l/VNDiq7Rk4+E1T+T0GdiZ+cpbzGmCgtCauQwvOPGkmIw4sx4/nJlYul8N4ppzO7sWrzGRTqqrpxWjRK8UwCUqYaQpHb36mME2QyUk5OILfW9xi6rlhllLltO1fpUojdBddP8RkyzAeCRWYfIVNJttRJGjzDitECI3ixrRhW6bLSGs6UtDwRk6P/kilyTEbpJvX761+S/wsQw1r1kGsSho0DNdPpy1zztFiS6r6sOSVUvTYgb1ARM7wZFF/Me1PvYc1h9QoJNqRpAvlL8MpckfExMbeHb+z9YrEUVxpAbjgQMwuxGFATEpswrXtAPTGwg8wbqqYJQPZMfL5dzmOVUinZqXuj1DbCU4D0U74u31rhPIxH1XVoplrZLCeAl6QUeUnBLelK2gh2QcmXmrSoU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f852f3d-a6e6-49a0-9d9d-08db92f36b43 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:57:17.8816 (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: sf6sRErtOd8xCrRgjSjnFZ5hnD1dIakpLnYV3hRn0/0eUUy4xoMp7tHjn0JJJ1RXCtDaMM59x8euQcgKr/EmszRXFlhec53GWrjXX3pbIWNl1H0a9NaTiUBRlMpJuK8S X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: UVIIOALXR5M5CPS4PZO2TMJDL7SCB6HI X-Message-ID-Hash: UVIIOALXR5M5CPS4PZO2TMJDL7SCB6HI X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00: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: 13337463 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 D2B55EB64DD for ; Wed, 2 Aug 2023 01:02: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 EE5AFDEE; Wed, 2 Aug 2023 03:01:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EE5AFDEE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938120; bh=XoYDp1EwOo9Ng7NFdmIwngSeM6WuXRz/+1MouyvuuYs=; 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=RJyoX6xfPwWW85Gy53wfJWK6SAEYGTENbnELpfUbsjb7ynRgb6tltTlZwvVbj3+zB MMZrLLE7Wvmhd2sXIf2smQOMAdo1rhIh7xtuh3LDKx4fbwwSzVXcSug4/5djL4H9sr 6QGgUUX52NdB5YjLmYYjY65NnHxeRbevlnxr8Z4s= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 24B70F8063C; Wed, 2 Aug 2023 02:57:35 +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 6E489F80638; Wed, 2 Aug 2023 02:57:35 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 026ADF805A0; Wed, 2 Aug 2023 02:57:30 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072f.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72f]) (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 3FAF0F8055A for ; Wed, 2 Aug 2023 02:57:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3FAF0F8055A 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=ejblM9vj ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fC8L0ClWXokAYmRVod0IAdtmoJs66xHNtFClDBZxtvV5anZfwJmCe2rfV7Tcbf25JYHmiDQLt9afWt/PGASpCqh3wL4s37P5skNGWqB26VDojTT7tmDEWQfn7F/PT4kmvwrys1YhaIXjbutSADCAhVT74EeHI6NwSuNBASj19cemDzc9pSaJRQdMTkMNKuS70rBC0rsqB1G8yVU3psHMwxyQ/VC5Uqd15P6gQ/SUO3Rf6JRhpMDK75R6jZLx74LKsykghA9fYIyEF0h8N22OhF2RTiILRM+V5geXgArzVJbmwS5mvEaZjNKfJNU8c+gmDcw5d2SzBW3Z3LnIIfYURw== 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=1ByWVe4/WRQiC9WEzhMU2FX3yKBmb+HLj0PFpqKTgXM=; b=QX48LSEGlHNns8cMZFtV2eTZtzXaYCrDGuvCiwvvQ+dEQFy62fejGq4lED/gwjVWSwoLIk9LFp1JIAPyi7eFncA+ME3eWspKXCE3auTwceE+jpGcfc+qE32kMR0TJnq4iM4NIOx855BwbH+tF4k+O5+bcXO3k/0Hea4RnLlHg+teNc9c4JOD/Y6iTSKbNRVsl9QoWJsgaq6NwDefx6ytSFwIi80nQDXucQExlkbPzNCOsK6s+dtcm/g+TaIBzqibFolZQb/6JqKpajD7Knwv98JnHnYIaMIUz8lDdPZfsHeFqE/oyTCaRaTU7JMzaAkd7Pw7eRTZlAObtw8dejXmDg== 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=1ByWVe4/WRQiC9WEzhMU2FX3yKBmb+HLj0PFpqKTgXM=; b=ejblM9vj/uBj8jAdm3HNIFlQdsRa4r6ji03xt2LmtLqUtaYwfdkC+Q1LG4FZ6kdbMJ4QFeweVH4kj181ZUdM99W/u4NHRwaR1ZnEOTjrCh9TMfdFqOYV0HlU4AbmWoD6ZagKG6UOe3cg76490+YCSumJB2ZLfdhDF0LGEe8WC40= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:57: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.6631.045; Wed, 2 Aug 2023 00:57:24 +0000 Message-ID: <873512tg5n.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 30/38] ASoC: loongson: merge DAI call back functions into ops In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Wed, 2 Aug 2023 00:57:24 +0000 X-ClientProxiedBy: TYAPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:404:2a::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ac9e017-911a-4c18-b080-08db92f36f76 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vRZpWgiQ7auoDbYAFf0W7zJIKm5RL+6AGNRJkZAfylBhZqLZ94I4myJduMyu0lNMUz1jPNU2Qd21KxXlQVbZwIl3t5z38qwUrT7pzpK07/u8RMu7AWd+vtpjpdp0vhrxOlJm4wx/OJTCQdY54oN0+9/BaSjfM6U22df+K8OKIf2JYMDPvPEvNkz2PO2XM2bk8v9/ncPIw6faKgvAbQ0NPH2l4IniNifXKPSiSzmnLz/S34mrqZgA0h2qnR7z79AY2zKALqXWGypDOE4tc4DIoOhqQ1fm9FN4BqA9GFdpx8ia8aTcmiLtM0+HiQA4MJBwpVwC/h/eBIIfSrdX/IkZzm2DgkvY3J5+DFSTdZ5Lt/Onx0rmnL/+F0eqEXb95HN1qkTNAzaVlg/IirRRPDmad3vOMCu1oPi4YtesDwjKLSYffvwVg6wB2shshcwWih9GFFiZfdFyiwSFj26vF9LXOOJ52S/hqJZyxs0oEoqVuANHiSAYs3EhBYpChRSJxMrLQYfHrj27qqVLa9IOIm2Rxc8p5CDzNH0UccU4dLvCIboEUGbb4gLontq645sTeJaCCd1khqYH0LQ/fL0AxqvZc8+BA9AlzSVp00DytZExhSolExqD7uuSh9ANinKcToSi 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: txvNhOJCQlm/UKp1YfFbtN0YqZW2kktCj6rAJwLjfRyntEtPDS2q/qxzM4dk/Xwy9GCMB6B7w5CwDd3bD+JXQA4ceu0BUdmV46wjxGbMZF7A1mF8+TNL8I7v4AAy5ptWf9+7k9J1mk9/Vm3+wot1hcqiP9hgXMIh53+aFwyOXfSKKLbtR57PLuU4yCE//FuqvcS6Bm2cNQT22RaDwMToA49klhC+TtTWvzY+Crii7uzA0o659BDmGJK+pjZ6c/pbLayQhdZU3HnROluo1MO7I+hLc5UZJC4Hokq0mIoc5H9aXsnK3umFA9vfa2s1/ga4bfGZJ1ag2Gq3CuudaLcqsgVxpUNcFlE3fHAVzWj2HoEXfFpRUVOmKeT4IfkDGYoRK5zmquQGJXbFVPTuUC2Z5fH+aEhrQa1PlSoHCyPVaAooYnob9x8e8laAb3ivbNWf0aiW0xl3KiUeZb2+8hyojiTSvdeI2TlCHfccnMtY8eNyjbGnkNkBMCVwk+AnOolIGw94Yg3KRMm+U1fAbRXmSepwm2Lup0rEsKBA4xkNxAs8+ciBXj0LwWtvZ9PDpVGPNlVXMCLtYTnflD16pcfNAawnUZ7lV11T0cC7gjxNRrdKw+tHsCNKsqgsiMWKeS4zcdW2NKVMHV5IuHmb4R6v6AzUofmgNIbVJnNuHWl57qTIXdouzKahunRrTfXF4SBg6vfyxhmKVmvnT+Pfi8cWfVE16LHLZ5vqobvzK735B+WJnR7kiEbQy+LAMCwx/tNJFwyGQQvQ3IJPakEIkhqNPPly1DAXKa75CpamkpgO3D5EMENBWTagMQ828ZW6NOxxgnePbWdPTH7wTKwIoqt/d4LZlyoDcfmXtUsBvYkIPNEoA7iE9SaqlCUHfkceiaC2FNDKpT9spixya/24+J9ilMd7g1UpU+OIQbw+6+SIXoH1XG4s9I3uQV97+apm+C6kqedJps8y7iX6PkHXaiJSpH/5Ka2vkKganHc9iQO3YS5MxcJGjRMBqU38QfUP4gdbC8kpjWW9z5WAqE78DOqz5UH3Rf+1IR6EKP0IWRobbzb5YmW8crAGL3GEuRb7AkYYQ05Wx/BTOk2YACxW7qqwQkV33/lsfegZ0XBOO+wif2WjW82QWzGWEowWH20abj6Vb5j799QzhkjJy1ZCS7gcKIeisPT3lMq8FrhrnFNz4tvVEKdKESMN6uSXWQtd7EqRR/6qRbpWhCzT8CzppgA1qJX+MZ7dT6I9ZOL5UW1tSnzuwi+/K/2bc4hjObf7IARjsY3YsSbq75G6UaNxBQNBLSbHFCEUqc17KjDUIi3JNuikVz9cVNWnrneFOSJpvEGO/6NQ8nLH4itg2FHwEtbqcLjI8qAUahDO7Aa8HjHpZC7N8pgW9EzgfXa+LxsYwnNP5jnERq+6vOwCVs3aTZfZVQ17Cq3kSNuKpreLgG8qUGSX097jXBp2Xzc+jmEjl+gdlSGo38oL2UDHa/Oc9ZXitgttfmZ9EQ/jnf+sZP1wepiCRXsNBo+SEcrA/XtDDkxGItSmbtKvy3YV4OjOsv3DszyrJDGq2H+rc/K37BqVq4HMKg0iY/9aePWWQocn8ROsIzEGFr/yI4j+HgF+0kPkpFqJwn6grsS2Ku6KauqMeQo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ac9e017-911a-4c18-b080-08db92f36f76 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:57:24.8802 (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: M0twSobZ7k6nkPEC7r5slFq3edYxW4qluicbsEUiH4rbArRFINqxbkhf3NgFI/kAStxhLlneCmBkEcxP1AuEYNcXYjbvHoUNFAK3CFKzsPy4olGtCkWsWWWiVask8lGE X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: EHZYVLIIDFKYVYCN7SIIFND6WUU7RHUW X-Message-ID-Hash: EHZYVLIIDFKYVYCN7SIIFND6WUU7RHUW X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:57: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: 13337464 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 DD35CC001E0 for ; Wed, 2 Aug 2023 01:02: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 B3D86DE5; Wed, 2 Aug 2023 03:01:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B3D86DE5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938141; bh=GC6ckSKavXCqgT3e6GC7k7LQpOe9SifLTA/nZKY3/ZQ=; 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=VktWVAgaq/Xm9qZYDeGKQSJpuA5iGru+RcDBgMONqCKxt8kSeuK2arNGKedd2UDKf GMIyACIR1o5ayYsBPPpGCi3mq7nrHRirQucqXnsEiv3JS1uEDOVZwruYCZLF6biPlL XjHWRkO21gCfiZsnyvuzaalxfwDsP3VP2HNKWRKs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0FEE3F8057E; Wed, 2 Aug 2023 02:57: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 6EDD1F8057C; Wed, 2 Aug 2023 02:57:46 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8A494F805E6; Wed, 2 Aug 2023 02:57:41 +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 31A69F8057C for ; Wed, 2 Aug 2023 02:57:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 31A69F8057C 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=OPfuodWR ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ctophSdiVDw3NkXk2NReFQQRThpKoPtoeRF/jhbzr6usoBbR4sX6hCcmiWSFGh+iZphKJUx7gGQUjNsMj5jkbIyTkyPtJRuiwbFk2ooTc2Zf/Ag+SlTT9nhBEymW5wL1vwGRAMxE06ea0/r2CWhc8c5If6NlNrTzVz/C68edEaoLQMMhhaKRJKnA5LpKc29admSfDq6cJDNXk18T/phSXJ6D9o0hhzhKP4Wg+lFOwn8YO6304MSZ6cnKY/qrBiNqO+oIWvWhmJTVJHoQVEmfKRlZOjcMs4K5Nk6vWmZVAFx0C2QPfLVTq4iCIiRMB0rh3X4XQJneIJM9610roIgsBg== 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=w9ORuKN5mWNV+joLtybTV/0duC72Fx+TEc0Ft7DKYRQ=; b=GXprjIUgnEj06rSQ9a5IbChALCC0kSgU2AlfMdfXzwsCqCJJ6oMYTarGc4o52furfLD1l8tihO1iJyyDehkDeefUkWvp71EVktr8/QeHzrsgjbmbxlfufAeQcOmDnGcJKGRoeYKClnrRVahQstnydTlZJS5gNj1RvqlkZR5pIeIaQ6PSXGf/W3Ik1A4UPnRhJhkEYjaWl1EJWb344XpSkVQSRON44le6IQrBf0vG4HgVNdG8lrwoMAvn3BnKznfuzx85nOdIopsJpIrRXZcmClxS+/CupYANpEOzcQlytTzGBz5NS5nqLhm8SAeg+rZxYWKXJpkmHRyBMpX355DkIQ== 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=w9ORuKN5mWNV+joLtybTV/0duC72Fx+TEc0Ft7DKYRQ=; b=OPfuodWRyudl0Kzs58SN2KEjt/BBN+izG7zb5Ee3m41rMyDE8tjKDhMUTflbkcvZEwS7OBOKrDl1gD4uc/9lUmbZ8ZeeXZ1ZtyU/ps1A90genc//JCuOnuu9FsQGsll00rWH3hWQNJ5JuRFRcXKBxkyUC2UH/AJQGTeFxT28RhU= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:57: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.6631.045; Wed, 2 Aug 2023 00:57:35 +0000 Message-ID: <871qgmtg5d.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 31/38] ASoC: starfive: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:57:34 +0000 X-ClientProxiedBy: TYCP286CA0215.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: aebcffb0-d1ba-4dda-e5f8-08db92f37588 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r7cMf/gnDUuvWhnh8jxi6rQtgzY1s0H3vplpYPMahJXIJm3jtTOqQeb0skkLnsFyjEZyqaz731oalUgeagxo5JwSmu8IuD1N8XJlPb+hTr1DLp2XLp3Uh96XjYVN+b07CL7vtd42VdnEiP4KrDyEpM/DgtvBv9QtZ0Dvd8xEAEXeC/Etg1qXwwiEyhuQaVm6hQI8w9ARhqIW0zjG3+P83QvEJdhPJiAuWGP9lqzcnZU2VtHGy5R3Y0EFuc1uGP20aos/0AVOObd2CeQOKXY8Zoq6OPZRwlp2PjO71bxLE8BqWDha42bmRqzrp8UFzYYWXt6wc2f1nKlzucUelk3I6v6bgUz6jiT9IflmOmo9zUi4jVepudvtZD1etB8Eb8K/s5ey4a7waILLK0kyg0ywtD7ZyfKb51OXNcr3HDZrRHHHxzdAZ6yZ4971vBvpjDLOtJtMVLJxK42eXyzfdAD9RC8IVx61NQEDklcLISj3ne0/PlJ3UqGiK5HDWXqsHxUqHrVau6D0vLdqxdzJ3h5/ctq3ufgnBTanGsgMmTGDdRkHBFaO9gPdg94k6Lno7hDo/Iy5fg5+yigA1Kjv30z2F6n35//tLJVHTq7B/TEYN92ul4RdrZyzsld4jfHtxZSg 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EmN2ggWph79Qs6u9lI7yeJD9XGhszCk7QF6oEu8lpZzXo10qS41sLTNGYUqlXgeguh5xB4B4zl7bdgdT8f1rP/UraxjREBzo3FrAkaUpB5ENQMH2zE8vKUMavCnM8nJb6lrmFWJMM888wumcGv6AxTEssWYIfkyyHKJ8hiUTg8ieXLsAYKSmifDyaetL0bCHMb3DS4/a+WAJXMdDmmaD7OXjbx4/7KNFZmNkvjVYBVF/fXYduU7F2MuWBjTwxzDjqod29oKhiaQGO2MlmjN6hA+DN4qeaLu9GdW+nwEJOvnwDJO2kdWaI93Hg/3je8JKhL6T67oFp8keLT6GkVvoacF+Die77n5zTIX5rW2zJBBSPXwDu3iqn7FEylGkJpBJLiwJVxV5FYwGlw2YXNZB3OxuJmsYzeKRFp3dTrqc3e8CBRmcFnmR0ckmq83x7hhNBThXCpcHKb5mbBrBbPsXaXekHTU2fnF5X63C/zg+61U9VbhS/MFiIILXuEGWAdUS3e9xiBRMzQbvkPkUaaCETgbA+Obow1dlm+Le1vqg1B/Me8WctdTlhDrixgibmBy0JYPjdQuVP+FZfIld0Pv7l1Qm4AZc3j/9mrMjcqCV7WMEf//i6Jur7YMSIFQQDEmykSsRpIL/xZNi0SmpF5sl72hmtdIWNzmr1WPRYsJstDimLXxovSXPn+ch9fkw1tqdfrPu1CAvo8KozwZa2UBnuxLPaQDbcLKfMXtc2IjSzpUSQ5CYk0e710772lpVuFDjGSatd5Tvq7jTXn6LiME2nqNUUO7PPCXyyozZ6Np32BfDtOY7qYYoq9nhBOMkqLycOuOT47rYz+dY0bsM0zJR/PXaKrGms8l4sH3cfepUCafZ1WhDIybTERVvLUGcitJ7y8s44gJjBCYvDHTWJVHALg4fPq+vaVAo/utX3CJruCYdROa1oQTy/KhKBHGor5RAEnD68uXWZ5k1syAU/wfcZYBuUnKssDnV/gcqOXvr9wZ2v+8cgzgy3WhjmBhsU4P8XCJ2exjFgNbnCEHb90bfrC17vA8/HFfv+IgGuKWzFsuSdE1VqPHHSuJD3lja7XVQw1zkkxCe3Hdd1deRzb1KXtnZerp0HAPxL7i/jYmypuAKDgbAF/6uqLKj9kgbOhWrupyd+zoDpuD2H/73mhJ8YgwBMt4wMZ5wkmCIOsD7h/dxOBRxZL/9iSpZkqbjJ6zXtbU/3dPtoFlc4e7IG+TSoYKU75roy5B/I/S4zg/g9kxrQa2/Vs1Qkt54nyvMzLtfAqc0mIIz7f9/P9J8X0fEXUVsgCyrAU5S1As6DR92FzeY61Q8yU5c8DrWhaIabtbIk5RNstlV2X/i6Gx3Kbe3sPiSPEJHbj8rbL+7NFndlxHF1XM3ewnT6j8uZ1XhDtenOVDgneh1ngVDhlOSUvLBVZ1MkQa71SgRMnfSIO1YKXsQR6RSpnB8s4srPBKoaalEg3CczOMzBhrKa0HFfE9naEpldr0/3BB11G6KegOu5qVM0EqK/0LjBKep7k/n+uH8nEqKlDUpZWf0Ld87CYXWU8QvoYT/FLycmSS+lRL6UF76D45LaIAiVpi+rkiKoDA3KaaQJxkheB+DvYZCg4nEj9Hhmq83IKmUTF5D4oAI6x0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: aebcffb0-d1ba-4dda-e5f8-08db92f37588 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:57:35.4803 (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: 10s1IpP0iG4SfPGHnm2ThCXAW15Y06GB5dMuS8NNuUNwY95zQHpYqpk0Kh7gzUTYdr7GtynLREQuhr/Qta3ZCy8OF47J2PYc0WNJEw6IXfL/rCoMISB/SsB2Xv+tMQgi X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: H5D76OBHNIO72MSLWMSQPVOZGF2U2BOX X-Message-ID-Hash: H5D76OBHNIO72MSLWMSQPVOZGF2U2BOX X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto 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 Wed Aug 2 00:57: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: 13337465 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 EEBB5EB64DD for ; Wed, 2 Aug 2023 01: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 37A76DF1; Wed, 2 Aug 2023 03:01:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 37A76DF1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938150; bh=nYOwFuWiJCbcgRQuZbjLy2Vwkck7OT2fIfXTzId2KFE=; 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=VpU9JyviY5lQyoqlZS3voW99h4g66qrPVQ1Msq5d0NigwEFeTEQRIHWFV9b//OCVc QWaGSE6NJhgtEiZ8sPGAp/l9aXmDnNrQOxiG5IZqecKRKP/6MXYXGWSsGhAj4ql9k3 BrUG/UmzC79D6fMqdwMeFFJcPaV1mwVWox4xXli8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 04BFDF805C3; Wed, 2 Aug 2023 02: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 724C2F805EC; Wed, 2 Aug 2023 02:57:53 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C9864F805EC; Wed, 2 Aug 2023 02:57:49 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20709.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 5708FF805ED for ; Wed, 2 Aug 2023 02:57:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5708FF805ED 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=mak2Mmv6 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QWfWdx0ARSZ1O1HZ5EhvBQ5nll8/tYSTiRxgQHrXX8+TGsGN7mUjoX94bz9I36TWr2RVhcWQMLk1niBabyTj/QIH1PcQ3AJLIT81KNjfGB1t257TSzt8j52uKHgMkW0w/qUdGBpoSm2/Mzk3as/qUtU7B20Naj+iY0uKzGrBYDhQ5C4sxipdsFHrvBaDqwPFxsVV9LvMnCIklO9GhVFOTfWtXmXVeW7E+nRD0jVQ3iyVTHiJvGFlprhZYtScPzc2RyQ2qlPtPeCLZQwnII55H9US2HdJ0oJDAxrS0i0BCIkpIqRiarxRJm+4k6mTh87t7foHf7e2jwOgGQ6X18MXzQ== 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=dFzH5ifI5oKBdZx3fXCsCJkFtncuNUByOtrVnkvBNYI=; b=ezcvUTW2z7BSP6D0JDKwvHWZGrVYZ+khk2avPRvc6WQiYAOcWufn4r8Prxd2ZARXJ8UW/jD2DKo0Xsimymi08iKfI1NofdnxPxHazGDXel9Ryw7X1n4rzje01zLeWETNleyCM0hP76vV567CwQocmgeEeOL8xHKCs7ZVt1E8dYZlZox7eCz9DdKl6udrHli9+FAeMSoxN+Cm+ub3B9uIoxHYDnnStUBCWAZJQw7GnAd4NUbazEfhsV6HMUb27cIdj/xLk7B4KVVqTHi82lXbJlEhj0aghTKZV6x6MqEK8ciQWwP+jfDjR3QbHK8PXEjRWsRIp6XbmI40rCPC4mcZqw== 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=dFzH5ifI5oKBdZx3fXCsCJkFtncuNUByOtrVnkvBNYI=; b=mak2Mmv6sR8f08sJGCtmluQ8kIUCQK7ejgnn/Z8qIsx+Nu4EhvFb/g16/PuwimRVPukv6a3V48JAQvKeQ8ELvWgbwttNjQZAqLiaeb0/5bU9V3YdVv3xK9Zmer3NwdwVbmKVEBxvRt6txQlTlGAhtGOGqILz1oDLlliBi9bcDsM= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:57: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.6631.045; Wed, 2 Aug 2023 00:57:42 +0000 Message-ID: <87zg3as1kp.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 32/38] ASoC: hisilicon: merge DAI call back functions into ops User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:57:42 +0000 X-ClientProxiedBy: TYCP286CA0223.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: bbf443fa-6bbc-4c7e-db87-08db92f37a24 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sdq6beI5goRNZw10iCf3ECxSwLyP0RtPbC3IEBnvjTD8Ek6/geswZWOyceNVt6yrPGZxeoaWZBTTfm8tSl0TyXtHc4Et1+n3p4BkE5uEWJscU0ZpMgSBjSBrHtvKb/8a5UiIF2R/6s9a7SdTPXgv2eSS1gKTx0RRB1R+uDiTALCeVNCOPU3Xo9kQtgU6rNSJJklqkyUb6hzZg01g/lZIKZYPF4c4HAawBw+sQqGPZlRQaTg8y3hvVYTr8bii0FQ2v6Pgg5sLGsBLc9RtZXZ3M5rqFvCG2AsVdFNBbt2U8Vv6pogISi3PI97mMmRoxOP2K+3Rebe+vLkdNGHmSdETCkBoJfnPXUI+rjjbadBYctSpdyXLj/BWApePHk9MbaQAl2EXNLDNItpuNhaoNEv2/yAwmUzGAqYKUZEr1+yU0uWS9tREqjb5KL7tbZ6kPOM8Hf27MTd4ADt+p0B2vemoSnNP18i2cKa9M2aDVrNfsbCRQsz7GJqHJkrGKcmwBgu2rk5LvSEIiCn0nUIuj9o8dNsNksHHVSrsEiQJMDlFn6Ckfzf7FbLzONEJYcN0cUomlZyQdj7yISwqpOHihGQ5cGWml/QEHDy1lFhga6242OSb1XkjZuucPkhzLycS0gRM 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(4744005)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W+Yjr3bfT+3/oSylbP13EHGTM8zvriXWfE+fm8J8FNiCfGw54Ykk4iWKlmxaLSyZIEeaoiszUzxvCAGOI8yaQ9zVHdXpJTZLB50BLOknGQo4s5D5DV/8niV3CLCt7u8p0k69C1BeOticPLYGUg/XlTmCSUvlZ5aWBM+apyPOhcZ0/SSKYpnqsw919qqAUM415EWpHvZ8LHCffZCw+ZoIlNTCI0HbpGkwZ30u6cs4pS4/9cGyx1FCJ4hihyPBm/jCGAxUl07awOJecOGqtKW7CR9J4NGA89vzgtFaYGQUtErx9JEDiUcGp8TlPsbpj874NrE8570dDuQxf0if2WDYeK34zAaNhgwmgx1pYJPt1KgC4C6QzLRS4H0Xnuvf3jJBguxIuni83AR3rrYbtOrq73lnyszTSHDS59Vuolk1lefaggWDGw2wVxXHi7JlbJuuAm9Yze2q96kAoN8Gf2TMfP3d5BUcJYMJ7b4RNG43woDLUh3T9aiybwzPKJCZlEDzid9I+SftxsYO84gU5DI8CdXrLcVYzVQKtNJVjalyS6C9acdf2MBG94O+oITg8mREuMAVcNk7y33ySHbbHeUozc4KVoUfdYz/xSrQfO0OIVKdc3OWjMPXGkQhP3x8a14+gNi+E9eXxKnCvrGMMip2PbQSSti5wpWgKeLcttumJ3gnWB85ehZk7GW914rLAx5BwXqeUNSr5fpCvCf/BTiYsi/SBOUBp2lq+tMmafLKrgC9KGCql2w7v8nrkD9SCd1avXe5MWyJiTzmQK9TAWWZwus4mCSqxBC+l++Cct3t+5UXEiimc5M/IwDQOHBwt4Xkn/zDzdrLrwF/okzkSh9/SQFaOwsP7FXIUQCCQ1LhB3fxpEoDGWINp65MwZgYqQTWmzbYc56Anq5l1nT7Dk8YobCzZeCFfDUD7L0VWx3UC4vjABVGEfdhu3UD3gNqToDQE+bEsS7f9SjFoWGi8Rkl9c8LjINEExKbWP6tezlV0KXfapT0C+jQnQUonUhT8PEFqGtRQz6RigQkPLGu+siuVlUcAIPXS7KATIoazd2/9QD/Ztnuf9NWbtmjsokO+xNxyzAMZRkokRql9Xi2rl/tAYAHgRIZU9TXaHyYevquKKXIvCwB22rZub1Vnl922dgZoc+yr7EsOMEJERnocbnv0p9ssH5OWtFkU/3W3JweP3JugspgC7mM3YJzNZ/aElxMx5eFjesrJUuQ7fy725fQouxK+e4qulkdZ0o1ENR1quQZ5HUZxKyTCgmWLo83MEnJqAvGOUT32FPTh/q66RloK6k8/5MOKe3aqFTNivN8wn2Rp/etFpaA7WQ4JI7KjzOoziSYFfHaeDDgoEzvlb/O8uaa3oKZapnBA0nUyrA1OS0F3ke2at/rhwqxMDqknvETVfYZZtsWY0y5jMEy97Y4pBI7IGNgY8jG1g9BqDQ4PBNzNoBVXSAxnvQDhen+3pvkp1rgtxlB99gAQ9qhXMpwMrdEKmoW4PvAt5Ffrhra3/It9phRsZeJ2MIM9uzIjHzyC8Xd01NvRT8AC1dFhGHJSUQrk3MmvEeqmX9mZCPCxf8f9dTn2jv5Bbd4B/hMNQaPkoWV0ek0lr4kYtm4lBYkplKNwrcoXrYkh1/6EZGcbbE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbf443fa-6bbc-4c7e-db87-08db92f37a24 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:57:42.7917 (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: YEfbM3KrDUHYk5HBOFgRBnFZjNcSIUoCUUDI6X1GiwsEJycNjoM+ePflw/lXVK2eloymIWLFKP7XZYdOzQukAlMOmOaX1AGN5siAmHts5hjHzrDI8y7ZUAG3OU6hdkRK X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: PTV47EWKGOB35W6FDJOUWAKENT7G5OB7 X-Message-ID-Hash: PTV47EWKGOB35W6FDJOUWAKENT7G5OB7 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:57:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337466 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 94AA6C0015E for ; Wed, 2 Aug 2023 01:02:48 +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 B5BADDF2; Wed, 2 Aug 2023 03:01:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B5BADDF2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938166; bh=8Z/MCqsx0h+DY9c0xXO8JS+YaSBYA8vMVgQFs2ituRU=; 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=LAIB9Bz0TffBBBo6B+QfoU0CfGRrrtY/VMLiKsKlax2SYa5NDNWh5NUjB7cw6a5Bu sGjgXYc9II4eUFN35QsTRmABepqf7/6cgD6HPFc2qrhym7X/uyCZL2uni8ZpQjXXzO rc4LUk42Qa1ILLIMTRnslfVDmJwROe7wnoZmGuEw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B92ADF805EB; Wed, 2 Aug 2023 02:58: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 1F7FFF805EB; Wed, 2 Aug 2023 02:58:08 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5F5E2F805EC; Wed, 2 Aug 2023 02:58:04 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70d]) (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 51728F80563 for ; Wed, 2 Aug 2023 02:57:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 51728F80563 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=Ts3gqutk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L6PYW/rjXBw2apcIr5VvSp+3bTab3SuWgFWTBgmr80+wFz5jKqd/2PO6d8fLEv/W6r2ffniwVFHVIjRDnjgHKPgyI/WNSx3w/eCljKgdPZ8EpgMxQnmagfg51bNFioRJky/0LAHISxLxvGAErZeP+81gs42DyVKEDAMso36PDPGnJEWoJa2aNYUksH+0FI22XYBMxFiEaKFBO+YuihvGhmytc9ML+VZB0SWTbJjkjvOwzoxStbgJ+jhDZ9Pj7a396T9px3DNeKwASZ5BI56pASNHBELuiTVdkB8/vbM+FYYDG7xKKumeDUHSM0k+XANL8uZW/bRekwX7pscSS1OXTA== 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=sKLP9db6c9rs5TAktt94Gc3j20qrM7kQXp8pOEPBIcI=; b=EmgLiWwPIQvdbZuQNIvYgDZ06cJxYRkqJHZ3sejllADbCr6veURX9BjDI0+uCwieeu1SaGOVP8G3enwVhGDYlCQMoOhArXK6AbN5P60sW+BkcGp+d8f9tXsmc8sDutwApo+g+yxfoBm8HqQVHAtXISbHjb4eA+FSNNz6HbnyiC71YkpPG7LQ5aqWf97vREG6lYGLzr7bFFhYpeGWVzPQO8Y7bAlOWvfnT4BgJM+ftNKZ8o+QsUUOdBUKqD5pj2Ib9Okr4xWbH9npYmdGHarkKqeiR2EK8fR8yKdJvtfhGGy8KDRlX9t5mZ2Y1xzLkrvk1KiqmkmUJyLcYDCmku4Bnw== 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=sKLP9db6c9rs5TAktt94Gc3j20qrM7kQXp8pOEPBIcI=; b=Ts3gqutkTBYWSoJCbLXdf2fYeeWfeDJqMzcyaYjlGnE5SS7ofAqThYS67ivLBpgasI0xRQiC2Aieur0t5Tf9UmUEIklHkmrWdGMxFvl4UPuXH01K2+TsTjc1MtAwz4EvAtzcScoexcp0/SLaaFxmUmFrU8nPOZ+/TPodZl+OO/4= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:57:55 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:57:55 +0000 Message-ID: <87y1ius1kd.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Uwe" , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH 33/38] 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: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:57:54 +0000 X-ClientProxiedBy: TYWPR01CA0046.jpnprd01.prod.outlook.com (2603:1096:400:17f::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a8023a2-88cc-4f38-920c-08db92f3816a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eMj045X1fW3xoAxLn/DTQAyE7ICr+y3LHQ05hb4AdhWzNhuHQnoNLO09tiXn+i4hpMOb8COHy3N1m/w/EzKxRmdQnCqxV45QekJi8dGVLDawQpAe8fHCmGUq+VhMPAPmw20/VM83ctbkVFhM3GLOSkH0n4BiNAlcczwRqhPkHsUV0gV963Y0pBfvuYYBzODoT/NJ4H03H3cAOf75+HC5tA0HMIG15ApRtL3HCVr6p72ijMxrsTVHYNlj+9kVpr9gS4uhrg/e3VxsAXFN/iQHS9lvg2+B2XW+QuW8w8esnCHcwtnf5cVo78dU+y7mKx1EMCSUg3ky++VvqOcPV79UjpS09WFIS3xBV2WZ4W2MSdW0CPXsqDTS9R9fHcW9QzyzW7QiCfOnY4QaWhlKpa2ogz8dWYg0E2GPLn09WpLQoFOd3Zlc0DmnL677olXBKErj88VAyNR2zej6Adr/yMhyIxJkRoubwJoolgaHc5zVLqqLNwhlL3NtBmayv+94k1wodveBcO2X+MiJO22OBvv+62RvX/k61AvxB5AOsqLWHCL57W/CTUzut0EGCI2Y59LmBl4GlZMk4hhH2YGvx38dFgTbTilJx3e59qcHI5GEPZ8DpAvJJQbbycOM9XdPOcwM 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2SJ0JKA96k3UXhYwru4L6vGtLV4EnW8xlF0MM7PDTIJLYdeGdmkOF5xF7wr4k0GLNKfR3U6I47vAnjDVkHOe8xdlVIrytChbLQiroY/5HsJ1NkvTPI6IX0RIgUni3uCNw4dCTO7itqb5VovsysjYkUu9zUxABUQEd0yHe7E1QR629Z8S6o6Bg+M4BO7GKLgTIbBtm7NklojTp7Yxq+jhD6NQqh4ph8K4ZOKiRmAEL9o9B1z+KQ4xBvthbtBEbMDe3A6HzqPzd1Mtap/0vP74Ex/hLG4yV0Dn/A+llNrSIgh5BgfSHsp7/Lb9Bv08sbVBYrDxT42Dhdg6BEilmnNDaCkqavCS+dTxO3p0kJjMVDtNLUCvYYl6GaVSbmv1xRSbftYD2w2iHb7IC3Lc37zxGKVA24kL5A8CnpbUn2KhEWP6jBIfyyCZNOcpLE5cVrWWG4cJyN3j4t6qSUT13VPmJ2cEvw9zBkvAd3MG8biBAWVXVhBCnKajMn+dcyTAsO122VkgHmkc5mvwvB3AqYocJTcTsp9/MYmeAKdQEcsdmjOoTRvRYGSPU2qJ2TU9FjJM6EvvZ2szXTDwzbYxq0mpvdF6sVfae/vxU7kaV/azeNhTwocVG8AnAAfa1pJ+2VUJD2E04AaOja1Tk0h5V0IVwvOeKD+w7z+hQQjiWojB17ixUpunQGXYD0biR8FXqApvaXI/IoFr7SaXNVNBazw9eUpVAAVDKftpeRNafRN6BpJ4lAY66cDTaiTokmkn5bWLBhwo1YvNA7jFMkcY4M3uzOBwsqdx8mupcKbwCN1C4jCrw79qlhTtp7xl6d2ZRQdnHy2ncMtouEQJEJsaaUmtqudCjmMFv/VurhDD5gUa4MNVlDbNsJ8rQC2w8sP+gyZGqyuzWs6130Kmo/Th6smsVl6EZZIQva7x9IMl1IcvonJP2zhctI8y0YOeLwVO8xWy8naiXPd3yi0CLE2CWYi7zxxZdUXA8lASYI/XfGnbtGMi4TPhaWGor2a68w/bSKIKE1hkFsUienqUznG16B2ksMrCF5xrqoGTeSOveSocGIY5EooEksTrs/5ovFACYR5xcez1r4uRsDFm6DrNUvjNqbY2aBoSh4U8r0wL3FtSdlRqSW/PeLAs6g86FE/G7ui80K2C019+DZiZuwqSte7pcBseC5I53t0FpNr2QUH8uNm1+1UEPpJJY1ld2tROZA490xQwB9D6VtU5G6ub1tKn8xqZI7/GwxcMi4s7Q4LUXLO5nEwWMzI+8n9Gqjmf8VxXzKVa+0fMj/oYU/toNmLnjmEnsfXArQ4bynLIuiDWgMthfDf4OOSHCzWqTqEJSCMkCNaXO0mus/UK7dgqOsiikFzVmKhbOvZ/cVdulazfWKQAmIPzeoBHLBJVsiT3J5BNAY6Skx/kzOWV2pQdYFvhtICXL9hyd+I2ROvjOCb4r9xAgGoJ5ZS6ZsBd3xKzB6qqNqdpDaFdEjIQsKK5iXb1Q2P+uFKfaquh9Kz++5984U67d0DqRsWIM0RLkO1fLKcu+ibufrlTcYuoSR/Wr+8nq/N/3u5lZ1PyvdM9TBaHwYnhzj8piNvqEng6JaIOZZwyrlxZu3ReAupBcHUTQUuqBDDiCP9BY3Ovr/mxmkTdZRU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a8023a2-88cc-4f38-920c-08db92f3816a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:57:54.9893 (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: 8qY5T/GiU4QBNvFrjCQpyCPoMB4Nq2+lX19ZiClsi6TpnHOI7vhmqIKDmWyFh7YlDNN9/1tknne2SBnCmCZ8v2GtjdkNr4XNceDHPDpGtCRgfP8SwDWRlCO86PeCER5j X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: TRG4WZST3Z37TVF4D4JXYZKDSWFAW4B4 X-Message-ID-Hash: TRG4WZST3Z37TVF4D4JXYZKDSWFAW4B4 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:58: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: 13337467 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 907F7EB64DD for ; Wed, 2 Aug 2023 01:02:59 +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 ABE2C843; Wed, 2 Aug 2023 03:02:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz ABE2C843 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938177; bh=znRZ70XZ3uTi5nWOAuR3lDzx7+UVot55o79pDh3qtgA=; 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=tDzp/1OeFgb+AXKzHKFbT1Gp50ZdlqXhRjtYyn8myEBzX8Yd2po5/RtC0zs9/giyW yf+bPpfpbceGjtv1BFZbkMNR4gVmFD5yKXDI+R7Onf6CIT7DUrcz9B5t72TxMQsDBX Ogs9VrhSmbZQ0coq/U+Wz0sJWbANm0CcG05u7frs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id EECA9F80679; Wed, 2 Aug 2023 02:58: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 BF44EF805F5; Wed, 2 Aug 2023 02:58:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6220BF80676; Wed, 2 Aug 2023 02:58:12 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20713.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::713]) (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 EFF48F80674 for ; Wed, 2 Aug 2023 02:58:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EFF48F80674 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=YOrKu9qs ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iXkcusBzt795E5Afw+ABMHJUIYUUvhcHqX9vQol6a2/ex0pvE5R34n8Pogq+islzhSktxpWH0AaGErSw7kWVvtIhFA3too/je7Or9+t9ktI1JRD7/KwCj/FhgBrqlXJSzFYOM5ic+DQmfGr+i2FXG19dAg7YWaassz3QF1j8OHnlbnmj7ks407Sz19CbPZ0LXJaq9F5dosrJG7Xr5OsiwEkawfdEwytCN6ETb0aVk/WpjPh1y0u2wqlZAqzG9ls85fuIpSed1ZNJxOu+7wIp8re3U6qI+vGyGAZtqQdbyfVMr+rIqn1Zdy7asFTXmnhTYVPlQatE1+4EPiYs9eO8CA== 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=5l9+3PYE10Zu8KbbJceCAoaK4osex9ObXRpCr0zVUo4=; b=HKCgMULS+3WHHaeEG0d0YAQUxAl+Bl8pQWqrbZ6nLl/SM4V0exDqhSsCnAHusYqsX/2Fd7f91osL6h0RkVWyRrVzUpx86p9tzjw2jEPFSarxmX5fB2KxcAXO9qJb9M3vZUTKcWn4kxq+X5rpnsKv//utAShJln2a1FCutyBmxSOzkNd6L1uiDT81b5/KaC8xhFeFnr0pcQVHmwevI9LKUtD2MHiCv2+gvY/1GbcraSFBs7fE2NUa/10u5cZlVvO6eTv5sc0T7UVyN9u2LrDbsTfWbe2qXZHOwEj0c/MeIMbbpkOfOLJIlrGVhV14WMSdwC0evANiw4znYXHUvY6rQg== 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=5l9+3PYE10Zu8KbbJceCAoaK4osex9ObXRpCr0zVUo4=; b=YOrKu9qsvMa3//oiV/T8GUiQKNzxFQI8wzOrQUu60S8ngFiC+jO18uTRDQA1pzXEcAC5vvXYpzXAaNRyM9xBIqLA4b1vrF1HK/3PofJmF6uKolg+8YIDMvudsYuqvYeFWlUrCWYiDK5/NQKf34TgI2QTa5vVctylJiO9fWVVidU= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:58: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.6631.045; Wed, 2 Aug 2023 00:58:06 +0000 Message-ID: <87wmyes1k2.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Amadeusz" , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH 34/38] 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: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:58:05 +0000 X-ClientProxiedBy: TYAPR01CA0127.jpnprd01.prod.outlook.com (2603:1096:404:2d::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: 9664bbb8-2724-4d2a-f4b2-08db92f38812 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hD6M4O6K+T3cIfACX9ixzcVnUCdrc57PW2+Gyvr86oycflyuA8ECU96RkyKA4mB+ZuGELyda7TpYNm2B3PMsBKAiLz3QnMeSNmZk59/YTSLcu04rxBRQgRQPV1fLrWOyJhIvWvEBtoSaG3SDUdudewrn4ppWPeRRXVcSePIIbdABjqoiZTxant5w014+XLbVp0HTYPLbkxjvkzaZaI2di/IoHIKz2Zu4yqE8mEInZnbdPBml7AvLIJevRq/pjcJGgB2qe1oOVglXJd8Pc281wf3KLhykZ+UaFlroMBwlo4qFScjNHHXDMP3u9MNE+sPzp8nNgC+OZMVUWe3HlwsH6KnAEzOS4okzkwghhGKPLwdNSScPSbLx1wCLuDrJegrzyDsHxqr2rUWp6JERHP7X53MN7zmAQMOC2vPDWOID0HLw/4SNr42TTKWDIPrY6k4GYo0vqDhD7G6YPSoeOdjbU4f1HvumeZlXi4TR44hlelef0JAhtDMyAWtEqPaAkMAD+bhC+WfFRw1smX2cUk4EylAufuP730+sQSLLRu2sUPCOunziPOxNX8w18IXYIAzK+U38PNrtoRG2W9doa46/q2/IscqPu1mCu779twmWSgw1odVnwE+ZFPAuwrJk97C0 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(4744005)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KELi5geRIbgCm7AyhaWD9ZZUlynmo8hwhNhLnm5D2UW7VRqA64SlZrtjxqQtC1CzxjI+LHeJ9+HR41e9TCX4ynaS3knLkKQFTo79KS6z6+0qtWGkcIB0+E6w6eUAj2IwYx7zW0m6OheneINo8z2TzuAUrlroCqiwdsHgj7npaFr0NfEDqI/A8Tq6NM9dmYz1VvBSvM9hlyoCSt8Pv1uaIsd2RruEgGwXsYts+7GN7cFNlo5lVM6W6Y+bxXj8C7qz7r/nVQ8SkKtWuPKrQGjvswENwDQ4D2RR2BbhIZr4l6YGE19HaXIyPKAJJYEWd70ro9lq9YJ2q2usQAQfItKdLoytILfo/7JwrR62dwl3Nas52DOQI1HKlbGtks05gnO194JmxzwPW3dTnu6Y/WSqtP/JoGzDj2qpb4AbOIthPEerv1yngA/NLAZj8I0tz0T7sxzPirtBC85iisyPcr0jcxqJTd7yQZIiHZPKcZ1yheBtyG/G63bEEyOojhYc1A6J8KZwZ9lcyFu8jCVPlLHjidCrAVMwv16pDLIVE2ZG0sk1VMibc8yT0Ubi4Fe5yhZARYaTtdcFGz0HuVvdCvey49ns7By+KhInNTxpftFnyuaUhEg3qNnbpDvs6k8anVfAHgYaDFObzaAGgECzeLBFFaKZLrytY58gBHOQCm4jn3KJCndxfR940ywhbCSrz25ZBR9yPtwIHqaTRUzwWc/1MP9GB7kAmzGkLJfsXo8jH6l37Z8mq+qepDl3ggJ/nDs48IKH+T+88IEJbE5nPfhKA2DApdApNGc2D9HI9J3700XqIBQ3CG1O7YgxEZ9jA/qUKu5LGZshLQjBecWv62RH5RXPXn3eLM5XUrwwJ6eW77BC5eC6pOwFNRFcSb5ud/SUGQigmB7r6p8i12eK4nWZl4zZ6K63rVRRd6AVVSUhR7SJhEt5uzHh6CDrdUS1NdARO4FkmkZF69qT2RcXFzywhS1SHcFuV/hM0k9+Nof3Il+6RN5U08Ic1N88kREO4jxNvUDmA+48+BZfS1FlpURpcfgA1c6MLD3ON04Q7M9LJIv0hNlRP44w5Tea65eUR9l7/YneuZ9wJ09DFiABObxHYihP9JSI+/EYdN/oSgK91nqDQitN/lameyryjZFlGFr5IKlen4vghN7RxSyBDVsVwI2mju38T82xzQzkWbhkI4SdmjDsz3NAA6RUAbPPGu9QKZ9t4Gk8rTaurRoiMg4ghBLSE0FD9cakP4MtPtLazpCD74REVuOiMTJAsN1RqoUiN0/B/FDSLXzgv742nc+4K5zOODKCxYvDQsEFICiZMFqTvi08rY/KthGVQtnCJHTQ5t1lc/1bYXjar9gtTh1HAMOUUEAw+APfCHTdWecXCibXTDb42Q5GaFaDDsu2cruuVb0smJ5nWCrIPo/CY+Eltah3e2Q+1ZKIdHmHQXhkDLiaiteeCWyG2Y3XyFH879KzrvEDkR/ZPOiJa7Ye3Q8hKfUr3XcNhrGQaxPIQZHB67Vv9ALZ37RA8FO9H9wybDpIRsXyk97zpPvSL5iDj8C8E6UJCyEWkkXV7UG1hosOUnIkO7BGlDFXGYR1H2Hb05w7BLcsi//sqocOffQ8tsalY/jRh1u18eRW2LLSeF0tBUg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9664bbb8-2724-4d2a-f4b2-08db92f38812 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:58:06.5487 (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: cMn85h17Goj4RNGXDK283bcczng0GYpVn8SA0X3sAWNzYB7aHd/mW+86V5u6mSzwMjII94QoB6fIvHKNOqoxIDqKWHKdquNXG4xAqbqMbNB3ek7TPxXEjqW6q4Fhrq8/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: BDSZC2DY7HOVZG52XMZJPON2X2IDJUF3 X-Message-ID-Hash: BDSZC2DY7HOVZG52XMZJPON2X2IDJUF3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:58:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337468 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 94C52EB64DD for ; Wed, 2 Aug 2023 01:03:19 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 46CA3DFA; Wed, 2 Aug 2023 03:02:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 46CA3DFA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938197; bh=6LHkVWGNhpPwwUvmXV8FLhiUyfKYAyD/HfNLHe7xpe0=; 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=FMbIbFYkQ14jG/prwsudMOfXum23cXOuwBr0uo1rNmzlB+wZlCC3oL3ynpzlosdpX b6Jl6mLr73nEGKg5w2YrjBii4FhAJhJuvdF+AnsT7kP9b1W3Uue/TjweDI8peT4Xoh HXStCftAAjRYRfN2wSKT8T2k1WeztB/hWtYo/wEs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D2A93F805AE; Wed, 2 Aug 2023 02:58:42 +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 5B959F80149; Wed, 2 Aug 2023 02:58:42 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B418DF805C4; Wed, 2 Aug 2023 02:58:37 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 7F29BF80149 for ; Wed, 2 Aug 2023 02:58:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7F29BF80149 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=f38kP297 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L9ZXNTSfYy5QFAFCx38n7tJDhMIF5FNZVozpkHpEPPOGt+CknscR2N9RjGP98igl5r0+OU5EcoaOFnzZAUbBWXCMBw0ZpGf0rPzBG9chhhrtchuHVig0ssSydc+03f5lk/T61yUJxSOFj3FkS3f3fsl95qvPfMl1SVjjJJ8A8lehQp90EbQ4ti5z4IndNefoVnqCUzjIAm67hyaNi4Dtr9F8xtMOYu5Za7D7VbqtXWY1HfX0SLUZ4XyFAZWwMxHSfxzEcZra+xcg6Ghp3TL3jC79Mz/loQyBv5seMT1Al2MLzHNhrg3xbfDgBnsDla4hb9XOjiltixtE+lV8ct5JyA== 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=9ourL6CKPDMckNpOgMqEQnh8ucAuH8U5TdKTxvHSHRI=; b=XpGqjOOyeLKgEKVhCa69UOWxDGM6nD2AHT+CAwNvBNlzV+7ZyC19JMgS8aNAunPcC8KGQ5FQWX26dsj5nIr6sTr751dU/vjmKj+T9DdanOzqcZ6/Vinzl4VdZ0LvpGfogGTVx+odCCATZHiV+CLVydCYZqRC7fSCeOMaqR+SWo0z0weGRNr7f/slWyLdmy1App+e3H3SyV+2vV+v2Eb/hWbkQvtkSeCg8oznORJXgZcZlKR3OhNO6kziPD4w011mlbOLvqJSJ/wVWUlmY6s1kNHE6HKNBltoXOMj3aAxn+NHfMrYk7z8b6JDao9haQPiSM/lBx9jCaWv+SvICr4ouQ== 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=9ourL6CKPDMckNpOgMqEQnh8ucAuH8U5TdKTxvHSHRI=; b=f38kP297lf2+/1rWM0rntG5aGrXVig64Pxx5ZdX1/8Q9XLJArMvMMVkb64kgUZbYt/VovBlosJd87lG11zRdSqlPQs0jdR3UJArPayduLXJxkMdJVWHsU5Cf7gXLCGkKCX8p9a1JO5epeWmaBINTwklXrQ25kqKwmP/xbKQ8rkg= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:58: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.6631.045; Wed, 2 Aug 2023 00:58:23 +0000 Message-ID: <87v8dys1jl.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: "Uwe" , Charles Keepax , David Rhodes , James Schulman , Jaroslav Kysela , Liam Girdwood , Mark Brown , Richard Fitzgerald , Takashi Iwai Cc: alsa-devel@alsa-project.org Subject: [PATCH 35/38] 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: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:58:23 +0000 X-ClientProxiedBy: TYCPR01CA0066.jpnprd01.prod.outlook.com (2603:1096:405:2::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ad49a36-3587-4448-b3f0-08db92f3924e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o+u7wTgyWQJ7t3rPs3/obZMIzr/aDgMWfNfJLMGfNHHSKTEgfQkxclqQlewiJ0aj1Oi+PsjDqP6e7FyOU0a5ngOMo9SR1cWN0tNSTw9DB+mbro/I/xJccujosjsNGz7yVBRNmCB+pSQ14269Jyi+gbWMLG/s7eEV/DxqAwRmjTQYM1+hfwkAQIvjddpVDvtEpzD/+jEN0WY7NnqYhcqyez61aBvZJF1qi4da952aZ2MDJKypiOFvU157QIiGwUjItHwM+dL5fSymS+PHxedkOILiFTOT3T4tKuZzibJd98n11dDJtHPJIGeIQg51g9XPe/vlcK3ZOk4MjH4rIjDUPUD6LMypphORfwfq5x04PPQD8WQGUBCcOt8DkYP6do3p0+VrGJWurH/w+c9+m7qgRwsSBsjzIYnD+iD6Lm1BKkA58+ejk//tuvD+9PjmWjM53C64wVaXSzL2ylGH9APC+t4FztKBlC6RznsuMeDN2pBtmIInfRxBK8eJ24kqucJ2THYqRWIOzo8HfY75l3MgohH2DJhiS29um7xNOhj1p8vFuwFPcxdz5rkkiG/i7YUYJbXxghYCPFEpqnrtj2lFPCoW1eD3yOTg9AtGmwAtR3bEDy8w514F1OBUK5O5/d2G 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(7416002)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o4SMYZQxhOtbxeY4hLnxMBIep4fFBBL7YDZLqxXixpgur1ylABh2RcRXVulYvGdwU9/mvb+logKbecvm2fi+Guvd7JAsH2nB7Du3mv/VW20SmBtM6rWR2lA2IRJOTeBUDBRMXYoc/RtjKO2bwbsBIGtsYMLIOgXwzcAK0D/zdfbsA6xJbkK3lCybOT7ZJJ7Ia9sOU9sIujaWgY8joqe8m21RKwqA63v0D+tw/aN87T4Gwg7aVZ6akc6f6Px/gmIFRnlm6J3QljnTlU3bZGw1T+2KH2aSE8v+RDYBwujfNenNZxnC740zkFTTZoXLkI5awm5LlOE5sR+qzCYxw036qLyhfMoVn59iCsZcZk0MsmdmcmnYBO2bohtO5D5lNZNH8sY36J4D8cSH1Mt2pPAYkK3FqbsgndsW6Y22/Rm6W3bLm97924l2WoQK92xULgubB2Aj1huEjQJIeJryNcgFGIlG11tGWtfd5L/wLnwzFOfIWK9sLKceh5by+97CefcDXxmn4X4US46QZpEEm0fdRhV6DFcUYhkZ9WLAPBntz2vF1FH/dJqHA1qTUoYxw1uW0lpu67RJ0InOPU9Wjp2Kzzb8nfCjYyUvVu9iPXWak/cYkH36QlbIZxlLYwSvmrvYpVBtNzfpEG6fu66pdOJNIpyGR9cmhrnPQ7sRF+peolPbMKOxrwP9ASJEC1gYizvenzg/nBmRWiRkqolw90CBL6hcHwhxEJRRRez1PcqHnE2HffdUkwUNbgQEK9iPvSyjZuFmcGsb6fsuqDqj4420toZFJVrlMztspxGh7Vsutsh635HswRQDi/6X7aGtz125+aSulE6tL9WkFgX6tjV/LMZ1wxobmj8K6rkXdHIrU6Lt3beP/8COqfWolTPeKQudcpTj+prCTconbV/cLWMdJLKYRjtrSjqVO5Cf1K0X5y7/5FlqJgkNHsSvglWDFlq81vemq2BxCtuTz2xdUSSS37B938JvyfGgb89dudYWKjCypLfan/Yog6S3yZVmXV5W6LDM3LmWyq+YvSCLgDkEE+P0mJeIS8Wh1+N7BI8SMELAJKr0Qstxm2TqHFy7UK68fFoqRIt11x/QWMErzjmHy0RpSCu2Cvxd0X/AuLKNmxlroNfpesk9HHOR3Tv9VLnJ81BMpINO+JHARytY9ifEcksjFSdg7jAbwJm+qOxmPC7HcdescVfpFNOzYZdsdsU1LuaQTq08L1BBW23HmxImFkdwihsIVC02DoQhqdLYsv5lYZ5qzi++C8kK3Hz5fyF49aQ6jsKGZ6Wi/7tXrHToMHWeSYUXzwGfQKwZAU2alGkC+kJnRirVxoZT2Foy7RxX2/HM4tg3oMS+xuRl2rABUH+N/xIFEtmhzDyWFTMox+ZOFsaGP1QkXcc6EJ/3D4lfxX2/L95vX3Zax0cZy3gy0t89QxOmvn7Z2fCX6JR9gwt3OQ026Q2xtG+raHXo1cmekRcOZjwY5RU+sfdfIQMUQ84e3Q8NT+Dqi3AjwwQz8QtMpxrQBA2KsSpxL08pAMuDa0uE2MAzUM+QbP3BrhLVwgYrda9oagfHNU0pQahRG8JY/S0G6Y/4Fy3LQDPukvA9bjRfsc6dEaW5m6NGunxME+ytH307NJdhYHER18r57eQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ad49a36-3587-4448-b3f0-08db92f3924e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:58:23.3333 (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: hQlQHamijOu5c+tRhpQLjumVce7n9/eGFw6ode1OHHflseHlLnHKtmChb2KJXl68ui+KsBTAr8l5q4cEYWOAO+DsoIMJbtRhuZDmzzRlhgDrJPs/TPllRLvfgm7Fos1Z X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: UPK3NXA5Q3FIE777Q45XSYM3O7S3ZXHM X-Message-ID-Hash: UPK3NXA5Q3FIE777Q45XSYM3O7S3ZXHM X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:58: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: 13337469 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 018C4C0015E for ; Wed, 2 Aug 2023 01:03: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 16D83DF0; Wed, 2 Aug 2023 03:02:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 16D83DF0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938219; bh=R41vi6JEkYsKun0uFQKPu+W9XUh/LPn3H/bf2DTeyq0=; 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=MmLHCvjGo2BWP/f7j1dSqM8VQKUiEQK3E06eBSM2puL41VVKNkME6K19jHGwfBIUE u8TBuhnlA2fU4xmJE2iF0c2L3sHTrhbyQXlAptHKi69npE9cOccWmdOx0NzGvMuUZG uWQdUb6E9z07YsZ1TEgva0EWueZfvxW0Y4iXuWFY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7AAE8F805BB; Wed, 2 Aug 2023 02:58:46 +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 EC92CF805F8; Wed, 2 Aug 2023 02:58:45 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 00874F805AE; Wed, 2 Aug 2023 02:58:40 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20702.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 27E22F805B1 for ; Wed, 2 Aug 2023 02:58:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 27E22F805B1 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=VqNjIZV9 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LdM/+fr5sxhQ3Hm0FFfFYNfwRt5fUI2KssXm4TrsiF7C29ot1zH5g61dUYLd+cbBFkzbE4L0iZdnLkp4vZPEFCLClg96kXFxOsc6LOC4w70vVm46rYwVgonQNASWdau9Ta1tlXo7gre10A6QswAP/8iu/TgnA3h6KqP1PB1mGjPyYjfTjR730xMJCMtCySBZbd+vQG5ovAKwHEXYLaAFzPefFzuFCXkTOO5CLqDQqpPA+6WfNa9j6QN8C4EUw6XlVlrnLxFUB9wF4vRh4e4/wgfMKIlLDeU5QU5BAbWpi6L9ejs0P76dWw89U2oRrJ6brwi30EY1bF2jGpb/Mw1xyg== 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=ZVFTNgAZvVXXI153v0wytHlmhRuFGjCoO6U5VC1Hc6w=; b=Dfo62cYhe0dZibMS9+Q6Ap8eG7GCeRB+w3cQCNYDIlevgvLLkeu8shC9jDmdGhfjo6SrfUxFqeiG+au+3qBDkTp5AyRyKiRrGByR8+FtUGVNUHi6DwyAmIxleIRwaj6DhFg3ExkFff/0om9ljvV5rG2yQzs7jVMWKiFKMAkrysWVWy1u7F8qNPV34tv59NCdJE2QmeOuJ/Rx1N2YTKoXHRfQO2Mdcj8+ZOoC78pMsL2EwG4hoGI34VFywOjoaPU6x+tLmOw6u56O89KmOs0+8qOKBDURvk0Aq+qDtqTZ7izCgrKy0mI25iT13lyjf0aIKvSpOJ/UsEPafRBbwfyThA== 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=ZVFTNgAZvVXXI153v0wytHlmhRuFGjCoO6U5VC1Hc6w=; b=VqNjIZV9pZm5I6zR4fKd2IvFCiwsE6WVxV9PJudcrvwiMcrblFoAi9jr9L97DKwrWQeOuEohvQkHXaRQAZ/DAKi710D3WtZ9cFbrABYwDuODjz8zn7HVVY5XQAQ0cAyYd/pbNqdzg+z/HGNAf0RRC2DH4md/qRYiZFJ+RKfdpbo= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:58:29 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:58:29 +0000 Message-ID: <87tttis1jf.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 36/38] 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: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:58:29 +0000 X-ClientProxiedBy: TYAPR01CA0044.jpnprd01.prod.outlook.com (2603:1096:404:28::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: f4a10b8e-b708-4eea-81f5-08db92f39616 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SCiAUKgFrdQVOXkui4KPnTEEF5+2XfTId+AjfWNTJdHT8KEfQZVbXLTn7aqpGeTytCJqPxT6ZS5ERDjG9p1Jd78IvjMmX0/9Iz6Zn2kvhJ+UwfYmkMqUVVmdsO4imylpK8dZSOGFFBEmoklOGvNWr9W3/GVqXjAACvjqpvcgqpMGzQdj02qvGxOXlKI+/qbvwqHIYKBb/qKw9yJOkPqHtpVcjCC2d2mNGWy9cMBpYxIYdwNYie/rFuhY4V9Cu5IbSqhy1Qn4h9DOHSfC+tnQ3QnewevZM0NiosfmGTb6fPzOWEA2LLa6pPGFGUilU99op24hLf+dnlGDNQskMlIUyeJhg2nlo7VxHtRU2BYRnYcv17aCN5/pE9qsEw5v1lG+/Tooxim9BQWfZ9ug4BK2eSIHh2ryOdydG9T6pbGeQMpn0KTVQQjY9m9DoSpZVMLgQZ8CvHTzisG7uR+NEmTHqYKuXVoLebnwKt8O3YDMubIE4ixC/ADK/+1fHb3pcufEhF11N/ycgMc+75NNFJlIY3qSMCAJZ8rhISd5jL96VocQ1a+mMUPx82DrmvFFWsBh/7tkP4BJWeedXuzda3UK5bOcTve+/k+QGQzDkf+HZm+I+vZ8ZnWXg2CSpZFP3N1A 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4Clgf+Antg713hmhTdzcXATAAr4ce3B3a8+Rdf9Rf0LXYq/G3Ker5wy1dbLkDguPQg8vpNjGlMHhzOpWFyh/ITpYCkNd1OLIyhXctegn/dfws2OzImEZLWm8baOjy5KobgpeA0eaL1tIT/5i4ZTU9frOrXK3xDvra9F8PoMm5U1aB58h7FGQXuth7tmNCqqaAMZNaDuYM/KzzwSUy01w6JYXcMSGd59xtewK1tzfkN83MOpefb+HOvcPtl8EDNgm04RtvEk1Q/KzB4aFCn9kbR2K+iW3rCtPluMAj6kTh8+7iIGgYoH+UpRL4mW/xdr7pVuz+xHuS3ilBQNAM3i9SFuzwW/eVg+IEn2eUnHoNTY6V5eEXRcdA0AUZeQRh2hvr9fBXElkgmAJUCDM1o0aXpBbTav7YNFP8uSULu4KbnbmUC/Snjf3pWuVvYe99ffObw41vgBwvNH17+Kxy7p7Oc3Dkck16inh6bn1cm0wUdysaQ50tsvh1fvyHAM3dhjQQ1uz+mJxdhNuepBsCPPm3QfQWZPJ++722s1QtFSQIAfS8ucDCAZA962jSLcvAuIcQVo9mp+VSrweXjGvccW5NDzXp6/EddiLdDhsLIIzEX6rA/wiL3y0DATioXjA2I4lc2AfRSfxi0YvQo2OZm9B1SN/gBVuMGFL+JF1fxM/38cYxb8oo/qBRxa6A4NBLzGS29vCE5k3Ctd4jiR1hIvksdyz2H5MLcpt0XRHMw0e/1/aAAPiN3cctMbQg6lqjXVmG5Vh2agPWpopLb2+7X+Ii2YeThuxGEYOm/Z5fyARJiCYoL2PEtxWbbQsCzmw7gmeatF88wKLUo4OrjmV+Mod5JIpsJSsj0Us5zk3Q88DYGaiWgjq3zCgBzefQ4ad0u2J7TVM61zw9PdN944nIrLQXGGH6yx6ufnqvUI5qVpPKeJfYdUq3IeujXNyZo/KD3O4cFdrMhNXZWQ61+Nqw2V9AHe7mGM1OM8UZp6F247oPiPCwh+348oelW71anmKAwoz6HsllkZMf/su8sTRAgKP5DNnBtj6OnNWViyro/2cvyxb0limr6zov3BOJOAvZOh5+o0UP7Al8g2BTBjeV8kO0yQsRIk49J/2u0tE9KHSImWqPdI/k88MlBe982wek9afUUyt/CdWeIB3MNYrLBJLEjArTlBvH9KlNiy4d42KMhHybGAmvjcJTRcAXqO2Vh1lR5OeEbwM3syVKqdnDsYwBaYDqg3sBeK6JFlgwheMkZz485BJpgGFloqY4sARkNTOTrsRiLVGM0ffQfrIcIAywlzHQffw7V96yblYZ6JL6KgxCXr6/0LAFSoT5grahysdEdegCN335vbkfnetOnQDm04CPgasLkYSkf7RAV3n0DVpmOTEpHLfp1cEjFr1in8gNswJ3WjoZAvk+mCxKYV7TwVH/K6vB2ZPaTUg41d6xAyBWDb36X4xxYi8Ks3I1OC72A+oJbx6RIQ7UbXDDOARxTJ0TEyqKxdJ4lx6IUr0GILNq0hHP3aifb30NHM7nhcag+/u+vQmhPhwdvohF1HfanEh7gi6EPJTE3xNK+bUNr3jseVp05HzSgV6jfJtvy/srIrPSDwmJEsH2Mon2YgbTiG80RqpmB00eDkLDIzehfk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4a10b8e-b708-4eea-81f5-08db92f39616 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:58:29.7851 (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: ICYPuLgeseovxgoMXDCZKQejfiUsBPWvYWk4UoPNunCROHG0j5KwvLttQ85kNila/KOZe5yh2aljMpBRIEngmmQe1Rw2iMYuJ9JGHs0UnnCrJ3osqyKkCfjJwZPNdWEm X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: FPRWYDG2MCX2GUFBEPRBSVRBLXJNERBM X-Message-ID-Hash: FPRWYDG2MCX2GUFBEPRBSVRBLXJNERBM X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13337470 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 2BB00EB64DD for ; Wed, 2 Aug 2023 01:03:57 +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 C7F66868; Wed, 2 Aug 2023 03:03:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C7F66868 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938234; bh=4p4ccm4wIrw4dIhs1wvHAEzCSuNfxLUTJuCkNxNCq0I=; 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=b2Oty7jf4vC65xf20eHQshB2C5jeRERsdjbFQSYZxFT3M9pA3KzShTpvWwfbAPyCQ XesUat0tM5qjaNs3A/34VuQOt4P2EKlKz2idiXof351mNgtHa4gJlXjGQUToiKvvCf tj24aSknsZ+4yv2HZ+mTHb6KqfO9JfG+zjKB87K0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BA9F3F805FE; Wed, 2 Aug 2023 02:58: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 CCF9DF805FE; Wed, 2 Aug 2023 02:58:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AA04FF805BB; Wed, 2 Aug 2023 02:58:45 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20713.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::713]) (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 70675F805BB for ; Wed, 2 Aug 2023 02:58:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 70675F805BB 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=C+qLiuwo ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ch9GFwjAPgVfFy0THQGr3Z0h5VlNTnXLA4G4MQ6sXRu2DX4c8xM7cEjfWQvTQ7hi36G0GWoUQcSNuEfB2OZGUuBSxbZq3Dv09x6ZsT/fAUp/GSitJg/S/fCpowrwgk3mAec244uJZlnByeKq74odCnbofIaRVBOMsOzSG1byzkOR8ZQPFyK0VHFyB5fgAAoofFqaugxdKXwNvZtCvH6gNzRQLpflJS6pdt1hKaYtHObtE2MOWNpegV+ZkOKfFxB5d29M8WhA2907tR9R5uLPCmfmYVREmGD+BmSw/isuaPlMu7iII6aTLjv8IalMVFuPPz0l8zfu5A7shsmSHhOFFg== 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=yeLpTp9Y7XaElrsA13ZN4DBMf27g5zQupQTT0Kkr+i4=; b=G19bs/mqwo/SQ3VhASGa39iMVm7UbVx2GrhHPYn0G0ibq98IhY4uGNpjq5LOuWKZZ0EVRdwuu652TKvBU1Dhhnx6fILAwbati3r6DCF3uVkQha7BDjVo9nb97N0VXYOO8ApvFGbd0AsNRh5GcBSl2ZJ/aJIodwevg4rkpITdAZggP8ZPI2ZE/Huy2O7zrGCRngG0xr9S+qAvS7e8iCyor34vsZzLifsz9eqxpPkwpLyRhe0lsH1MaUrYxmthePZBzc0BzlFHcbZzTgV7U7L6q3hjlYyTuDI6+A436sN+9IFi/x66c94WELdSdw2DXWyCfHHg4LtG1DtxUT+dqP7QxA== 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=yeLpTp9Y7XaElrsA13ZN4DBMf27g5zQupQTT0Kkr+i4=; b=C+qLiuwouAZyKYsLBRX4/8O+NpHx0I83kJ1IVearifTriJXq6eRy/YUvPhO0WY06/d3Q3mPIUmkE9FLRozb46N6n8+8tc6a/eAF5AggOx2JpZa8ZeEaZHP2OMSuwSDgqJlDhu0TPbVfqEUzBjhCtOBt7951Zut9xY3067T1AByo= 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 TYCPR01MB7797.jpnprd01.prod.outlook.com (2603:1096:400:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:58:38 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::e6db:c2b4:3f89:e3a5%3]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 00:58:38 +0000 Message-ID: <87sf92s1j6.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 37/38] 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: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:58:37 +0000 X-ClientProxiedBy: TYCPR01CA0146.jpnprd01.prod.outlook.com (2603:1096:400:2b7::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_|TYCPR01MB7797:EE_ X-MS-Office365-Filtering-Correlation-Id: 1930b2e7-c76b-42d2-5a34-08db92f39b1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ufA8qPunufFuCLOKI0Q6dSgb0RnHmwUZs90QPzVnOgZnK1KdGf6WzJfoD054la8kPyC1CQHBinf+sAXgNtiQcxZYwA/iYv/2rOxeoy8A8F2dd4x/pn+6yjHl07x0+M89xiSeuZfTZKRL4JV9FZhj039EyCqRYJI51/AAF2zbub+4QXvuSiaH+yceycex1X5hyGBpIHoCoN59jbwIQQJa8hsJefyqIiMcfFkY86iwtc9v8/JmnpqSqEQ7L7K8QuzuUW1naB1n7VH4ZDeLa+ENfCtik4OmNMY/6CEuef6cDjwL2GnggFKDqdjoLecSbg0lz6x2JOE9g/7z31yUiCzj+B2bmFJ7xsdRGXGftKwQu/px8rUu3992uawWs+ec/UCURzlJ9izUIk940UiaiwE1MOlm4m4qPlWWZ3O+TOGL6WdepSPwq9zUOW7ttVKo5//CUpMNPtqaoPKTIBmJYvrbN/HDTmahgPefLExv7bvZpDzwrCTLcIv1T/3DUllfPUfJiAgIJjgwiXKqwjqDg/QvUrw6ax8XpEEljTx9ycbdcvz6k9bZN2XDMP/kwemVRFaZYGCMiLg/jdkiJuuPKC3TFFYaYswQiyoJCoPzqb7Gsp7m/T/ad8hyqWXbo7qRm77S 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)(376002)(346002)(366004)(136003)(39860400002)(451199021)(52116002)(6512007)(6486002)(26005)(6506007)(186003)(2616005)(110136005)(478600001)(83380400001)(36756003)(38100700002)(2906002)(5660300002)(86362001)(8676002)(8936002)(66556008)(41300700001)(66476007)(66946007)(316002)(38350700002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GLkt9ig1YI9Cz1XcI7exmqlmatr1FMFhTkcHJcXwqXDNjMhhNQevnP68fLOYZDP0NXVOMMF5odsTBi0s6Bgjo5s8xpKIwT857YjmLOV1Iye28hq/IucdQpb0mfYV3Gm2lS0HsJ5ifDBZNTwvh1G+c4qG6AVpOkD6D+jDubSfrPEEwo4UMaqJ/puh/AdQNUSEes2ftjW/g8pjtjJtZmb9I3wVlhvzX+ltfxXFsgeTegt/WwBcY75guSBRNneiz+9SYfuD3yHMjdmTXbH4G7qjoiEcIV4HGdqGP9UIKTijTexZPduNx6hr3ZdU2KJiG2CIMFNwxcB2aA0vQY+lH+nFeU0zwlpu6vkdT8PXKJz/sGPNLFW/GfDgQg6PL2XDpWmKGLvpL01qoGryvZVd/GtAfidiU2Zf7cIGCUyTH4zRshZkXKCUOcPFcnG/vXWRBKsIzNZ+HKoUbDtNVWsghfH7Chl+wTnbk202pul7YNECYNu8WnUKbPUsn6F/YwuTTpvu4C2Ku+91JuejWhnVajStcJcm4SynomXiq6mmbAxfb9nJJQsGQO7KCXQhPSxiSrIFip8noNxL9NLAaUgbmZdz/eM+tyKzdaguc/Oys3QOXzP5dGzdO3G9+zQxBoyJviWCwqyI/cm+ga06P3xrpaTDI0sP5k8NIA6xCpu/RtMyrF5g60XYZGiR4SJ7Ef+A97e4jLMIzQ8f6h1ZsF9LwlXsezGUFg2OLJpgJGn5WUBNlxnme+3qUIJm+7zi/YIJY0LxPqGSbfMsrQm2FWnfbjbJok76EO+9Lgsf3vRzIW/7ldk1Kz/h9TOS962S3vnUBMghQtOj2n7f5R0H4IEfNnU7S/r98oR+ryi5e6c7HkmkY1ufuGKqU0Dv2o3ng22yfaG1XjypJWekUY6YxmVPIc3WxP71HD3nxH8zQVjTkPlyto7cA5G+IuI4tVkyXJuP5xGyAC5Ia0ro4xbb650ZtDdQZoy3qUW0WIcYb57F7rN2yWjNU9d1RWayqljASd+ZNcPBOt8sjih6TuO3Rfacdq5SeUNud+aJPe2wzy4wJD59KOx5Hg2+H3sfBNKZhIdyFYGuV4kpuob5CkTe3KFfcpZn7v41P63wALf/UOw/ehlh7DIUHrUyaM4in4IRVZrVeWO9Z/gllXupfdS05tS0GvMlDLVnoMi140X9YgSU6fcQ5ZbhY897w+byy6wGR+V9ypbhqqOv/tw2nEDv77p1mCxWmL3NQyy3JxBjCeGzs1BlNK966trflO0RwxcMzqQvX0MSxn5GHp0Wm22bFHu1CjnCi8ViXuwYD6l+Amg2ynrURkJnJEX6gmGPc+yReq3u6rPmXwNqRuAIyS+Q+UotLr/yiWHODgS5eg/TXhqJucXzTA9Mu6SRooyRwoCWNSzTPBBYDEvumnYrdp70l6aI2DRaINpA9hztZnBGBpP0ZLos+sj7W5cStsK8/5/gyYj9yHbFnbgz3UYpY1VaAM9foGZfgJz/JMCijAXcX8MtU3iwYNiH21aYIM15Z06MLfib/j228CRwI3jcDYT/S69AvHAG/NTfxKgZgMloHuVDcsbeLd06qszQnUJ+slf0ZC7iGMz4qrjVmB3bql/S/KK7bAdrMg5rIfDVnZPqPYlWLTJuOrM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1930b2e7-c76b-42d2-5a34-08db92f39b1b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:58:38.0920 (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: pECNyM86/+RFO27M72BQFrUQXv7hpJwwkNDhcSCF0jVpJt/0hCX27n9ECsaMraeZ3VV6cbef1r+0x04uaWDxlyqJNtTI+rnRjNzby0WDOc5ygooIx7NW+QgobB4dC8Dc X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7797 Message-ID-Hash: 24KTJAGUG3PZ3DXOND375HPN3WFOWYRN X-Message-ID-Hash: 24KTJAGUG3PZ3DXOND375HPN3WFOWYRN X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA SoC merges DAI call backs into .ops. This patch merge thesse into one. Signed-off-by: Kuninori Morimoto --- sound/soc/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 Wed Aug 2 00:58: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: 13337471 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 3B733C41513 for ; Wed, 2 Aug 2023 01:04:09 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 52AB393A; Wed, 2 Aug 2023 03:03:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 52AB393A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690938247; 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=GpAYfYiBRc8MvGLqeMV6zDCdnSZF8rpbNUmp9blWESQASc9saBQQs8ofxbtBM2cP/ /+G4e6B+G1ABWwMvWndqFPmpIyshDx0vcvuRVUttTgXiRpxGl0eNOnHvWd8lpgDMru EgYzy0Ty4/prrjUTdFi9O9svPAw8KgKgA+ZzlsEE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 03908F8068D; Wed, 2 Aug 2023 02:58: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 55922F80686; Wed, 2 Aug 2023 02:58:58 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E9689F80686; Wed, 2 Aug 2023 02:58:54 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 10E0BF80683 for ; Wed, 2 Aug 2023 02:58:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 10E0BF80683 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=NqOpMb4/ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQhLNCLAfYYDdrjPznWWNmx+4eRz3Kx9M21SA+IuR9YPLQxWRxHmPIo5+30sJAtZyMrgZfviHG041jMQUThKelSWqtNqliHmkkgyX1O3Gkt4eaGy98eJ2uf1MS5dVppScadJtWqogjw5rCTJQIfuhsMaFleGRIOySdXdv/ilq9Wwvs62Q1CPqqFQjSjKmsxUoWB5cexp8MwHqLGhGYFjdHA90fCRVU2J5yw/Gy+fFXrSJi50H6ksP73i1EqY2TFL8k5+lOkw6BN620rz0+Adfwrl1yc1O3KWilCWxuYQA9eBQRwaxrPXEOIN7Da9ZGmTdiEbDuYvtpnhTn5Xz+q7xg== 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=GU3CkT2TCNAsUQweN8QypxJQuGQAQyzWDpNvx3xx/bGYzh+kh0t+e8mY3mmq5I/9jvBu51K2NNSt+rM0lkpxXgfrnEQvDN5WvBxNjdBKTuYe04Vu6p73bcr2FvSbj9u2ENtF1JK7GtHNnfj1MlM+VD8LeN5EthbDY3+W7ywFCpumHiUIZGSjku03HLnca8bP7EGTZV4wXGdFl3NUJeesRFiaWFhsMLdaGGxp4XdidA0uCFkWz7Zka0Qa+uH+qF2pGoz4tTiZc4aYHn0KdPD2nnoWBpfwNiYJNjT+DnZXMx4aDY+7Vf6IHuh/axh2NCVkwVdTeQC2ZbrBRp0W+1i9FQ== 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=NqOpMb4/0AVNM1V1sjbnyvi30QKAt72ukYiXxvODr/aqUx46v747G81Z+jXy034llfQ0A2Cc7IGkL5Qqz7PqL1FuLuGQ55O0JynFRaqnbjBaeBH3Y/P3cEXPH6znKh18aF1I0PbaQp+OicG+tP6oJEeBDE8xKPg98uhTlBsCxE8= 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 TYCPR01MB8689.jpnprd01.prod.outlook.com (2603:1096:400:18d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:58: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.6631.045; Wed, 2 Aug 2023 00:58:46 +0000 Message-ID: <87r0oms1iy.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 38/38] ASoC: soc-dai.h: remove unused call back functions User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> References: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 2 Aug 2023 00:58:46 +0000 X-ClientProxiedBy: TY2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:404:42::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_|TYCPR01MB8689:EE_ X-MS-Office365-Filtering-Correlation-Id: 1468268c-ff55-4a8d-f9a7-08db92f3a005 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sT1JEYijaJnL6pvu8X/LwhH1VSqE7XdfEfx6fAlABHvJw1a7ivu+ypRgHLuon5NRwdWTruVJMD4ypMXR1LUdPF180NiyQvSdafcn/1UqaC7lPo/c4AUTRjSuFSKhZybq8/diK209s6wZEsQtPkwS6mpGjG/DJDV39NjtAIl0Xi2IUhQ9NYkFFXalQWenhKaJVpoWgN/KUnm/zMO6viRjRwkYtSH6dyhzIMhfpbVDt9OdcIKwlOpjCaQLT5wnxCUoOU4N0tR7+zWPleS30cS0hvuZQ1UvpNyER8MigbMoRVszCtey7VhBY+65YJSLIRUbPgTIyc4JQgMiCSvY3v/zfGtxW1CYonMBIglolaJIXPxmWKQ9ai9jHwIPucoVnJrOO7wFcXjtjZtsnvMj6Bw2H5UnbNso+730vsH7nX3diNHPSW9CRguOPnRSsG8VK9/ZeGzKOLYRvugYJoXB+ZrocYHuetgU/bxOUkrmtleUMm8MaZ2cLLMkzbgGHBRDZoWugBEUcZC+0M70TP9qGlW/J3KE6xH1Fe6VNHm6H9ASgs7jV1mhkrRwXA8GUQ89Xv+t/SynhS5wS8WPhHboayaGLiSI9SOwi9kK2CLnimJH5AfTNLX//BRyP8reYd6NOzz+ 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)(346002)(39860400002)(366004)(376002)(451199021)(186003)(8936002)(83380400001)(8676002)(26005)(41300700001)(2906002)(5660300002)(2616005)(86362001)(478600001)(110136005)(38350700002)(38100700002)(316002)(6506007)(6486002)(52116002)(66946007)(66476007)(66556008)(4326008)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TZVUDrkCIOpaJRrFKQqhNBgg58QG5sfHMiqdylz9XUVOQRIwkLlnpARCnfbQSg/z/iLxK29IAfqqTrIw2xLPAa84INwPAiLhmWHpQwQcTtWUPGzS0qNFCqZ4d0xr8rQG9RPqDy6GHdFb+pQuth15a/PP5eRGwciCFUBgdv2/7kyjiG554Gf8M90u3k6mHtlKzzNuTfTZKDmMB8mu1nc90GNBmHgQ4aW95oeewlTeBOSiViPMejY6ukW6GYNWP7ILCfWNzexujiNNYZEzT/ge21y5g2GwHsNgMvrZihH7HDoAf3hUSGJjvBKWv42jsA4lnUTVa9n3Ek3zyOeg9rW12KwPr/tv8X0UdkrJcVXqeZiJjVYAzmohggY+0+aXdDlUK8C8aKnQEkXKpNYLb+21x827leC4V0+kyTzEqVPjdu9m+IY7yfrOj63U1FBjCdj9U0N+xrYdGssS4NLtquB99r+mXDaVX7sIOaDGEHeW8zLmN1sg4DgwWJt3hoYwhTacc30HVbEi98ibAReFaGsLXq4Xwz1Z+C9LOtvlD5lxgUD4RCcMNM4XbuCDc5AjY83VVm2p702u6HvT6bdIXUt2QU5esDRLVJJOEAW7ymQE7neuhAktYNh+FFEtMuxFSS/1oCdeg8zJEW+bt258H930XxWoq3UOr5aeB6zySb1B3DKk4rmwB+sOPo9DHLEo4rC4IyNrHJ9vL10jKAY9QcmUAsZ5WAgt1sb772odH97ZafYIykzUrEb4YFq6AZNBX2YONCeOCbM8FFsNiykuurH1ArlzleMJKCjT0SoUFM93ck2HjM8MKAZBBbDRfjtCZ4/N+hXp4jDozCKAK0OcX26IEzyX4oToDND3sl4Qd0vRS+SLzv8+91nM4Uhqyp3CYhc3mRp4cFsY69iX/Y6JL6Ceaqd9pJQ+TMUpGKIDkdiPsgR0BPYpctG5HmI+xTNEOicxwSePFuWc6uW9GPJa6QcIjdQWE/X9vgEM0Gfbg0xXBLNYiXIsqy5pq/gWGAqN/PHTRhBQJn5MDhpnkMwaknmWPVmQvmMSK4DjWYC1FaNeEFgj06w4RmeKjaameFVoem6XLu4qCECxsygwH1H/xgADA/s45mujV1P0snxh4O4aPvvxB7WjECTni04xhra/TuLuZRB4RRQ3m5JWs++CD4pTjaOGpCZRXYEGo07mKhnt2/lW2iFz9bKruCsCdKndGgeAN5v42i6ePTE75EmOGfUapnF+4xuLdKA1CeLjXkdv37f2pFre3Si8bb++c5YY2XU4J0DTolicjsF1FIO68S3v+OGR/w9Ns7/1BLngYMcpHXBZ7CGWGXZqktkJivQeAWACIhED8fvoUiJkl/MEz4o9lBur9i9XSZUJr2TEE2yBajowPKsMLnG+81Op+sZA6WItn0oqcisU4NjGhTtFOaHixPAf09Qt/nGjHfbeA6RcMhH081LTDjum2j9b3egIxOzhlafVO5dQQC7hSsdwCjnHDL4Y+CH/V6ep4QiSEd/WNt8yhytRtbGdxFLpjotLf6Gg+FTNKecBtP0XSI5J9jlTvn9h4HbGcVIz5W3Pl8qpQWRr5MifxIOrmgqH9HPdUfYkf38MvRhD7/iLyuR4aoNkarWCUq7ZX27NYFzSSJKCHBs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1468268c-ff55-4a8d-f9a7-08db92f3a005 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:58:46.3512 (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: hBwzSGBaCou9gOclU2txjYMaakslENAwK9mbH9NeAt3PooADQI/YK6JZdkbJ6l5bl/Q9TIBYZbrR5ASguVNb5scC13K0OXzHqgFRV1CsYi5Di/04AWsQgEN9IXfjHDZI X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8689 Message-ID-Hash: YTBMHL6EM23ZMABPB6PZDCECACEWF3H7 X-Message-ID-Hash: YTBMHL6EM23ZMABPB6PZDCECACEWF3H7 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;