From patchwork Wed Jun 14 00:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 692580 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 29F3BEB64D7 for ; Wed, 14 Jun 2023 00:21:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B8CDA846; Wed, 14 Jun 2023 02:21:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B8CDA846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1686702111; bh=XK0ti3Ek5Ev6dC94EQFoYuIiwkiHzvg+4xJFrWOlkp0=; 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=Nuz2XN4kssVbBw3FtW3YjrBEZEwj789eqNxRZT4CqPysq0ssY2FzK2FZVIyFd9s+n r2WZChuTzV7D8QwzVQAGB8agtikztwjTAGyUzMFf1f4jcufGGQOFqBwjkVC0PvPcDM gWSJATTgnXP4Pa3hQ4HzbzFG+Q4hEN+FxLH7wXcw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1EFAFF80587; Wed, 14 Jun 2023 02:20:26 +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 89069F8057F; Wed, 14 Jun 2023 02:20:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 65D75F8055A; Wed, 14 Jun 2023 02:20:22 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20730.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::730]) (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 1B8BEF80149 for ; Wed, 14 Jun 2023 02:20:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1B8BEF80149 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=R1Fy5Okl ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k+voAX8pqJBiNs+tzlmPLkl9BEPLk7zpsnDmQmZyBIAddn0MRt15nYDY0zv2d8qmjk/PQfbf6E4tCUd7aUYOYlbycXjXBHOwBR8+9vA/9XLOa6VZ4/T3d766y3bzmjOV1B9oUl9oJVXnM+15RQKVAEtuMUnUUdV9ukR3Eddgq+2vUOu7lVw1u/wOC0Lh2UOEzv/AB56n5q4ZTwiz+Q9O2oB9bOn+Z/OIMTBU/5MN5JZcoK/s6PMnIeScyUNpdEWVCZ+zpkiAzVLMbRYbYg6A+EXFVQnVQqUuxQlC663ns/vGG7KHaBGZS2GnkI8Eyjv1cssa8dn7zzdkN3Gen4GrRA== 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=rn5pqB2VD84GHdbCVnkJVfXyoIxigbqfHBdEUUFGO4Q=; b=PW40YiBMNDj3XQreR0t6UDmbm0c2otJMEcYCkVJGXHLpF/GxCIGsUDXE8i3WjzAjLnx57f8Me1KEm0jSQo261DFH3N1DUfuN/f4wGautmfD+Y+Uw6OLDZN+0jSg/jLHuClF1/GXfpVJUPzl0W+GuNaw8vUkXFYWY64HaqZEK30pGfh+JULXTI6BHnH0kNyb+/iw5LX79GcFkyfl5U+KbsSPpOetvnq+pxksNrkfryCedJCgfSPwiRdSG16qylRAUOVc6v80H939bs5f3XF6yQ/+UCuzkMQMp8OAx+y0XOeq8tNtmOcOnmALEBeulInAZjErufXjmkflYhofiuuxlmg== 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=rn5pqB2VD84GHdbCVnkJVfXyoIxigbqfHBdEUUFGO4Q=; b=R1Fy5OklXMXCbLhPBqQHbWqfOZ8B6zoNgNGvtWeVdrMEy2Sy2hRdOWfcRnhzcZXVZVyQk78ttTRwGOS/DwiNPzIB3ff80SDqZkyyoYUN5aZKewvMKgAFXTysYBIc359YnR0ycIF7GE6oqQgJyQATirkCDSALAEUrnrt8vK12Fws= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB8440.jpnprd01.prod.outlook.com (2603:1096:400:15d::5) by OS7PR01MB11570.jpnprd01.prod.outlook.com (2603:1096:604:241::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.46; Wed, 14 Jun 2023 00:20:13 +0000 Received: from TYCPR01MB8440.jpnprd01.prod.outlook.com ([fe80::6c36:5ff9:24c9:e4f7]) by TYCPR01MB8440.jpnprd01.prod.outlook.com ([fe80::6c36:5ff9:24c9:e4f7%6]) with mapi id 15.20.6477.028; Wed, 14 Jun 2023 00:20:12 +0000 Message-ID: <87cz1yhp37.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 7/8] ASoC: soc-core.c: use snd_soc_{of_}get_dlc() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 In-Reply-To: <87mt12hp75.wl-kuninori.morimoto.gx@renesas.com> References: <87mt12hp75.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 14 Jun 2023 00:20:12 +0000 X-ClientProxiedBy: TYCPR01CA0022.jpnprd01.prod.outlook.com (2603:1096:405::34) To TYCPR01MB8440.jpnprd01.prod.outlook.com (2603:1096:400:15d::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB8440:EE_|OS7PR01MB11570:EE_ X-MS-Office365-Filtering-Correlation-Id: 88893e6c-e208-4ed9-56f2-08db6c6d1e9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P9P69a9ds+mXimcXd54pqjGurof0mYma7yQo7lqJWV4PS2wBs7ED8OwlGFnjo6RsxsTRs1nCIh3D7L8I1IhtMIL+B0MZ+41ajoEXgAWbjt8f1tn2InN6jtp7Kh7W2cjXSmqUELYWNwuQgI562T6UYZU6PLuDA8XouTFTUYeR/o2ytaWpFHE2SxuuAbv4uvYvdv//77ttko5mB7HveqMCRvKGjKsBJTd7uUOWed5ao98SPPc+0kUBJP74qFVUG4uZ1/74fCbwgvGhVA3P8766I/fYFXkY1QqRCwmDyD2zlj3P7OR6DxJgWvEWOLCw4Takv6La6w6HQtW6+4djms6nKohmqgcK2xC5zX6DIX0Zkkd2w/iapFK45EQTszLje6k/PZxSnpcDxnQWmkQv+HA5EglLJytUvLEXr2l/W1gU8sbCDmD67IqOKxczel8WunTXqtv+AjnO5p8KfYtPNSCZ5ieYn3u6exm9ZYlQNFUqLBaN4dhTv17nUaT10zLbOi97bepSRjOcluwarZMgsME8IUMDW02kJPOdyrJ/gYcFRw55bFg0V67RooXDyp/p8HANQzxNDGKk0lR39PdP7bqs07TyLOpwMGfv/N3eRgoYZ4R+fqeIgr09gCrMRCpXpKTF X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB8440.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(39860400002)(366004)(396003)(136003)(451199021)(2616005)(110136005)(6486002)(66946007)(478600001)(5660300002)(41300700001)(8676002)(8936002)(4326008)(66476007)(316002)(38100700002)(38350700002)(66556008)(83380400001)(186003)(52116002)(26005)(6506007)(6512007)(86362001)(2906002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TdvIup1fRvY+VGEGb/pPojN5glJACI9EVMQ7qaNhdkVc6cTS5l6dAj8qULV5TVn/lHaLIz4IowXMFG/BoyUJEBjMcioKkbps0dBMJzuhmIEpMpL/YDbsf8w0Ake3YVdMSHdlHYyeF/bkPvmiagbN3OrPeO1zLb5HEgTYzniR7CdL9hKJxxmIhjWJOX+84zZaRc0CBhsaXm6ItUDSqZq/Om5vp48e4erHml4wRM46oFsu3u2Mpg4ziGI9gE8bqR0cymoaLjFu5Eqrs5ZX5hYwijA67KtvU8FcyxQ0jfDgQQvRR1NMil96R9bZ7HFupzzB/lWeX6MIyTf6xcxp99A9wsTtacjiWJEPXP0zLsWUsf+sIo8w/ACqXx8iwxPpxj02tPwtKA3VwHVSfeF0Qxv7m0m8qb0BoXqzpy1CQZJ4OLD/vc8M+cS/V2q2T0uFeO1xfNn2oP7PEkuUbBK90hoJNh4I2PcJBrh6sumB0EJS7YR39BcLj4ElEpW82CKTs8tCyT6RF6IjJgyncBf6u06S0ozgBdem0IzV+dvwJ9ls5n2TJ9VrqJUYSIJ6cNrP1k+JpAe3tXLfNXJUF+y6AMF5vuc/3+VxniPE9ZKe8aT4fAFq6TYlyxZx29BPT3oxaM0rwuGmJKxJC3LwZNBxL98aGUInWUONW2f6icFHS1yemvHEOV3mA93HL/lyA7EPBFT3EPkmxkpnsQ655iXPa1crvsKdo1jGMSMIdazs6lP8kwomdt8G7zJUSIZzaG6xIDOQy2HHUhw6euETGcu8+hIXPJCoPKpzrJPzOA4KGpuLV5YNfGaUDsrTsHJHzpGHV5MDSVTcJrCY3Y6LyrKMAwRzpw6op3UjVaIaBr1jGMWsiDkO1nrTbPR4jtTRaeAzsxG3ZFU6smD1euxKd9eRTIzx/T2MTB7GJVyigShamjl+7qfXFs3tSXqHOVrvOwbqvePUSEIsbRhOJpvNovGu9CTdsCe43HuqcKcb7owmR7IZw0q4vwhJMgvNG6hXCXstBXsQa3o0n1ZllClXW3ESa0RCwfoQxsX4su97sPSkAt3hor2zf7voRllcRRPLMF/qw2MqUvn0C3K9qR+egTNCV62g9SIxWXb6UdQQeirodNv0G7SO6kqqoMvuoCA4ToiEKSd7i91zuKviIJwd7PMP+Vm1rbNXPoZZNvjolyQu+3ZWOhJMBCmxTkAJgPs56LchrZJ0xb5CHPYrryJJdPPVsdJgV3TCK0vwMU72ZT98plCfRRhgFZn0hobADVQGHGUxb2I5wrODV7PLuKtu4Ne44vCitCZj65nHeYIkzey9Z9d1e6wSLFJZitoHJbeWgR0CSk/I8BytxebcOLJK0tuGsUO4FeirKMi1GS9VI/14baH/R+YsdVpowsJhG+Tc+5A5o+1Uf5XZ+dCKy8EgTXv0+HaCkR8mfYIBEclvZXFCZ/1m6xG2UPCwchk3v3Mc4iA+Gb33AWnw+3KQZPEL4gkg/2i7DelgXPdbd+O8b56gTKlLHMlFMvLSazNRjmMAKND7lSZdfmyBJia7nip1G3UusPfUW0QBjy1Ygcb5gs605jWtxD5N8pW5D2/DBavbAIscg6aEG56PYce2kashcy2KEMYd52KcgrWjAIbG5BYqenq2gDE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88893e6c-e208-4ed9-56f2-08db6c6d1e9b X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB8440.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2023 00:20:12.8015 (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: vlm8CF9ne8Vi9c45bp3TV/zBGJX/xiBSVYYabIJhfdVKJ4tgYIeTqn+iLWzDoywXhUGvSi2LGsnwS5bbHKrVnjIIt3AzSbn2gSyin8L6W7mkTmfc4rZvtQqoo9dC3bPg X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11570 Message-ID-Hash: 4T4PWNSBWE2QZF5WULXTATNVVTBWRFST X-Message-ID-Hash: 4T4PWNSBWE2QZF5WULXTATNVVTBWRFST 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: Current ASoC has snd_soc_{of_}get_dai_name() to get DAI name for dlc (snd_soc_dai_link_component). But we now can use snd_soc_{of_}get_dlc() for it. Let's use it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7b13b1b232ef..f06a20773a34 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3402,26 +3402,6 @@ static int __snd_soc_of_get_dai_link_component_alloc( return 0; } -static int __snd_soc_of_get_dai_link_component_parse( - struct device_node *of_node, - struct snd_soc_dai_link_component *component, int index) -{ - struct of_phandle_args args; - int ret; - - ret = of_parse_phandle_with_args(of_node, "sound-dai", "#sound-dai-cells", - index, &args); - if (ret) - return ret; - - ret = snd_soc_get_dai_name(&args, &component->dai_name); - if (ret < 0) - return ret; - - component->of_node = args.np; - return 0; -} - /* * snd_soc_of_put_dai_link_codecs - Dereference device nodes in the codecs array * @dai_link: DAI link @@ -3466,7 +3446,7 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev, /* Parse the list */ for_each_link_codecs(dai_link, index, component) { - ret = __snd_soc_of_get_dai_link_component_parse(of_node, component, index); + ret = snd_soc_of_get_dlc(of_node, NULL, component, index); if (ret) goto err; } @@ -3521,7 +3501,7 @@ int snd_soc_of_get_dai_link_cpus(struct device *dev, /* Parse the list */ for_each_link_cpus(dai_link, index, component) { - ret = __snd_soc_of_get_dai_link_component_parse(of_node, component, index); + ret = snd_soc_of_get_dlc(of_node, NULL, component, index); if (ret) goto err; }