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,