From patchwork Fri Sep 21 05:23:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10609061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAE2914DA for ; Fri, 21 Sep 2018 06:00:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1DAB2DEF1 for ; Fri, 21 Sep 2018 06:00:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99EA82DF0F; Fri, 21 Sep 2018 06:00:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A39B2DF07 for ; Fri, 21 Sep 2018 06:00:51 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E9B982678A5; Fri, 21 Sep 2018 07:23:25 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4790C2678A5; Fri, 21 Sep 2018 07:23:23 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 8345B2678A2 for ; Fri, 21 Sep 2018 07:23:20 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 21 Sep 2018 14:23:19 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 0BD1167DDE; Fri, 21 Sep 2018 14:23:19 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.54,283,1534777200"; d="scan'208";a="291531750" Received: from mail-os2jpn01lp0150.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.150]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 21 Sep 2018 14:23:18 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LPmpSVHxyDFkXuBr3pCSLeOZN0tLrhLJ///I8VyIx0M=; b=Bh4PeICDQLC4qI8NonfmIBvbGl8h1Pi0T4GZM1wmq4K3oM1DPa8YBNAJbQyP/LN0sTNAtGXuWhopOJEp2rb/8VIOyszm5mWvO+OPWb7k0FIEv5m+fQf31MWUzC6DBrpwoGGd27NDt+vXm4vZaMeKkluXcGXITfkqTt+h6as9SEs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by TYXPR01MB1871.jpnprd01.prod.outlook.com (2603:1096:403:d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Fri, 21 Sep 2018 05:23:17 +0000 Message-ID: <87bm8r2zy0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown In-Reply-To: <87efdn2zzt.wl-kuninori.morimoto.gx@renesas.com> References: <87efdn2zzt.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 21 Sep 2018 05:23:17 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY1PR01CA0164.jpnprd01.prod.outlook.com (2603:1096:402::16) To TYXPR01MB1871.jpnprd01.prod.outlook.com (2603:1096:403:d::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 231bfe95-c3c9-46eb-61c0-08d61f8256a7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYXPR01MB1871; X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1871; 3:/luRpL51T+yvz+JdIw3EnQtyumCE06OZBw9uAtw/K/h/xfNGBDfDsF27fYkwVOHrDXJXIpgvB1y/wOsaOW+sqqSf6v3FgNmx1aMERpe9q9a+/QfPGvMNVb7pP0H7YztDNpoZ2Q5Ure69E9OftNuUXsIJHRisVfkzp4NjsxERUVo3SBFAu7vUsjRRA1ePz0ttsT91YW+jxoXedXJMAKG6NCD36o4VtXLIHmbB+fDWXtApDyaNj35RkaR6+A5pOW/6; 25:binT973uDQu6n/xC3tkj1q+Y3k5tiq2CZtVRYxN/DTN9QiOkh82281FCy+2Oj5SMrRkU0PFG8QUGmny3TrAbRqBCGLuRC0ui9/cSOq1Wi1uzqIKkxiaiX2K5zVDbkq4BV9Yf1+4ZUKuH71cEkd+K3yJ4M+DxCDVlmXATEleb4tI5/Uflq1KV6rJ79ywd1qh4GLpT0Lw+NoUXbXgNDrXESktxiTsUCDBw7RLFw+dszuPfZOJUwNohwMfcS50pOkjn1XyCEMw60GI16juJYc4sQcdqJE0b9tIpVBMvS0PR3bAbRss4gVU77IUVp3cIt7GQJcb+T8X59gcHukNFyKJPWA==; 31:WVQaI1WLoIOJry4asDQFWt4o8eRjVt+svgjYIqZp8RtLeOrZyfcxoqs7/636pkSwILQsQco0CZBxuNShHRicvMcF1Kuhp4ibQMr6I19F+L5n3b4IYGqpGkMY43MXi5XGzVEVFoap2+PLJzlKM1sbW5ytC05TwVLi8PYwexhK5sSQYlr6UNoxiUg/K/Y6uWqqISpxqJYpopBYM+/U3LieeAygcBUp3c+8b5R4LcdOE3E= X-MS-TrafficTypeDiagnostic: TYXPR01MB1871: X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1871; 20:1AtyXLqeFG4khIBiepJv/pmbMLdgLneymKtWWCvvfN8Uj0HTCmvyA8nyYgdKaMTp1RvRu1E+Y928wOAz32827BitZC1jFlINg2MUrVhVDdn3dU0OgmVpDFoXBAlJh3e22Zb+5S5ukexlvMyyxW5w9tSy9wmrFUX1RIccUw6uztUnAX1fmSUjF2IHovH7AYE/RHfmmTTyxVMrcV9lPC1f+wlJTbYo08N2hx63TCFX+vudOqoEOUkZ4qs/i9Qy/cdpEkRtHPWsxOc+cKUrsKjirIutOE1v09ZTgr+5TStFxLWO44pNbvfxZCPiDmZPaFWH5PDUwqYKc+hb6S8YcXsTrJXv7RQMrD/eqcjjFAPN412Cm1VjWd/p6jTLctWqLe00N1jNz/a/Y8JidCl9LB4z3kU83L8c66fdUJ9JGVOkLUYR4bPpywKxzzojrjNdVUYAFud6vJLMTtgdifkkyEVmgfbzEcG3DodUuYJGhxZRycGwOOQU2KxNULm+t+zv3ysp; 4:Mcvfys/Mh9w2sXfPLB0jISrE2BNCLttbmItR5cUED8hAffYw70ISXHI6X/jOGD/KdFSYg6f/crEIN1PffFKfejeyl2Ri3qQES78YxRKI8if2BtWkXPydNp00gw6o80AuQWHiw546d2WUrw46OaccLUux6nv8I9iwOg6FHbMc0E+Vs/nag13Lo3akqpIdahATfMjeMxJL7yI3kprYbtI/mnJUhQRATiMfKysZHM0esTOJnBpS4Wv+EfwOKdDMwgoRypA+4Iw+vPUZBUUK2lsh0gBPr6zf8eIfp9jXUrE0FfebRf5oft5orjPonaunyCin X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:TYXPR01MB1871; BCL:0; PCL:0; RULEID:; SRVR:TYXPR01MB1871; X-Forefront-PRVS: 0802ADD973 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(39860400002)(136003)(396003)(346002)(366004)(189003)(199004)(386003)(86362001)(53416004)(26005)(97736004)(25786009)(69596002)(486006)(66066001)(23726003)(47776003)(5660300001)(58126008)(76176011)(476003)(8676002)(2616005)(52116002)(2906002)(7696005)(316002)(956004)(16586007)(105586002)(6916009)(53936002)(4326008)(186003)(446003)(16526019)(14444005)(11346002)(36756003)(68736007)(106356001)(50466002)(478600001)(81156014)(7736002)(8936002)(6486002)(6116002)(305945005)(45080400002)(81166006)(3846002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYXPR01MB1871; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TYXPR01MB1871; 23:lKe9SRoDpEUBFKEO+9OHr5ZZ5+KeyIcPxzbpxBsls?= KNg/n/bAaVAgqQ1bHKxFvUZX6ixW1uCv9vGK3ruqYTiESeBS12m4ZNFZl1uAxic2AxujJBJMDNElM8sFy4Xk7lvUO3MnpYyIOaiLKZDPgxi++s49C3yi6tbIhkH7PCFmes1CSrva6N9pGHtG4jzN0HkZCR8MKHjapoomTOEKb7YSvnyz77jxiGTRTMldXlm3hi+jCQqNDdHCteyVQj+SiaEN5T6h2ky72t1Hk2xBIr+/cDaXViBdr0+pKkE6u0As7TB+kQEUEHSP0IsSUf8b0/T4yfDeU3UULziFsSyn9fUWhwMohCUEkTHuu6iJ+HcK9WvEERrU/P6Rlfesct2+VdWzVV0zAPTHOajM4kxstfOAgN903ZFLtmLGKTBhV/UYdv/iwcD/PZpSlFfCpQJW/v6PrD64Q8zwfKfaFkyY/AbWpLcZS8ImJLtigD5hqJSqAX2l/7GKQbK5ZMZJOpygsq76HDWAc5bsPKbsKc9jHdX72A4k8OHLbMrp/6CQRfDjR+L5MvyOE90hyX4pxHcNWWzYFCve2/+HTjiOrxnn67ULAbujTp+I0EaQsK6TfkTETnJveLIH/U10i3817snAdrTGYsmm8UHN/lmhqEXYyKmHmeAhMAV8xto6esAxEGrDcqQJ5pocrnEi1/wGpwsaNrAhZ1sPpwjO58C2Ak95g6ovwsAcXzlHvXsFjAdvj35eHkmakM1MBcXQM4nwT73sZk4/2t7NDTqamUHb5kc2LxvNLBaHudPJavyhOYLnNPJKZoIr2lFXWHJ9ZGigZIHnruG/ryrle3eGy3oBw5/kjUI2H7dkjJNgsbWtGwJfxo88r478/sMhmlN1reeUkIKAoalqIEIg58DesJr4qDGa8pHAxK36kCLu8qcdl6Lv/UTeND9whbQy5jwuxW9WWI3IzORQYbYGoOwo4pl93Us35gMjBe4Yudt76KBZPTYfX/QOZjYKpOcXCT4erOagJKoKXyRx2hiFddibvOvAUJdjxz6xphy1qbaozgBBcvSbX1FQiIenPfVPiJMLLBlOfg2tZA6okBKIy9Dx/LHa9198+k9b4O7F6iP+wTXJqjwjcCdDDCNKDQ8SrrAda029Hl0dCoS7GH+Aqr2vMSLClusmoC/P9voRDSuE26tIT/rzdb7cq/VZeBm+729B9rvUxC9dCnP4JJQYlWpgI7ppNm6qRzgpw== X-Microsoft-Antispam-Message-Info: 07fFvwg1adhAZ26zHEl7eRAos+6p3Gp1wsNrinGlCT2UpaKwAqa50UlWacxszKLSpQpH9fLe9z4uTwHQF/2HIcmyCi1EVFnvxE62DHa0Y1dBcq6qZJBpKiW6vUwszOvmoWSiKKf8i5HxeBOg5nGe8eAzJ/VcqaXZixSOJ/lWpYoe2M1YiJdDRWO0ti0lycHfBMd2A/uEDMvBbcLGnXnnbxgukaBMD/2ZGkEwccV/aNCbXGW08FjzZ2T3bUdQmE9cee/fVhGzjPcsphwUTK51SOOBLwUbHsFpklth/vw2dFQ9WUwQKUPWTZtpDDfSiW7w1ar+F88kdsP27bEmvYkOTEEsExd514KsT1EZWdB2x0g= X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1871; 6:glAljGZAIhANohS9kGilbb97YjwPJDuQp7uMXwlRiaH4QiR5F+bDNaT09U4LnXOd7yqArM73nuNsvDLmOC3CFtBjcr6wxag0M21ZPDQvM0CKU1LuKz9EksMSLMXhbXvM6Sxv/eAnVOb4k+dGIAysvSM685Yap8g4X3EzkxAc0Mhl8pwPKO5rsFliKyhiwDpu1TYMU+jUwaHagGSmmr1N+DkG6lP3h2eqX/NdoOi9v7iywCTva14seBJpbqsAnFUP1tmpZlwWyE9JuunOITnfKZJm+ZAFrVyi4SGNCy3rX2uShxyLbQ+jzjHHoSX8CYN8HmE/GBDVsH7EwKNAYju6Rr5Spflt+K9jhUTmqIRxLp7vQqoqMbchcV9yCGqnbZMTrZ2H3sCY6v7+LWQHtbII51yS3SfI792/sh6PhB8dWZUfBzCt4OqKS9JXmB3sNvhKIIL7lCCBFU6QFjfqmrV+jg==; 5:k0tzVzcg2ktz/1SJtSTZqj0CHxT+R1z8/e6W7+J5EDTIPHmwWM1yVJ0ilBqa0W/SU98h8Fyr7cMRJQGrjcJ/DBN1v8vt9hZ2/ar+VI30glpxYT4PbKsvQ22i8ZyVoBfBw4IrYRCkj9dbP9niIF+ZYDZ06lyVkmaGWE1ui57eYlY=; 7:MSL5ZMFOAajxrq6rxC5HQpzMGbl1nk983arB9hQ47e6KhzF9ykNu7rxjrPzOFphsJ0KpkJ2ZdmR7P1idkFBsKhnoxG323O/dCyjYVMONsBxOutp9sddJB4JDcFyBKP/a4MYe4iMZuyI+tXi+PD64rvz7HkGUYNtftNZcW2xRRdkXnNU148KGombc2p6MNOkQFD5aS7eG+MS6WHnWVeqeCzStFiGfQES7GkEI/XDyG2b5htvoUKB9Rd7f6L11YjeQ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1871; 20:OvP/paFP44IucFruXzJf061fwBueTzfe3reoyzcpWQ4GFGhlhrdS0hQbui78THYJRJF4CZYFpOU45PfZbGn1XdPMTXwmIcYea7ksdAXIkNLo6ChJG7qT+j1g9EdJ2CHFDRjNACItNOAfbSctGCzvPfwAAQIDWdprafd7OoTvdMU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2018 05:23:17.9083 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 231bfe95-c3c9-46eb-61c0-08d61f8256a7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYXPR01MB1871 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 2/2] ASoC: add for_each_component_dais() macro X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto To be more readable code, this patch adds new for_each_component_dais() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 5 +++++ sound/soc/soc-core.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 93aa894..f1dab1f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -864,6 +864,11 @@ struct snd_soc_component { #endif }; +#define for_each_component_dais(component, dai)\ + list_for_each_entry(dai, &(component)->dai_list, list) +#define for_each_component_dais_safe(component, dai, _dai)\ + list_for_each_entry_safe(dai, _dai, &(component)->dai_list, list) + struct snd_soc_rtdcom_list { struct snd_soc_component *component; struct list_head list; /* rtd::component_list */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b9b33c8..62e8e36 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -180,7 +180,7 @@ static int dai_list_show(struct seq_file *m, void *v) mutex_lock(&client_mutex); for_each_component(component) - list_for_each_entry(dai, &component->dai_list, list) + for_each_component_dais(component, dai) seq_printf(m, "%s\n", dai->name); mutex_unlock(&client_mutex); @@ -781,7 +781,7 @@ struct snd_soc_dai *snd_soc_find_dai( for_each_component(component) { if (!snd_soc_is_matching_component(dlc, component)) continue; - list_for_each_entry(dai, &component->dai_list, list) { + for_each_component_dais(component, dai) { if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) && (!dai->driver->name || strcmp(dai->driver->name, dlc->dai_name))) @@ -1312,7 +1312,7 @@ static int soc_probe_component(struct snd_soc_card *card, } } - list_for_each_entry(dai, &component->dai_list, list) { + for_each_component_dais(component, dai) { ret = snd_soc_dapm_new_dai_widgets(dapm, dai); if (ret != 0) { dev_err(component->dev, @@ -2842,7 +2842,7 @@ static void snd_soc_unregister_dais(struct snd_soc_component *component) { struct snd_soc_dai *dai, *_dai; - list_for_each_entry_safe(dai, _dai, &component->dai_list, list) { + for_each_component_dais_safe(component, dai, _dai) { dev_dbg(component->dev, "ASoC: Unregistered DAI '%s'\n", dai->name); list_del(&dai->list); @@ -2894,6 +2894,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, if (!dai->driver->ops) dai->driver->ops = &null_dai_ops; + /* see for_each_component_dais */ list_add_tail(&dai->list, &component->dai_list); component->num_dai++; @@ -3728,7 +3729,7 @@ int snd_soc_get_dai_name(struct of_phandle_args *args, ret = 0; /* find target DAI */ - list_for_each_entry(dai, &pos->dai_list, list) { + for_each_component_dais(pos, dai) { if (id == 0) break; id--;