From patchwork Tue Sep 18 01:28:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603629 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 0AF27112B for ; Tue, 18 Sep 2018 01:28:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECED52A876 for ; Tue, 18 Sep 2018 01:28:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E02842AA01; Tue, 18 Sep 2018 01:28:18 +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 199FA2A876 for ; Tue, 18 Sep 2018 01:28:18 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id DAF2126788C; Tue, 18 Sep 2018 03:28:15 +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 E966D26788E; Tue, 18 Sep 2018 03:28:12 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 49EFE26788B for ; Tue, 18 Sep 2018 03:28:08 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:28:06 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id E273869579; Tue, 18 Sep 2018 10:28:06 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="291183138" Received: from mail-os2jpn01lp0151.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.151]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:28:06 +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=6SKpttU3BhXb/TRpa+QsGnxSSYctZgtyByKWDKrInx4=; b=YQQJs99f474MKCfLtxGCiCwvz58A4lfRrNDLwA1HD1EEr+UFt8h1LKJV4CrDI1d2UTx5iNsn+izFEKIPWPmQ2rcrUIn1BHWlp9IcpA/CZaAtkxYkpLKUy3MWWgQ3C8/LRBcUlxX2j9SSMZvKvMzMspi90tm6ezQZDygWXrChuCM= 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 TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Tue, 18 Sep 2018 01:28:04 +0000 Message-ID: <8736u7r47n.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:28:04 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0163.jpnprd01.prod.outlook.com (2603:1096:404:7e::31) To TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db20a4d4-d1d7-44ff-5988-08d61d05fb21 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYXPR01MB1869; X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 3:d2WOXlmW8AhPQpgHnIITxVPxc/7UDC2m9PPP4qgp2hP9rMKphJWoqL9kk0cx6oWYVqxLn0o12nuaHGaGI3N45vWJJztFiC9gubuLtPMfRjtb3NQ/cqn/RX1g6b7dOKYJJFdIsafw6sc+/nVB6wlsM3pdsMEUlTmJTFbdZEXEyWJysaZMxtpQdz0BSfrDaQaExRgX5E4UPZSiU0Bnp39Xk1dRl4dlmA2kDwRtvzGQ3U4zru2rQ0Qp/ZaWTIPf6c5S; 25:rigqR82/OJ7/OgyrBsGoS/s3MtOv4/rcOqCjz2xYK+fT7XmUN7X/M+IfG9tabZRG3RGehZXstowQtZJpHcz86poHrWHJ5SdMS7Io0BRZwwE8qmnVZghEt4VCxiw+FFzikEP7g+CUT+wrpRKn7/mZ9FXFk+ufM2yLcHl0/gAcgXBHsNU6rjIwL9sAbsCI4RujhjQzRX71VBVFvGHLKYBtvPQyaHDG+raugDM3bzxEvwwMfwShHN+kYm9WHRLvDMHbxsLlsQ4Hk7/z65ljWC5APkBQd9E4X+PxWGZXbkt5LMzB6M9ntMs/x3KJlWEZhZk6r2AymBhk1rSCJ1UkWxJGWQ==; 31:Wi3pECMKCWT5/eW1dJJbRAwm/LAq8kLzYPtoYbB4NcX6BaCq42lqEVAiRI1jmwyArHW6i2oMRFBKAU9ggqXHt8CkONF2HE3JrLwA0FLdBRyVhmUSb5e6maTFF3+riERqKXxl/hceusWXAXVV++/ue+ms9ZFO3uFSIRoih0hVpmfTMfknL+yDvVzvW4+H9rsQl0HX5+ZcJMzHvv/KErGNAiwJbKmJzFfz2lodMbD/64A= X-MS-TrafficTypeDiagnostic: TYXPR01MB1869: X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:iiIQEk+ydmtjfYPVgPzWYFijpHNXEWgiJxKcfKP7zFYRIprPrfk33Ji/+toJwwE/Laa9BDefo55sdd5yos6ibjxj500Ko3Be/9zy59T5tHS9RpTGFJ0vG7uQyYfBB5vqQM3sBFaID36ZVfxx0vENVXtf7PJe/6pCqjp2UkIsc2a4jPnGdPgjtX3Udd3qjyZpzPRBZnz0NYXluD1xzfz0yhmMnk+lGn25H4bzBYoOzSUVYT8Wt6PJrOwBS8r/3Lu4ZZUhid2eiYdjNOVlTwvZ16dCLICcM9im5NV3xcGIPHyPqxu7zzbTcOhnc/DAvvOdXo42UxrovFkJ4ikMUJR4gCTO4E5sPFhxI6SLQXwjKbrdPaSn2aR1UbWPlqfx6lKJ1UfPB9WxI2S4kCxeWruxfBPX0P5HJ2odtoBf4Dn3/0V6jxAyLC37lU4uCh4fj2jfyotbvbJqdzSPkdGa2r+llGXCsKVxbVyKqcmiWb86apl/V/Rqd1gtPd0gvhBIBNjX; 4:RctrLZV7sByUv90LLH8voxpMeFryl3UIgJWpcn5mZMy+0wAKvgtcROt2lEGYRVyzbWOl3xP2egnXDN6bEyepjFghmOrEW9024xZJn3bA+I8wMf4Nm7R+H30I6H9ntgb2yx711QsgdMeCNj6p+W86Y1zRiwDgxvd7I/ctUVC3HltG8VMLxHfYb7ZQzHAATh08IJSyGxrJ37B33/b7XtzkbP9t2eDJsKlZUqYQ3K0RUt/ACjo+qzy3pFOokoyMpmZcqEy/f4pASf27IuBmieXb+g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(201708071742011)(7699050); SRVR:TYXPR01MB1869; BCL:0; PCL:0; RULEID:; SRVR:TYXPR01MB1869; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(396003)(346002)(366004)(136003)(376002)(189003)(199004)(16526019)(5660300001)(53936002)(478600001)(16586007)(316002)(186003)(8936002)(58126008)(4326008)(86362001)(6916009)(76176011)(7696005)(52116002)(81166006)(386003)(486006)(50466002)(11346002)(476003)(26005)(2616005)(446003)(81156014)(956004)(14444005)(8676002)(23726003)(6116002)(3846002)(66066001)(97736004)(47776003)(36756003)(105586002)(106356001)(69596002)(2906002)(68736007)(7736002)(6486002)(53416004)(305945005)(25786009)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYXPR01MB1869; 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; TYXPR01MB1869; 23:ZUJviQplwetL0I+7cOzx6qaGl5H+dW/mBrXmWf5Vm?= II73x0Ja5H7W69D8yJdEgA+eCQ4Yw7Cn3WLvm4ITWLkoDL65aWysV0fmyA6/0BjIZihMw31Yxq7t6OFK+QnHgOYgabtZGEqdnoh0YchRV/oi+9M4f2eRihHiwUv7twCS4bmgpAacQq8Prq3eXT5zBU76oOhYPlmlrtRsFVghzUz0Qi0vDN+e/IlnQhFoN/5nHNaDSpWxPN6eeWWPqu/fOnfMF+gyW+HPFY3nnxfugaEiB085hELoMvXoeZdNFWkrD8Xl8vyWMx/4nd4RucaS2BsliUDOHePvd/wdQ3He0A25v1nMmF+gkGn4qWNGTsjmw0N3qoWOrCVhBkeENhs9MWdNVHYjTIIK8wal/dC4SzcbnY+3hreIozYTbc/y5PZ1LB70vdPT6TXEDRYAUv3bjnarT0SD6KLdap4ZtDpij/VaHyFUJF+GEBgFgSR0RBeNP9tNc0amF316nil6eq6NH1XkjpUbmha9D7D5+gfqr06ClNB11W+FSIotrTLjO1hNNb5rYfrTRxPhvCBWNKVFxFIt0eePT+cLIfFE7F+TEcPJgX3ndoJID7AQY9Y1ZM44AWSY8Zgdsee20lLDOT45tIyxAVvI5Nsk2Mr+LUZV54txG+JnGTIwpB/Qj1+nY9b+Zww9yaIiWjEcBpXUb64Hg12rMY8kSd69C8kOqaJR3vAmlgzDvxVrxBB0aH5rMg7Trk/gXRcCLehQLqJjZicABYk1pMcFoS3v7ggITRrNWiEdIIgAd+05S/F3P5htm5tJl7rPn839OqZ4bSkzI4qrT+WND4Y0NSPDGbIr29C2QzN2D4XGLsZooARqE9DtdJQu0fEv+jCQLHI+j9ys+va++Q8AItAVP1nzRREKOlJpdExZXnlgM771sj/vNETYxEAvB8ZE25wYo2NBpxfeEfBdsQAnmJsA8XAnaGH2/R2g9T+tEb1KFGIUCAIVzIkZ0rCjtMrcl1EAmrBXOk3y6YNmt55VDDWhQvbLAqXMqVxRdxZBB2jVT6oWIwHXNRCz3esZ32Co2p2vcnX/UPsIoOzrPjxKMCH79VqkkZrR1H1oJea5jZMkPuU2I7Os7N7KBL/ETMXwwId/eYI83YWMyL31q1Z/8uwj+M/7+7/ivfBaOqOdoZtI2B/Ns/xszvExpVl1ybn8bGiWBLVlSTCK/XedUP1 X-Microsoft-Antispam-Message-Info: FeLY+MBAuCuErAVQdBQsy5onWL2HhrWEKVLciIp6Zhp5boPWdacimg7dRM4lwq2LhRAS/PwWHJMroqx2rygUmYRKIngno4nRYXIx7RWBYyzms38OEliVSrURpAYJgi12V2tZdJjigKS4vKMVv3qcOgzAneT5XhpsoBIJrLtTQQq6loBLVWf2U+eAmSRz/bEmuWIf4pdY8j9rhrHf2PtcQMQuvMIsvLMh4HC2guJ6Ff7e/jmc1TQkg0P2IJ3Ns+A121OzEfC6ZzfOlM7AD/IIo+OMN5HCj0yYOcashIRr29NseuUfVGdSmxdW+FmC1SDAFgAoRuEr7r1oyWfOHvKW3oZPMHRhqIKMN6QchRoa8dI= X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 6:MqCXoJFqz6CEufKK++lBChEg8sFKtzlGXRLzPsVC0+0jg/URewyTy2puJSo4FtL7iiJ3jYjexUXshIGb2RnluB5qdB0kaN4Sx06SoVFFLwjbIcP3LlCOcp+7DU9ljZFsbO/uo20oPxyGv6PK/9O+nl8Znl3bkNW2+6u54sRIEfgKlufs2LXwpPGmf0D2sDDkZczsfelyo/GkumkBMuh9qN7KjCl05Do/XG8NtZ4bANSOWbUrTzOkb4w5VqvXsVfcmQpNKk5ryk+f8DAO8zNwj+FiCMRPwljs1v64c8EZkCFwuxY3do10t2mbB2nMn7eGvk7h0P/mjmPPLduD0iR5EY25u9QwJxk8jfWb8VqIDlx5YI4MvVuuE7cLb2pMzNGb9EYcXiL7DB15Z1ESZHtCruuWozXj4Hg/5E5YjmldkIvaa7NwxrbHpKBMBLvRO+lORwOSDcRlh9YNcramP+DsEw==; 5:IPIs25S9UaBhmsgTWTLGrvE3U6bxTuDroTdZtTgd6fW8ZtCh5NSO2//zmPKg6rNLt3zGSAeySEs5oVt1tI0ia5Znw6MKFVVjQ3d62to4ebk19eKq0xtivY/6n48e29SWELmiHr0Fr+/sjmx6MMbrN1TQVOnah5XuQT7G3MIjn2w=; 7:WpmCy3GCQ9v80Gj0JWxfBdglsWcYPJpYvqEwmClYWQ8TP6nDwTvY7J7ybzqftOEViSYIrxWwqqGxOQOhCoEEyRIzb10xmQ1alT3ERbZISXNTiaKw37cCZDqNzM6d96Pi+4UV45/GiCmIDlZwq5qfroxFD4IWmVItjy2yE5eM7H7rInNxSU3WhjR4v+1eqdxVJ62M5NFwPIilZvQ5H+v3hb85loNjf2ScMnY/YCX521c6muaewGM8vOTN9RWQzqZl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:+pbCfQIbF+UupFDWAvVAiD8r3YTEX3TbX6325tR78oepckAIns+41q3xdAKshbiyeVQE9eX3GiCqMDD4H0qHtVnmU4ba7UBxI30aezw+OIfumU4PwqE+P5gJsUQlenHq8vBc0pgKy+4CQz/gAsQRcEFDmxYc17itmuJK4zOwog0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:28:04.4343 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: db20a4d4-d1d7-44ff-5988-08d61d05fb21 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYXPR01MB1869 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 01/11] ASoC: convert for_each_rtd_codec_dai() for missing part 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 commit 0b7990e38971 ("ASoC: add for_each_rtd_codec_dai() macro") added for_each_rtd_codec_dai(), but it didn't convert few loop which is not using "rtd". This patch fixup it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 79f5dd5..e387fff 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1301,6 +1301,7 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, struct snd_soc_dapm_widget *widget, int stream) { struct snd_soc_pcm_runtime *be; + struct snd_soc_dai *dai; int i; dev_dbg(card->dev, "ASoC: find BE for widget %s\n", widget->name); @@ -1318,8 +1319,7 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, if (be->cpu_dai->playback_widget == widget) return be; - for (i = 0; i < be->num_codecs; i++) { - struct snd_soc_dai *dai = be->codec_dais[i]; + for_each_rtd_codec_dai(be, i, dai) { if (dai->playback_widget == widget) return be; } @@ -1338,8 +1338,7 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, if (be->cpu_dai->capture_widget == widget) return be; - for (i = 0; i < be->num_codecs; i++) { - struct snd_soc_dai *dai = be->codec_dais[i]; + for_each_rtd_codec_dai(be, i, dai) { if (dai->capture_widget == widget) return be; } @@ -1435,6 +1434,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream, struct snd_soc_dpcm *dpcm; struct snd_soc_dapm_widget_list *list = *list_; struct snd_soc_dapm_widget *widget; + struct snd_soc_dai *dai; int prune = 0; /* Destroy any old FE <--> BE connections */ @@ -1449,8 +1449,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream, continue; /* is there a valid CODEC DAI widget for this BE */ - for (i = 0; i < dpcm->be->num_codecs; i++) { - struct snd_soc_dai *dai = dpcm->be->codec_dais[i]; + for_each_rtd_codec_dai(dpcm->be, i, dai) { widget = dai_get_widget(dai, stream); /* prune the BE if it's no longer in our active list */ @@ -1685,6 +1684,7 @@ static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *fe = substream->private_data; struct snd_soc_dpcm *dpcm; + struct snd_soc_dai *dai; int stream = substream->stream; if (!fe->dai_link->dpcm_merged_format) @@ -1701,16 +1701,15 @@ static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream, struct snd_soc_pcm_stream *codec_stream; int i; - for (i = 0; i < be->num_codecs; i++) { + for_each_rtd_codec_dai(be, i, dai) { /* * Skip CODECs which don't support the current stream * type. See soc_pcm_init_runtime_hw() for more details */ - if (!snd_soc_dai_stream_valid(be->codec_dais[i], - stream)) + if (!snd_soc_dai_stream_valid(dai, stream)) continue; - codec_dai_drv = be->codec_dais[i]->driver; + codec_dai_drv = dai->driver; if (stream == SNDRV_PCM_STREAM_PLAYBACK) codec_stream = &codec_dai_drv->playback; else @@ -1795,6 +1794,7 @@ static void dpcm_runtime_merge_rate(struct snd_pcm_substream *substream, struct snd_soc_dai_driver *codec_dai_drv; struct snd_soc_pcm_stream *codec_stream; struct snd_soc_pcm_stream *cpu_stream; + struct snd_soc_dai *dai; int i; if (stream == SNDRV_PCM_STREAM_PLAYBACK) @@ -1806,16 +1806,15 @@ static void dpcm_runtime_merge_rate(struct snd_pcm_substream *substream, *rate_max = min_not_zero(*rate_max, cpu_stream->rate_max); *rates = snd_pcm_rate_mask_intersect(*rates, cpu_stream->rates); - for (i = 0; i < be->num_codecs; i++) { + for_each_rtd_codec_dai(be, i, dai) { /* * Skip CODECs which don't support the current stream * type. See soc_pcm_init_runtime_hw() for more details */ - if (!snd_soc_dai_stream_valid(be->codec_dais[i], - stream)) + if (!snd_soc_dai_stream_valid(dai, stream)) continue; - codec_dai_drv = be->codec_dais[i]->driver; + codec_dai_drv = dai->driver; if (stream == SNDRV_PCM_STREAM_PLAYBACK) codec_stream = &codec_dai_drv->playback; else @@ -2784,6 +2783,7 @@ int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute) struct snd_soc_dpcm *dpcm; struct list_head *clients = &fe->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients; + struct snd_soc_dai *dai; list_for_each_entry(dpcm, clients, list_be) { @@ -2793,8 +2793,7 @@ int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute) if (be->dai_link->ignore_suspend) continue; - for (i = 0; i < be->num_codecs; i++) { - struct snd_soc_dai *dai = be->codec_dais[i]; + for_each_rtd_codec_dai(be, i, dai) { struct snd_soc_dai_driver *drv = dai->driver; dev_dbg(be->dev, "ASoC: BE digital mute %s\n", From patchwork Tue Sep 18 01:28:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603631 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 CFAD4112B for ; Tue, 18 Sep 2018 01:28:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCFAD2AA35 for ; Tue, 18 Sep 2018 01:28:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B14862AA38; Tue, 18 Sep 2018 01:28:40 +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 C604C2AA35 for ; Tue, 18 Sep 2018 01:28:39 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8B95E26789B; Tue, 18 Sep 2018 03:28:38 +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 DB58726789E; Tue, 18 Sep 2018 03:28:35 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 3082326789B for ; Tue, 18 Sep 2018 03:28:32 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:28:31 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id CC0C05CD2B; Tue, 18 Sep 2018 10:28:31 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="291183185" Received: from mail-os2jpn01lp0147.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.147]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:28:31 +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=3RRDbQ3dVFzhVBLZZo3jGxhqSp+m99AMS0SAQH68xEI=; b=iqrgKs8Zwjlfduz0ER/alBXcg5dq/ycy/qVl8N3b6ibvr2I4HOOcXIwfK0pHIBMX4IS/1IMl3/RaD+HZkpPp2rb2wan2GRrLxRiRO/U8B9Bg4xZqAHXs3zh1/i9TM2An/zjstVb6UkGu3FYGa3B+CzMxkQrKLJTukdqwLQ07pmw= 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 TY1PR01MB1866.jpnprd01.prod.outlook.com (2603:1096:403:2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.17; Tue, 18 Sep 2018 01:28:30 +0000 Message-ID: <87y3bzppmg.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:28:30 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: OSAPR01CA0122.jpnprd01.prod.outlook.com (2603:1096:604:f::14) To TY1PR01MB1866.jpnprd01.prod.outlook.com (2603:1096:403:2::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a2f0806-8d98-4049-89eb-08d61d060abf X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB1866; X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1866; 3:Oby27cv0Hpomva6rUGCR67/GhM8WbJEixRsEpVXa3O/kquvAXYSOgLUpq+JQIKiJR8ory4A6S+s0w8eEFI1vee4SilaOWlLjQfDU6hzN3oTlsmrxjtASeylgRIRWgnZV1qVxFYoxHTzBWTQqXp4EZe+YZrvcNj0hUkpeUYFxjpn/rw59eEf5yYaUbnw525ncsiziG32j65uQxef4F0hX4A0Fokq5R3GPZWPkE8OLkOw8+vn3rj11NGIELeoY3O/R; 25:kiBaBNVKQiu6DZYh0xGkdSFiLHJkr1asIK+Y4C0/6EtFj6dibCG75OjNC9wAGRe+HHDTYn8mJkvNtNa6tDq+1JVtrw0Fou3ww0LxSlzxTV0v3Nds6a2Djzi7ElLIXXiWX7x7QrZIbuOPlnWWRb8qakhAxyHfBTlwQhAf0ZeVdVZJ3L76rNZ9Sv+869rjuOiHlPHwdGN7ZuT3oigwJEFnIWr/vOEQl9/VuKxmmfRJeo3/S2O4VLm3Huy0x7WagTk8F9Ymlga6x+g7x5bPpGI9hwTRF8pBmRHdYh6Io28vDxSFZUSPIeBk3fgZ4DMruXAJsgbH7F7w9/tygpYoS0UYTg==; 31:pBBSApOjd0VJoXL1V2oDHOVAfliWsQVFhqjz7Ou+85tV2ILoqoY27sxZRqjz2FfAjgiDsyfMjFMZU/WC5vDdlYJZxDf9s3kn98+WfxRI9ao9Ay054hYWAB3GHWQyFG6lu4g5luogwaExENjrDRF7rvHD2zvtYewpYKfiE4+8SN41E13kOTbxZsCFpyseIdM6xoZggJmW1wF0QuLU5z12ciORR09wfWylhmBze7xHmrw= X-MS-TrafficTypeDiagnostic: TY1PR01MB1866: X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1866; 20:tSbqUj8SD7rQuFy8mcKU5FHlZzUMz8L+wwARSV8uK5jzKg7bR4Oc8K9tMIXCecn+C5+B5aujbl31McXrpDfrKI/6JslBbN6zIev3K47einB3OuwCsYPTV35Enqjcds/YpxrKTwymvaUtXq8ua7sapqszA51reAJKHDojLUSzjaSjNAAkZArq73HEJyw8ov7o59UADwBMoL7IJzdwQ6KXXJh1QlGGmMiiTU0UqN57lCkIG0z10zYrhskR0xEpU8T8TOv9jiaft+Xjt/gqI67FBHjqTYAOgAexvKma0khDp8uGAAJBgzjab2APEKQZJNAw+u7xKvYnGoKfobFdt+L1JxdNDtCfKnZ+rtW8MvqG8QeBLM9DtwHYK+P9ZlWcAYo2xLOcSVFT6Sa6J4O2QcrPV6XgV6Iy31hQF8GKE06cecVtoeBZ77WDlhlz44+1zmd1VrtVVhhulO40RwzqdbZjcYbULHFWMHEt7uoQgadx6wlr6lCoGSnM3AxfVErkc2yl; 4:91kERIdfjBuCZImwlD0m6h6BhIj+0dB2eMs0QAB95OCBGf4n5iKRp9m6DXWC3ZUId/145zVMNYW4ysT0gN3513Sfqxd4CNtdYDMRXtBZdvitiNasudXecLGPvhqgs5/EcUGPmY6ZomEMTvn+pErJJzxTh9X4pvEFXSgKhBBL0ZlJeKqezG8dCzhZhrjllWuk07XlFQu3RW2mTFcF7KQDcn8URl9nDuQxM1oQ5KRD7Cwal/yU0T4XBf46qSjMhMAuum4NrlwRn+9KJOqEQtilLw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050); SRVR:TY1PR01MB1866; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1866; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(376002)(136003)(39860400002)(396003)(366004)(189003)(199004)(6116002)(486006)(16586007)(316002)(58126008)(66066001)(47776003)(476003)(11346002)(50466002)(36756003)(2616005)(446003)(956004)(53416004)(106356001)(105586002)(86362001)(8676002)(7696005)(3846002)(23726003)(76176011)(52116002)(4326008)(386003)(7736002)(2906002)(6916009)(6486002)(5660300001)(305945005)(25786009)(16526019)(68736007)(186003)(97736004)(478600001)(81166006)(26005)(81156014)(53936002)(8936002)(69596002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1866; 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; TY1PR01MB1866; 23:YsiAVMRHXEUcYCdnI+EtkEJrIIRqFboTYvWXw1baU?= xoq73eGUDkzcyI9NXwbHQOU7wEiO2t4bTBcpbi7DrrMYV/usZfOxAuMCmua+GqRI6CJ5OZRMLal9BlxuuhFfK1WK/54+lwkX/+Zv+8XIl7wl/yx0geOW63Rctp4RGStq1hQhs4SrF9G9W96+ou3U+wotenYuxLwdFrVC3mQPZYWyp/OGyaTd8Si7NAaAWBf/+Atsocd7F052iTVe8Rp7r4lFwfj8RA3E+yUbo4CZTcXOTafU4nJ4T8bV8DDADLuOSMcywJVwJGKNAKraVN//UGJJHQmZB8Z+XD8I0sqJpJzWarEfOXiTeufTUnXEOkdngF0JWJzdJfzS6V2R+pSehPBWK9fVj1/v5aBGSZjUah4vIIDVcE4P0Tvj0tcY5JwQ29ADiCVi/reOr9Y0PfkYaU2s1r+PbK914izevX7MBa2/MWY/+r1a8mb9TQAORET/4eZ2CUS3WMcH9vFZ9srISb1Ey6U+4odFGAR1Xk7cFEIUUnWxjZ6topVX09EOxl2Q5axv/OdBJwXM2a+O+yCm6G82RrRp7wUXepgZPbdqqU2tR4CTyINsm4uy+B2glMYfTjJ3ot4RxtgSr+uRsF4iuEyANUeH7VKhSR74ExbjOHKxo/SlXpshIaUQngXcb83UvxAoP2FfmnuXsIEppmLzYU6Ht6prVguLeEZnisWXEfqBaIh/eXo5n5BUfWDPjmsCDf/cokN/Ua8l2zELB/4oIUZgaiKVdWKOn22RQORboegCAvFJGJtJuLZrxpDdxi5mo1HX5vSRFbBk29peZYw57NZKwDjF8NFTsJqurYEMymH7gnOc027luxzeH6QazPi/i9FLy9wAOvOFQUMcOyERpR3vLtBm0WWrkY2gXyhxaPJRErWLQa6VGMTEWxsv3EtrOGVgUSsfMrLBGcCtAZY8BXIW6VWhlZX+BFzWAbipm49G7joydVQ5GcjwSUbwQscAF3YivWwg0w6XQDT3Xe7yNAzafVNVVs+Vv/If4xutK5KYKw/QLAKkgaWsy+nOtxxzft7M/2SVX40ApLO+8VhkQ5VJVkAw7Nmtdy14fCthqlV8SCJVxNZ+qB61L1GF23Dl3C0gmXjewC9rl8veZo2Jf4OejMwbVlFI8Nas6kRUZrbaW2fgQbwbKL3h96JoUm/Elg= X-Microsoft-Antispam-Message-Info: qXpbfJCudBMq8rfIy2EYYwCLeoYEp+boqRjqTBlrth0ilsNF4/SLsYgUjmiCawn7OPuQ6nuiHZJRajAaYkTP2gVY9E4pTNYC+1Vtydc84UtenxFSdMiWfL6aD2blqgzG9SJ89TJptOzTB6rLndGTnwYktFqydAVSvk+bEscwYgWbsI+satAuYuC7NssvajGVydR24FX+6ws9q8EPE6KdZVOqXX/+wKuwRW/E9SL5cRLkuVDfqjjIwapQskHwpCDJhYm9QTs1Wnbmf8DVDrS7LhQ5a3gzm8RsI75ArTAdiytMG9rQOKC0+kd4Mvp1AuHEPij7EvymSHMnEDLNJ4a6OQjjTFnel2kJEdATFyuk3pc= X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1866; 6:1HNxVhjGbmhXv5yiki9fxld7HSgJyvfdS//HsMoLcbDMR5X4mFJdI9VKou7Onjj3knx/1ugOF5ivcefUGRPd632dbUEyEfWL+ZCjXV7bmrjhBeKIrITV3/0sDbah7os0wVMqjC38FMNJ81qIfuDE9etgJuROLsSwNTYhwOB4miy+BPwK8F7nyz16YCACTIJAke7+tnjdU15zm/76mLMON3z49nA3ZjXpm29WNzJ4Gtru3ouubkYULud/G48Uu0PzCXP7bTnn1aU6J/+KGQPNQQ4QZWaKqAW0ZPB4flnRywAOr0RFR3vG2ir14CZRXJtiVHa2vSNxwW1qIkCVKFqY8ZEgU9wJRfgXL0VjaLaEgb5O18mzn60EOttWqC4677Rd7X0HMm0YQ12t/F+TAM67kchOzyV8lz0auj/Uaj/sVycBx4jbDtK9oZNUA08WqixBxZ5s874rKp93wb7KkWtzcQ==; 5:THDIEiNRGtzYUPl56CfEsYSLgAEq0zWF7CgmF99m0QxsqUFULOU92WiNsCsp0yLDqujo8F/D8cGFTSIl2SOyfX6FrqtmzRt10pZZ+qWKkxwR4jtsQCfzcNd2YaDlO2TKjj0YVVU3tMkZx6dSIHNNdLdpYSwOFmuzbEBJoopQm6k=; 7:S9FwBOJY4lRIFaFCtGSBVd7yWnNy+feRgQaPUYzL1lffssyW+1UqKxzp40+myf4yvwV5MwcIKiJn2HGyMCyKqZfqVovsP6TIHLmMssZ+56jvivcqXpsEELaCcTERGmHkiO+hxHQasEjSK/SaFUtgOQFE8Ju/JMH7859W5V6UF+qInsKLX+Oog6DLyaPvV4XmTa3cyoDQAGxtww1ulLQVgnoPp0YbtA9K9xJTPYI1ux2GC1HLQa4zuiPViI/Xz835 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1866; 20:yE9lckkc9awC+Owv0ZOEXeHZDj0JPNqO0hEvbkXhoj52veyviwAosEdkbKTdqRdmL/t2qTx4ojWhW9aKAsT39+AYeO9OjGuR5onQ9Hk2Oczm7M1uD8JpHR+9ZnmkxKu2rl3QWxIlf78qNSFwizi9km3tbPQpPHcX2rP9PZmbZHs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:28:30.5757 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9a2f0806-8d98-4049-89eb-08d61d060abf X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1866 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 02/11] ASoC: rename for_each_rtd_codec_dai_reverse to rollback 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 commit 0b7990e38971 ("ASoC: add for_each_rtd_codec_dai() macro") added for_each_rtd_codec_dai_reverse(). but _rollback() is better naming than _reverse(). This patch rename it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 2 +- sound/soc/soc-pcm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 1e093b3..ec1ae9f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1164,7 +1164,7 @@ struct snd_soc_pcm_runtime { for ((i) = 0; \ ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \ (i)++) -#define for_each_rtd_codec_dai_reverse(rtd, i, dai) \ +#define for_each_rtd_codec_dai_rollback(rtd, i, dai) \ for (; ((i--) >= 0) && ((dai) = rtd->codec_dais[i]);) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e387fff..1eff1db 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -621,7 +621,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) i = rtd->num_codecs; codec_dai_err: - for_each_rtd_codec_dai_reverse(rtd, i, codec_dai) { + for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) { if (codec_dai->driver->ops->shutdown) codec_dai->driver->ops->shutdown(substream, codec_dai); } @@ -1015,7 +1015,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, i = rtd->num_codecs; codec_err: - for_each_rtd_codec_dai_reverse(rtd, i, codec_dai) { + for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) { if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free(substream, codec_dai); codec_dai->rate = 0; From patchwork Tue Sep 18 01:28:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603633 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 E07FC112B for ; Tue, 18 Sep 2018 01:29:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD5EE2AA35 for ; Tue, 18 Sep 2018 01:29:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C160C2AA3C; Tue, 18 Sep 2018 01:29:00 +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 55D122AA35 for ; Tue, 18 Sep 2018 01:28:59 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3A39026788E; Tue, 18 Sep 2018 03:28:58 +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 ABEC926788B; Tue, 18 Sep 2018 03:28:55 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 3E92426788B for ; Tue, 18 Sep 2018 03:28:51 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:28:50 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id B3F6765537; Tue, 18 Sep 2018 10:28:50 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="291183218" Received: from mail-ty1jpn01lp0183.outbound.protection.outlook.com (HELO JPN01-TY1-obe.outbound.protection.outlook.com) ([23.103.139.183]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:28:50 +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=ori9Qw8e8CqGANGR7XBmK9WLubmncw7oNU5ryuEgVTk=; b=SsE9jfFChH+ovgNifoOonasFgudy4OIdlMA+qz4EVeXcbouTc1wVjwzaLhcHDO2Mw7VLeUCP35oE/p1bpy37n6pyD8d2IRhio7aQy1LTzLR5k2yIRxas+J9t/ad829uerQMYrIFC/XYepXGJjtLk8H+MYNsJvCI5qlVOOsLzEQQ= 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 TYXPR01MB1872.jpnprd01.prod.outlook.com (2603:1096:403:12::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Tue, 18 Sep 2018 01:28:49 +0000 Message-ID: <87worjppm1.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:28:49 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY2PR06CA0030.apcprd06.prod.outlook.com (2603:1096:404:2e::18) To TYXPR01MB1872.jpnprd01.prod.outlook.com (2603:1096:403:12::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2cbf480-94c1-4247-01bf-08d61d0615e6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYXPR01MB1872; X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1872; 3:HI6XExvU4TStWzkUWzm70XC2r90g7/eige+u/jubI0/+u20sxKq9jtxxKoM/1uLTpj3mbqPRbo1QhtfHwD3FpjP9y/zqER3lLx7BlAfwqG4yj8/k7a6cVkHiZ1GnpPtOzA+WwZ02Ycgwgj7H2mHRWJgCw4uHWl4yh6P3nNnBfjCKn0814mzy/NSqjYUSqPgT25r5I5tV4pGjKrtyKf7XL1t2LlAgoegpZnyJCLWbYsdTxajgWhrcmCaHbOWaHOFr; 25:EKLP4pa+4XJktfvLt22xrBkJ9dfsVFSHK77bPkUpcTBiyTvdE2Apx6IcJ07UyTWsVTHk2lhXqM7KA6L9AvND+noSAWgfCEcU/zk1h+000EybeVTRL6qGLFfNG0ZO6VLkV5RZKJ02m/z2ES/tr+TOUNHzGMirJMEswZIYIvvG5jzyUR9sTwJXKRGrnAIfC+s3/Rnlj+8l87zCKIDTDD0UEF/TpSkT6ot5FTPsN3jugeEGMAhGZuROZrUOqW3AoO262O+fOZTqhPGORx9ASdivS9cxPPYaIEYuGbii8BrnZR+pUMUKMegj4fHZnds1oA9zLbJttfsDokY7GoJUyT/HLg==; 31:nUlaoshaI1sIZMD/j2m3KHlJHvfYWO7ElOb9PNLU72sIF0LPxU9Z3TwGd7n2vnclRvLB4Oo0U7sFtvBFjb1V/2ajyYnCv87vtkX+XpPce7UOaKCNvNdew8nS3ALYmzl+NnGjsXyhBtK8tq/X63H+elHuMGseLXZTrBKur3iOV+eeARke+P5nEefuVLUEBFQmwCKQVJ3k9q9cDGf6UzIYvGFuhnSBeGAEEvyHnZiVT00= X-MS-TrafficTypeDiagnostic: TYXPR01MB1872: X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1872; 20:lCpyPXpdYf3kjSN7PNcSJc6Km+ByxcaoDxnzYtD0Tzue+X4FzwVxZcq6NHqrFCE8UdzRq1iz6gYKgUnEH7NDVZvxAopSEITNILXtnkZ7CWAIg1Fe4UqlPh1C39rszyow8rnUH7cw+gkFn/6Gx5kb/JVx7ZU/u6K2hLMqUe/jS3DqP9fG/rM3H/0IojNGW8SZwfn6NgvzFNBVDX6eFzJJLApTfUZTkD4xxSNNam32vJKtFCfl2YIuSYjcb8I4E1ahyJ4BLii+hPZu+mReHO3gSa4fIWHR2hZjEVDTLm9cuy7/t/YQGBdKvN3EF5gzvsbBSnzb5fyjhU6qMgOgcJxFQauS8CIP2gc1DcWSpXC5Ocf3PPNFkL1IMyLTphGXUbqRpMJBUx/q9zC/YWVB3gJHSKDBHDcuduBkVvX++xL4XrgBMpXhYkntx7WuyTQYJwjm5X32SRczP/YGPhltdBXF4oyAHQ75GSN0E5MEyUzPrrvy0xNhniFFqhkKG6B/2xvJ; 4:Ey690BpuaLJ/LaPtl1LGIknGcT94iB8CzSHxV6So7naO8pPrKQpfUY7X7GLn9R18O2Fpvtw4xxmv4uVSmptL1f0+8l8HOX8UUsEAhjNpKzPmwuk9o0F2KXmlxoOqyrAD2NtXmNiiqsEg8jIeQfD8kOI//M40kz4yz541OhWFpt9VP+q10DcR+sldR9DpnUG3pP39V04RNsvMwME+VKFaWUUlqMf9BpdRRZ66PIV056soeJFCgGbuRvAynItztzBfH5bXCoA9HvHP74Z/unYovXu4vxVY6kzheEtYPHrS0AY4o9KdvWjbJIIxh4NNcmY9 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)(5005006)(8121501046)(3231355)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(201708071742011)(7699050); SRVR:TYXPR01MB1872; BCL:0; PCL:0; RULEID:; SRVR:TYXPR01MB1872; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(366004)(136003)(376002)(346002)(39860400002)(189003)(199004)(50466002)(25786009)(2906002)(14444005)(186003)(69596002)(6116002)(106356001)(26005)(3846002)(47776003)(4326008)(6486002)(6916009)(386003)(575784001)(66066001)(5660300001)(86362001)(105586002)(23726003)(97736004)(58126008)(81166006)(68736007)(8936002)(36756003)(53936002)(7696005)(76176011)(16526019)(8676002)(53416004)(478600001)(305945005)(7736002)(81156014)(16586007)(956004)(2616005)(11346002)(446003)(476003)(486006)(316002)(52116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYXPR01MB1872; 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; TYXPR01MB1872; 23:amnyU+wwaC/4ZOU3iHpP92cH3OuTwn1N85A9WPMIH?= eCqAqeMVQWfo2dzyzG2wpNIgCnzpN2K+3WIbWBqhSR4Ir/amnr6G9bxma005nA9Ihyq/12Y5KQw0fWEgE0uFRsAaQsa6Tc7R3nIlVHg2ZKhpHvKkDi4UG520Be+F0Ray4egxziXyfkchdrXvz5xsIuNstgwcmx4aGOr7flzQjOzXQkLSnspoALg+JJsNglvgYGfxXrAklETJD+833gj9HvUTpi/UMjQcthD0UNS2wqpW9FCNH7IG1KNI0sQFYmNVDkGgwwiMrGLwFyc9D4Zu6sPkw1hloLYEVPwdR5EJTe5msKv6WXkZBsUmii2Prs+RtFTx0eRxcqF0ebBhNrKxaRuTYHy/HAdjt3coxN/PWu8mDzqtk4F55OYloe2gdaSeaHBvebzcrnBBHSkgSEdXj/hULaflb2oAf4j5acENtxrYwFVAQJjFd45IMfReWZmztdR9ukrm3Dt/Y/LBYPgyBmmP7sZ74RadOtL6wSYwaOIpGsgqcanLVI4E9cPZu4nBUHJ44ECFx6th8IdhjkE7ram465a791HUUFndsHfpq++aWp22Lguz1wh47fPOoSECDQswqPAedO5t4m22CYPpAnH/vmFpRoTRaqQSqS3qniECRRZ0adQ1coHOmqRuETXsIAdn5GiTdf9vHllJ3W5LmJ+WFmaLFs0PYjzcKeS3dUVcxFhpdGlZu/5+Jgk1rpq49Q5Z+HEpdyX5kZ5cnIhowp96VgQiO3S4RXCuJ/NGtLXAr9Ubnfoag5WUFeKX3QXKi198fwjgSG1Z3mUM09bvNtf+IpNKd6QaMKMbSxxGJIvnqnqvD29ewtDxrkFS3RJHnB7kpq09Ca6gH1IVf5y7HlJ9mIuqqoFxJjOuTO2SuGxdy7uEkZIWE8VNUZAMzHwImYUaD/MnGes5DuQtH486x9XRQ/oFvW3+3xz093FtBkwr4nqSPe0hK8o2APh3CRMulDqXCakiRZxxZn2bNYQrT1h8BqrpYea57NIWVlK6HF2n1HhpRbspRAYpVUs333VS7sRQbkQ6DQ9BOD71LCbLJUsAGmSOTUgNabPU2e/7o/TxylphmUSzSQltA+850HALWiGYA8eufB9kEF0sGnzTUyh+3ei9LRjvdxJvgCsfitag6GiXWtdV33K2wo/fgDbCJsf+xbiIbgObkUF9j9jEDD/LwL/DqwAYLNhTWEc6ETqTQ== X-Microsoft-Antispam-Message-Info: 04rLjpJA4UXN0v4ooFN6TP+PaGJSbXTeUFCol6XbXi/pMLF4yK6R8fzP+fZ5KaoL2LhNjON6M3J2uM7m3EwRRQDOLsXcSTwQSj+ackl3agz7fW/o72ESSAv6YYE7lJur6QhPYqHbnTKq+b0zr3XVejcKEjteaiqLiKAZLE3KGSx7HZ3yjjWlvN/vAOeqfPPnZV1h2da7FUKkvSv/2lwiioqsQNWYwzrdAjZH/F8jfRITySVLoZoWsY6l8KU+3DgSmSjWu+qV4S8zOkaM6QqTf8ecKQpezJTprTAkqhDyb8Q8bhyZYJ65ICjC+GpXIIGFytbvLgAFpo3Z1DEg08C8cKHbkNd96F+Pwn1895br3xg= X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1872; 6:7NTbQ+N/LlDb9wAFe4mWGyrDEq1osivHV2FOFOI3G4LPQP47muqdvPdBk/mnX0TKETSgbNyeJWoonWRHEcQaF/VOk8uQakKeSJuTQZjZ4U+fc/SshBzvdOss1Q1ADQ9GZ2diX4wW4WKHFqn+zr9MzMCjRxGt7Jyma9nhpf1/IgV0VyesvsaaLBWEbGAuVUaFMiMHlGtmRP5dBZ46WcO++w4nGLG3f714YJPuTIvwAzVGbbosud3xm2LRjm7b10bcO+nEOgS8OIEn71z3SXPELf2eDCMTVbZMJN+gN18Y2zieBO/06MAxL3bB8e7vqLeNR7Q221Ao1tLA1dmb0t3LS+nRWKHMxL/kHmE8jarlA+1xdDqJn6gW2mt3p7pFi3IqHPkEw5KXvq3p1Ts/fBJQ2gekuGVqo9hdxtfabjhZM0obZwfJpi4yf6lr4gkxZ8Nuvlweoh2vW3ddoqDmDbSZFw==; 5:GuoiY8IvNAU4FJyOYpJxI93SaXMR3+cDacC6o2bqHDcMSc3hRyrMHeTNj/rygRLiJ8lMmTKr1AGfSroCPOcM8RmG24onhnYzBDBRoq88+SXSX+pbQrgSFE4TYjABla9MDzo9RBdN/a5CrjmRCngwBdcPOTcB+Cp9QmaH6j6FvHY=; 7:wy/Kyu/PAUsfPn9kA19ox6CoskimpXcUGRaDXIsnZohVrIdFlXwvoX6jUvZ/OogpzM7txR2f0CTzIeTb53KKj2urvwXenbiOenA9f2ujy9RPW7UEzV9jn9VZ6GJE55nTqJaT3UOde+PP/si/McEPe01KooT5P7xJ4IzTTM5qBnKpiyQZJd9u27oePoSLTxEMdQ8SthdW1IvTGmd4YClV31Zg0QCw8LdjpP6D9CgeGqb7OfaWd4U/0+A2aivqmDej SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1872; 20:nSbvTj1y573NdlLYXokw5APwGif+5cgqdys1d66PtkqS4JRtNGcN3dSfuPhFNLB7VkAQvNdl/wQJFxEKi9a1ECWP9aXgXlsbnoMvg2AEvOoD6Bj1cx0Y8Vlpxzc18koPbpWyFSJL9AWNecZ3EkT9v99XCuX4ohi2qJ5Pg1ArMIc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:28:49.3418 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2cbf480-94c1-4247-01bf-08d61d0615e6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYXPR01MB1872 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 03/11] ASoC: add for_each_card_prelinks() 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_card_prelinks() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 4 ++++ sound/soc/fsl/pcm030-audio-fabric.c | 5 +++-- sound/soc/generic/simple-card-utils.c | 6 ++---- sound/soc/intel/boards/skl_hda_dsp_generic.c | 5 +++-- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 13 +++++++------ sound/soc/mediatek/mt2701/mt2701-wm8960.c | 13 +++++++------ sound/soc/mediatek/mt6797/mt6797-mt6351.c | 13 +++++++------ sound/soc/mediatek/mt8173/mt8173-max98090.c | 13 +++++++------ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 ++++--- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 7 ++++--- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 7 ++++--- sound/soc/meson/axg-card.c | 3 +-- sound/soc/qcom/apq8096.c | 7 +++---- sound/soc/qcom/sdm845.c | 7 +++---- sound/soc/samsung/tm2_wm5110.c | 13 +++++++------ sound/soc/soc-core.c | 16 +++++++--------- 16 files changed, 73 insertions(+), 66 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index ec1ae9f..f94b989 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1120,6 +1120,10 @@ struct snd_soc_card { void *drvdata; }; +#define for_each_card_prelinks(card, i, link) \ + for ((i) = 0; \ + ((i) < (card)->num_links) && ((link) = &(card)->dai_link[i]); \ + (i)++) /* SoC machine DAI configuration, glues a codec and cpu DAI together */ struct snd_soc_pcm_runtime { diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index ec73122..e339f36 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -57,6 +57,7 @@ static int pcm030_fabric_probe(struct platform_device *op) struct device_node *platform_np; struct snd_soc_card *card = &pcm030_card; struct pcm030_audio_data *pdata; + struct snd_soc_dai_link *dai_link; int ret; int i; @@ -78,8 +79,8 @@ static int pcm030_fabric_probe(struct platform_device *op) return -ENODEV; } - for (i = 0; i < card->num_links; i++) - card->dai_link[i].platform_of_node = platform_np; + for_each_card_prelinks(card, i, dai_link) + dai_link->platform_of_node = platform_np; ret = request_module("snd-soc-wm9712"); if (ret) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index b400dbf1f..f34cc6c 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -404,11 +404,9 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_cpu); int asoc_simple_card_clean_reference(struct snd_soc_card *card) { struct snd_soc_dai_link *dai_link; - int num_links; + int i; - for (num_links = 0, dai_link = card->dai_link; - num_links < card->num_links; - num_links++, dai_link++) { + for_each_card_prelinks(card, i, dai_link) { of_node_put(dai_link->cpu_of_node); of_node_put(dai_link->codecs->of_node); } diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index b213e9b..b415dd4 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -104,6 +104,7 @@ static struct snd_soc_card hda_soc_card = { static int skl_hda_fill_card_info(struct skl_machine_pdata *pdata) { struct snd_soc_card *card = &hda_soc_card; + struct snd_soc_dai_link *dai_link; u32 codec_count, codec_mask; int i, num_links, num_route; @@ -125,8 +126,8 @@ static int skl_hda_fill_card_info(struct skl_machine_pdata *pdata) card->num_links = num_links; card->num_dapm_routes = num_route; - for (i = 0; i < num_links; i++) - skl_hda_be_dai_links[i].platform_name = pdata->platform; + for_each_card_prelinks(card, i, dai_link) + dai_link->platform_name = pdata->platform; return 0; } diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c index 666282b..875f846 100644 --- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c +++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c @@ -299,6 +299,7 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) devm_kzalloc(&pdev->dev, sizeof(struct mt2701_cs42448_private), GFP_KERNEL); struct device *dev = &pdev->dev; + struct snd_soc_dai_link *dai_link; if (!priv) return -ENOMEM; @@ -309,10 +310,10 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Property 'platform' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt2701_cs42448_dai_links[i].platform_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_links->platform_name) continue; - mt2701_cs42448_dai_links[i].platform_of_node = platform_node; + dai_links->platform_of_node = platform_node; } card->dev = dev; @@ -324,10 +325,10 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) "Property 'audio-codec' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt2701_cs42448_dai_links[i].codec_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_links->codec_name) continue; - mt2701_cs42448_dai_links[i].codec_of_node = codec_node; + dai_links->codec_of_node = codec_node; } codec_node_bt_mrg = of_parse_phandle(pdev->dev.of_node, diff --git a/sound/soc/mediatek/mt2701/mt2701-wm8960.c b/sound/soc/mediatek/mt2701/mt2701-wm8960.c index e5d49e6..c67f629 100644 --- a/sound/soc/mediatek/mt2701/mt2701-wm8960.c +++ b/sound/soc/mediatek/mt2701/mt2701-wm8960.c @@ -97,6 +97,7 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt2701_wm8960_card; struct device_node *platform_node, *codec_node; + struct snd_soc_dai_link *dai_link; int ret, i; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -105,10 +106,10 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Property 'platform' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt2701_wm8960_dai_links[i].platform_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_links->platform_name) continue; - mt2701_wm8960_dai_links[i].platform_of_node = platform_node; + dai_links->platform_of_node = platform_node; } card->dev = &pdev->dev; @@ -120,10 +121,10 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) "Property 'audio-codec' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt2701_wm8960_dai_links[i].codec_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_links->codec_name) continue; - mt2701_wm8960_dai_links[i].codec_of_node = codec_node; + dai_links->codec_of_node = codec_node; } ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c index 6e578e8..ff2e0ca 100644 --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c @@ -158,6 +158,7 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt6797_mt6351_card; struct device_node *platform_node, *codec_node; + struct snd_soc_dai_link *dai_link; int ret, i; card->dev = &pdev->dev; @@ -168,10 +169,10 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Property 'platform' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt6797_mt6351_dai_links[i].platform_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_link->platform_name) continue; - mt6797_mt6351_dai_links[i].platform_of_node = platform_node; + dai_links->platform_of_node = platform_node; } codec_node = of_parse_phandle(pdev->dev.of_node, @@ -181,10 +182,10 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev) "Property 'audio-codec' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt6797_mt6351_dai_links[i].codec_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_links->codec_name) continue; - mt6797_mt6351_dai_links[i].codec_of_node = codec_node; + dai_links->codec_of_node = codec_node; } ret = devm_snd_soc_register_card(&pdev->dev, card); diff --git a/sound/soc/mediatek/mt8173/mt8173-max98090.c b/sound/soc/mediatek/mt8173/mt8173-max98090.c index 902d111..4d6596d 100644 --- a/sound/soc/mediatek/mt8173/mt8173-max98090.c +++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c @@ -137,6 +137,7 @@ static int mt8173_max98090_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt8173_max98090_card; struct device_node *codec_node, *platform_node; + struct snd_soc_dai_link *dai_link; int ret, i; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -145,10 +146,10 @@ static int mt8173_max98090_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Property 'platform' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt8173_max98090_dais[i].platform_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_link->platform_name) continue; - mt8173_max98090_dais[i].platform_of_node = platform_node; + dai_link->platform_of_node = platform_node; } codec_node = of_parse_phandle(pdev->dev.of_node, @@ -158,10 +159,10 @@ static int mt8173_max98090_dev_probe(struct platform_device *pdev) "Property 'audio-codec' missing or invalid\n"); return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt8173_max98090_dais[i].codec_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_link->codec_name) continue; - mt8173_max98090_dais[i].codec_of_node = codec_node; + dai_link->codec_of_node = codec_node; } card->dev = &pdev->dev; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index 5b4e901..da5b58c 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -178,6 +178,7 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt8173_rt5650_rt5514_card; struct device_node *platform_node; + struct snd_soc_dai_link *dai_link; int i, ret; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -187,10 +188,10 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt8173_rt5650_rt5514_dais[i].platform_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_link->platform_name) continue; - mt8173_rt5650_rt5514_dais[i].platform_of_node = platform_node; + dai_link->platform_of_node = platform_node; } mt8173_rt5650_rt5514_codecs[0].of_node = diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index 82675ed..d83cd03 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -224,6 +224,7 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt8173_rt5650_rt5676_card; struct device_node *platform_node; + struct snd_soc_dai_link *dai_link; int i, ret; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -233,10 +234,10 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt8173_rt5650_rt5676_dais[i].platform_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_link->platform_name) continue; - mt8173_rt5650_rt5676_dais[i].platform_of_node = platform_node; + dai_link->platform_of_node = platform_node; } mt8173_rt5650_rt5676_codecs[0].of_node = diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index ef05fbc..7edf250 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -239,6 +239,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) struct device_node *platform_node; struct device_node *np; const char *codec_capture_dai; + struct snd_soc_dai_link *dai_link; int i, ret; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -248,10 +249,10 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) return -EINVAL; } - for (i = 0; i < card->num_links; i++) { - if (mt8173_rt5650_dais[i].platform_name) + for_each_card_prelinks(card, i, dai_link) { + if (dai_link->platform_name) continue; - mt8173_rt5650_dais[i].platform_of_node = platform_node; + dai_link->platform_of_node = platform_node; } mt8173_rt5650_codecs[0].of_node = diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 197e10a..aa54d2c 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -101,8 +101,7 @@ static void axg_card_clean_references(struct axg_card *priv) int i, j; if (card->dai_link) { - for (i = 0; i < card->num_links; i++) { - link = &card->dai_link[i]; + for_each_card_prelinks(card, i, link) { of_node_put(link->cpu_of_node); for_each_link_codecs(link, j, codec) of_node_put(codec->of_node); diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c index 1543e85..fb45f39 100644 --- a/sound/soc/qcom/apq8096.c +++ b/sound/soc/qcom/apq8096.c @@ -25,13 +25,12 @@ static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static void apq8096_add_be_ops(struct snd_soc_card *card) { - struct snd_soc_dai_link *link = card->dai_link; - int i, num_links = card->num_links; + struct snd_soc_dai_link *link; + int i; - for (i = 0; i < num_links; i++) { + for_each_card_prelinks(card, i, link) { if (link->no_pcm == 1) link->be_hw_params_fixup = apq8096_be_hw_params_fixup; - link++; } } diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index 2a781d8..9effbec 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -195,15 +195,14 @@ static int sdm845_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static void sdm845_add_be_ops(struct snd_soc_card *card) { - struct snd_soc_dai_link *link = card->dai_link; - int i, num_links = card->num_links; + struct snd_soc_dai_link *link; + int i; - for (i = 0; i < num_links; i++) { + for_each_card_prelinks(card, i, link) { if (link->no_pcm == 1) { link->ops = &sdm845_be_ops; link->be_hw_params_fixup = sdm845_be_hw_params_fixup; } - link++; } } diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 43332c3..dc93941 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -491,6 +491,7 @@ static int tm2_probe(struct platform_device *pdev) struct snd_soc_card *card = &tm2_card; struct tm2_machine_priv *priv; struct of_phandle_args args; + struct snd_soc_dai_link *dai_link; int num_codecs, ret, i; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -558,18 +559,18 @@ static int tm2_probe(struct platform_device *pdev) } /* Initialize WM5110 - I2S and HDMI - I2S1 DAI links */ - for (i = 0; i < card->num_links; i++) { + for_each_card_prelinks(card, i, dai_link) { unsigned int dai_index = 0; /* WM5110 */ - card->dai_link[i].cpu_name = NULL; - card->dai_link[i].platform_name = NULL; + dai_link->cpu_name = NULL; + dai_link->platform_name = NULL; if (num_codecs > 1 && i == card->num_links - 1) dai_index = 1; /* HDMI */ - card->dai_link[i].codec_of_node = codec_dai_node[dai_index]; - card->dai_link[i].cpu_of_node = cpu_dai_node[dai_index]; - card->dai_link[i].platform_of_node = cpu_dai_node[dai_index]; + dai_link->codec_of_node = codec_dai_node[dai_index]; + dai_link->cpu_of_node = cpu_dai_node[dai_index]; + dai_link->platform_of_node = cpu_dai_node[dai_index]; } if (num_codecs > 1) { diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index da2b2a7..532d8c5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1889,9 +1889,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) continue; /* machine matches, so override the rtd data */ - for (i = 0; i < card->num_links; i++) { - - dai_link = &card->dai_link[i]; + for_each_card_prelinks(card, i, dai_link) { /* ignore this FE */ if (dai_link->dynamic) { @@ -1955,8 +1953,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) soc_check_tplg_fes(card); /* bind DAIs */ - for (i = 0; i < card->num_links; i++) { - ret = soc_bind_dai_link(card, &card->dai_link[i]); + for_each_card_prelinks(card, i, dai_link) { + ret = soc_bind_dai_link(card, dai_link); if (ret != 0) goto base_error; } @@ -1969,8 +1967,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } /* add predefined DAI links to the list */ - for (i = 0; i < card->num_links; i++) - snd_soc_add_dai_link(card, card->dai_link+i); + for_each_card_prelinks(card, i, dai_link) + snd_soc_add_dai_link(card, dai_link); /* card bind complete so register a sound card */ ret = snd_card_new(card->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, @@ -2714,12 +2712,12 @@ static int snd_soc_bind_card(struct snd_soc_card *card) int snd_soc_register_card(struct snd_soc_card *card) { int i, ret; + struct snd_soc_dai_link *link; if (!card->name || !card->dev) return -EINVAL; - for (i = 0; i < card->num_links; i++) { - struct snd_soc_dai_link *link = &card->dai_link[i]; + for_each_card_prelinks(card, i, link) { ret = soc_init_dai_link(card, link); if (ret) { From patchwork Tue Sep 18 01:29:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603635 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 BAB26112B for ; Tue, 18 Sep 2018 01:29:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9D0C2AA35 for ; Tue, 18 Sep 2018 01:29:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C0AB2AA38; Tue, 18 Sep 2018 01:29:30 +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 C234B2AA35 for ; Tue, 18 Sep 2018 01:29:29 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9EA9C26788C; Tue, 18 Sep 2018 03:29:28 +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 9012E267893; Tue, 18 Sep 2018 03:29:25 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id A6DAF2678A5 for ; Tue, 18 Sep 2018 03:29:21 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:29:20 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 5D167655CA; Tue, 18 Sep 2018 10:29:20 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="291183303" Received: from mail-os2jpn01lp0151.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.151]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:29:20 +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=I3nz4OSD71sOxj/BexEFBTwpxsPaI+fnXQCVaYcO41U=; b=ouiZoIQaPONApugbTOlfflRZrWHTJltekORbh+YFvYjgheGG+Hi/PaCM6w0F2IDNL+4MpNwV2nrfpSlXsrAAkqUJI3prbNFHTdf/v0gT5x4rDJ2ZMlGm1cDVf0NWF2KCxXiz2NLsDdK/8i3D8jcl94lA++kuMMBTFI5dTInMIXo= 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 OSAPR01MB1858.jpnprd01.prod.outlook.com (2603:1096:603:2d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 18 Sep 2018 01:29:16 +0000 Message-ID: <87va73ppl8.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:29:16 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0049.jpnprd01.prod.outlook.com (2603:1096:404:2b::13) To OSAPR01MB1858.jpnprd01.prod.outlook.com (2603:1096:603:2d::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39959179-44a1-4f79-77be-08d61d062616 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:OSAPR01MB1858; X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 3:nSpB4KxebWhmlLoCHymNiVqtF+jRyCL9aG9F6GefhVV3yG64wq0Wktuvpw4ndhHN4tYBJNvYgZmrLGLe62PAft9tMY2VJXWAkf7H8hsin7I7h9FG7RC7XhwMBk6bGFjyAyQen61EGv+TU1YwiCBZAmiZQWhPVPD7HneluYhTRBcVHEr7aG6x6CPye79snoZgQJOHG88+oyW1sZnqUSXpOuE9rzifAUpV9XwDK3msEKkTljdjDNq39y0456RorV0m; 25:gXZKpODYnXRoSNMG8YmBQRQTt0QRmg0BWoGzAyLNgxuPJ6HqUeovr/EZXaFoqgoN+aKFGam/wi04splBtCzGl1DUsiBWdYKGHMTtf4nM9wmrmEqBRBJSmFqD47Rl8eEMKwI9mADSRvX0y95me9CiGyRBlLqE2AypKXdbhyXYc3EqhtfwEqvrmG+gVNke3x0FnD0KyUUFbOBGi2ncUSdYrp7c4/4SdSLv+naXblQ0KLje9LbMtOsXHNPYtCnV8jGwmguaDevbKlkauR2+HVLP0kYzwaA7vEVzu3jgk2xvOS0MOZEl1/Vbh4In3MDrR4wqE3ceioU89t9lK31NmMJn9A==; 31:juc6UFFRn2yOhqDZGaH0hersTTLxNjc3l8sfsY+8tRP72bt4yTO+cVqfVlFAbIKi8x0hP3avg/UXcVSQ6d8CVUbO9v/fu83Z5kjeXjs/sTm60a/FFuMUZ4Ipi5m4U192z3PqEp0dcRFxuq2IkZ8BTkt5+l8GumF+rKb820oDTBODoN7XOdn8JkknKOCat8nnTbVTNoviqaD1cIXQ6JPRXTe6RfFMc59HgczG284uOs8= X-MS-TrafficTypeDiagnostic: OSAPR01MB1858: X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 20:51iXFBkyXkE8OAyd1vS+4/puB5tYpO+E0sIxDjSVRopOneL7AH6DQlJrxFSfwtJE5kqX3XffBovjfbj101sBpzcnBjDU1Sa4hGgg51gZZUssCObFOi/lSkV2PkL7tLcUUAqy6Nie5XDNDWFBkOqQIvOazcNP1ozAzXEGJWYsYoD7Dat5zE9X2wCfuNXfIwuKCzFstRd8rBM7YBGsndBrZUyfqJuv5wbGgwNP9pjDVHpp9cMTsuQBHd9/sb/Tvw2xHNefaZOJYv6HeLkCQvmH6BFm5FLIZUIuLyUYQiptVqxYOJOR4kMug+73bbMlxGAam4OmW9cgUkKSMTeJpD4l1Q8WtsfdwfOQxpx/X+PM1whEzXttG9QYl9NrwUCMOWuhZcv4GZQSvaclpK6HCMM3Y0Tt5Iy5eqmgIzm61DQZCU2vCB0BoftF64tPCMJu9VsDe3zIKWMZQprruWTp3tpiBv/ocHEdyrlYgKoRbUxSJ7gC3kxl00s/eLR5cXIbfT/+; 4:HCxt1tZmEptzHMc2JDtUai20MdMAt+hSSpiA2pr+rW6w2TARo01YqBpgfYBRtWqQqWZICvBAsmZiH+TsbFFLX+e0ovX3THQY0qj/pHrL8o5yPWjj095ZV7OyWuVnu1V5JLmSTf1kyk/m3sbAdDxvrmppOml9P7xkfc+wpopaCLkuMTpNKqd0wNU/L6ZI7daQNc7kEIRNYLQBmVu0dg21sYK/ew3ZJW8jHiqqpBDFFOi+GCE5zUT3qO++ES3Q6uyD6+wrCHGg9c2n6pgTxUz7mgL2Ac4EtGE3MBse70n7vefruCl/ESSJlTv4NDOErUzc 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)(5005006)(8121501046)(3231355)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050); SRVR:OSAPR01MB1858; BCL:0; PCL:0; RULEID:; SRVR:OSAPR01MB1858; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(396003)(39860400002)(366004)(376002)(346002)(199004)(189003)(25786009)(4326008)(50466002)(58126008)(476003)(2616005)(956004)(446003)(11346002)(7696005)(486006)(14444005)(186003)(16586007)(16526019)(316002)(53416004)(86362001)(69596002)(8676002)(6116002)(3846002)(478600001)(23726003)(97736004)(105586002)(36756003)(106356001)(66066001)(47776003)(6916009)(305945005)(81156014)(81166006)(386003)(26005)(52116002)(76176011)(7736002)(2906002)(5660300001)(68736007)(6486002)(53936002)(8936002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:OSAPR01MB1858; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; OSAPR01MB1858; 23:zL2oOpCXz8WnvEwSb30bfmUQHNLJtrmhkN3Kg3WsG?= YGM9pD6ymuYDWfSgGyvJu2HwkmWk0QPkSOBBNocjmdY/E6WuCQPYNJSD+OlxpjiPiGDd/n/abVrgZFzjVq5+bSvmb6M/wGn0S3jVTAZHB3WWTHtbBnk7EQI2IAPaB2qtHwnkOjfPOLbrwSKRq9JDjT93PayVFeQAdYQ8qzJU/UssLY3ajcjHLQj6IXFdM9LRyggoUGPiGC+3etZP/YGj8VcTPx8f6meEE0ml0O8wHYz7qWU68Hq9dnT/lI1jwe0+CfX5YlloXuYEoHBglwVhLi2ob+aB464Oj37ejDm9SyAayUB0abAdsdsmhfwu4Gkw6oJ+N9s7K7Pq6M6UxzAc/5A47Jwb++R3y3nuVCUXrirJaL0q5OopOsRJDZ32liMgR6HRMPVWeiTPnmgX1Ohm6g683YXXWbQ6Zt77NVL8r35P1ApWOPn7mDfd/s+VPZzJsmBv8qUSBg5ZokWcbKiIZn2z2RpyHzAUs/Ews4WB/ewnQG87U3io18h1b400pjbhnMqJnhKjRB7S1rDKOa4Ow0exK7WMTsEj7l6hTD+SlSm+J8vLa/pNp7FQD9s4TQfj4uXZh1CJDeUyTLrhmJQ0Sac5IW/FY8by7BGvdTZi9U3fK90FMyZF0ryKi2W2Bgmced5GU5W0jX07ewRd2bI/Fsag36o0icnU/V5BIOFa9oRFXI/EBedZ+MnsYbDwoM4X7RuaJ0+tYRPBI4VLABPrzwxSXHkW60FO5DZs/H2ip6QE5nolZGF4JLFoR9PEoFDyBE4f3oNvZvajhhvaiq7RfvIRUFIgseYgTA/q6AT+nWpAFRh533ZSCk+t/On8A/y0+ob0v25/8Rj8o2d62mTUjYTU/tbsCaLxxHJyr/Wt7hYndI/UB0Jaad8OfMIP4kzJvPtArrF3SkHZkCFdLMU257BE++CSiii4N/5PBE6nO/pkP2+t5wvmLQwtLiLU7NRNXRdjtjT1iQ3b1UHftmAGZWUFcqpmqdLISWXkhUiRYXvWS323dw7m2itF55jQ+iRzJozGCcHAOZ/ErakSvLd1YVNpYi1g4TRhChLuNyagrQo5oyspA9GQaCU4fWuk6JwZg9mECfWs4H/dR1N+JgABUguChDvSfgUBUep0XdQqb8XK92bSSV6MGQ6Fy+DStsg7WZDb0oVF5L0XzxehGhXaiAx X-Microsoft-Antispam-Message-Info: KlsTXKbCMK/ql18LLiU/JrJhYnlMm58FGVeIT2tEd0AQ0OMVJGwiqPSKIn1hqOmipm4tdILcfUD1oGPbzuxFINiUlaiqCuh1kdBa1SccltAaX1PzuDqZ45WTXRg6wvUjF0wE4X/lu9a+GRUpFD03woJhAyoVFfuX+2YbEcPcxt8ZsvmvFJqc85h9Ha9aj/7lWooZXe6POAQrEENlmiodEjyL5zdzV7b7pWhPGZGQP1Ubkg6Hn7hhj4J2to8dWkWT/be/oi26Pw0jAgg1kf3bD+U1Q12UUqQXCaP7uB2uC/k81QiYwpx8JORZBNeU6WJX/TPmGq8et5YKMs1x1E8xGFmOSxcwdgMdgimSsSclVns= X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 6:KwW2siXx8hr/EHw8SGlsGiXLHkj4jWpofmdb9pbGjOxMt0EKGKRPtd9upqqaPBhmh/RMi9WVKtZoWjfeja7jRKPAHmNln+81rqdqTXpnyXy3jrl7wmwOo5bnBqyaYGdVw1TP3yx1Gw3iXgFFjyqIRePsTWFUSVd9lVNA0mqGQnYfNT75nBeZ7AEg0KfdisYc2nqA7jTsqSTou0FswVyyyC6g9+SectGtlj48MQ4+TsSplPlhFFCPpyWOuJfsxpymaPEDbEM/+0bYBXTNCioR+3KoYwMfze6dfFqgEOMOHy906gGNnlRgZLVlnwxvufHNkyO3aZ5Cux3W+ugyyQGEhvAnbbsX5wT1+tqlOr0QH3meM0vEtgt6Nle6LFd96GPU9pKO31fjX2GWg0+A7y+e7SMAVnKlzpqH0mM/LcXBk8BmOyBXKyfDVdyx5/qliLwAQy1yXH72cPWQmnweRchffg==; 5:X0ezXLkh+Pog9hUdgemGIQetiY4Qx5LwzwD+wqRfd+SHuLp8Zs0VyH3mBG5KT/cxt1UiyYYarUyoJz/i3qXpzQFzzctX09zB68aQZHA5M6AAdfpKGcg4Cy1x9m1LXXCmTkWuJRik5WPxKTAaci0h0PoHSUi+WtP1+UnN0fuGpGU=; 7:pFLjwwGvRDFACDkELPIe2UCBH/l2E7eAJ8UFLl899J3kWljFPUTt1EPGG65amD3AgHpeWD2lQC1iGEwfqw2wZP8DU6Jg1Qnk5ouK7YP5KTxrqxk3IEUfMDB3wOBaSVinUwV/RFiLhELrI9AUDnKqNAq9eiiiip+CYGkw/wVQRHINEN/NRqRHsuwAvTvAtr8Pxnp7haaNp8OpSjDvT2tZXQxQ2jk5Y1uqh2chJ5qyb7XlkkUyLA4J8lt953+JtpJN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 20:J2V2jdUFIDdXYyKN5jHyFvFeSryo0CBpTB1UiTdGfK3fFEJL29pGWQdsruq/fKVWyZXlEHAfeoGin6ZbHwlC41OnVChv7EYsTo3Re3Bhj1rKM+IuVOmLjE6iQTaH2IgbKETHvIjDFx83o6oFo6+u2FzKQOspJR5SFGbKrFrhnBM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:29:16.4659 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39959179-44a1-4f79-77be-08d61d062616 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB1858 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 04/11] ASoC: add for_each_card_links() 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_card_links() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 6 ++++++ sound/soc/soc-core.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index f94b989..1fffbaa 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1125,6 +1125,12 @@ struct snd_soc_card { ((i) < (card)->num_links) && ((link) = &(card)->dai_link[i]); \ (i)++) +#define for_each_card_links(card, link) \ + list_for_each_entry(dai_link, &(card)->dai_link_list, list) +#define for_each_card_links_safe(card, link, _link) \ + list_for_each_entry_safe(link, _link, &(card)->dai_link_list, list) + + /* SoC machine DAI configuration, glues a codec and cpu DAI together */ struct snd_soc_pcm_runtime { struct device *dev; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 532d8c5..4951736 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -816,7 +816,7 @@ struct snd_soc_dai_link *snd_soc_find_dai_link(struct snd_soc_card *card, lockdep_assert_held(&client_mutex); - list_for_each_entry_safe(link, _link, &card->dai_link_list, list) { + for_each_card_links_safe(card, link, _link) { if (link->id != id) continue; @@ -1004,7 +1004,7 @@ static void soc_remove_dai_links(struct snd_soc_card *card) soc_remove_link_components(card, rtd, order); } - list_for_each_entry_safe(link, _link, &card->dai_link_list, list) { + for_each_card_links_safe(card, link, _link) { if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK) dev_warn(card->dev, "Topology forgot to remove link %s?\n", link->name); @@ -1219,7 +1219,7 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card, if (dai_link->dobj.type && card->remove_dai_link) card->remove_dai_link(card, dai_link); - list_for_each_entry_safe(link, _link, &card->dai_link_list, list) { + for_each_card_links_safe(card, link, _link) { if (link == dai_link) { list_del(&link->list); return; @@ -2033,7 +2033,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) /* Find new DAI links added during probing components and bind them. * Components with topology may bring new DAIs and DAI links. */ - list_for_each_entry(dai_link, &card->dai_link_list, list) { + for_each_card_links(card, dai_link) { if (soc_is_dai_link_bound(card, dai_link)) continue; From patchwork Tue Sep 18 01:29:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603637 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 72B5E15E8 for ; Tue, 18 Sep 2018 01:29:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EFC52AA35 for ; Tue, 18 Sep 2018 01:29:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 518362AA38; Tue, 18 Sep 2018 01:29:47 +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 067DA2AA35 for ; Tue, 18 Sep 2018 01:29:45 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 89F1A2678AB; Tue, 18 Sep 2018 03:29:44 +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 93A3826789B; Tue, 18 Sep 2018 03:29:42 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 25C0E26788B for ; Tue, 18 Sep 2018 03:29:38 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 18 Sep 2018 10:29:37 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 614B671641; Tue, 18 Sep 2018 10:29:37 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="291183331" Received: from mail-os2jpn01lp0151.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.151]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:29:37 +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=oG2uGJZO0K6pCc9CjXl5FnC9kq8Zy0KLbnTeoV/RWpc=; b=LBWTk871rgXJ3tVUrUaJPboWd/rxk8IAXgGlar29js2fvJTkNEmOwp7/uV5nd3++E7IPEcAudhF1p+UP+LZrxkxgGNzfIbHqP36csD7fNMLU5Ux7whi/MEYrrCn/7IwczIpJfnyDi9+d849ueCMTDxmriVd0bOPxo4GTZBe2FBc= 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 TY1PR01MB1868.jpnprd01.prod.outlook.com (2603:1096:403:8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 18 Sep 2018 01:29:35 +0000 Message-ID: <87tvmnppko.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:29:35 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0033.jpnprd01.prod.outlook.com (2603:1096:404:28::21) To TY1PR01MB1868.jpnprd01.prod.outlook.com (2603:1096:403:8::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ae5bcb34-2344-477f-70ba-08d61d063182 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB1868; X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 3:bb7hr4g7BTlSEuiIir49E0qimF8mQhQgNe87yF68L4NXKMu3J4UslgFZ2QRYGW5GPlMGYnsZxsPPwXpaj7Y0w5Y2oeY/szwaeLrRqC6f/UUazxD8pFsTfYWEVumEyjLE19GBakMQGCAuQS22mkErsLRB1RQApAITIawSbg0NYC8fZAe0F5MoBC8W9d6YuM+PJLh+CT5MNH/MbTQN+aMmlSe3Rw9T53H+AOWQ+VNGkQocS7xjQTAVhgtwhyXbjMSO; 25:PdcO9GbP6AQR3BtIMs3sPrmZu5ROVoUT0CeDbakh1EScoRZ0XrsCE1KP9jVemgJAtHJ76IkRAV4g32ke35rHGTTKA9TzJjQJ4vvmH9ekqcpJP5oAGXHK8CVmeDNjtRVQAPGILa6ATaaxnpPb/Xcoy42KQHATwJWFyqZQB7FpPTZC5z9CbyQIjMkNLyMiBU5CU6p6dQNRFxf8F5/Sdj3BUKgqPV4lGnlUxD7nI3MiPhft8fPdxFIHK2lhIITHjqWijk4qu1/WcELgHzchM77JK49mTQoMyqlTGlgtzHgP26RAoxG3giML+/TCyl4D9nykT4Psl9le+oPHVh2dsvLOjQ==; 31:7KLG93uhYA1pJkhVQZVIQ+TzElV/frrx+/WnDOoz1+kjguOJ+0lb7on16uJYm7C98LM0AiAqfMFO1cwUTLLeo+o/BIiyyN3bQ7p/PDRVb1VMe/vnuIYXUlDvtXy6LTbI32X04VuxCrT43WW3qFTKCwTYHOHcSE1Q5GG7TUKIy7dDhkuyQEr7UdfRLk6mUDOrDLpxLFYxytMsBhztFy8RtE5tjjP9Pap+04KW/rFxjrs= X-MS-TrafficTypeDiagnostic: TY1PR01MB1868: X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 20:ctCluIsW+sfDKXjoCfq9HqGeWTHFHVv8ZuACximxLPvDaaSiPJT7Z11GgdDbh6YRfMAAKcka/vxskH8iokGaBhA0Nnikfi3Kv33/GrqZgnCTlqz6GXCZIX9jBW9qo524mR9mlkz6jKUQqkrs65TdiFzfGe5Lea33gW86Ze6tGcDfyq4VhHwclSb4pVmoFHKYsinzYvMPbNIR8w4UyJ/ZdP78s6PFdX+975rotkzJV8qV+0oDliXQ83HFVIu9wJWkNejhORFMuyp7T6dm8h/FntewHZqmkm9ARz1btHg0fh8/GRf74id9EkFnMYe2xeHvsv4qngOP+j3IsFmpjk0Zm/5dpRrCjxyRe8hnBl6T5e2oAZ7orCBhiCmusVTiE17dIbt9IFLr4Gsa958eqPXVs+fMExdOvoabXz3exRBgD20NLX7zBpqBdGBlEYhVUY1UpR3gfHRAWHfK1IPpN+pLWu076shth0x8QJFTWuvukHni+OmXIc7dlnWiypNEVoZm; 4:4/EkH++ERj4mrwD92EQSESD/CPck3lZ1mMC3Z4sCj2oi/5/ng6FS+u27/K/slknxh9tva1LYA+Rcj6uBuMNGbURFb1YUKNA1o0CunIAz3ctTMMDtgmUpogWbDeKjzd1KoNxs0t9Y4JqDSqeCRg0LoR3jClnP802omPy2ZPJMLvBVi5bn3af+rA5Fjz1/gi3Ms+nwXidvsoQ+pIS0qCgPdpoY1hNwhrbB7tIrsrKQGmx74jFgK966nBDkpFXazrcdqfDsnPaJumo1wfJuQ5ABfN0CHRlqUmoXTO45vP9lwMbmHlLU0uhPo6EBY3snsgn2 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)(5005006)(8121501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050); SRVR:TY1PR01MB1868; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1868; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(396003)(39860400002)(136003)(346002)(376002)(199004)(189003)(16586007)(8936002)(53936002)(386003)(186003)(4326008)(36756003)(316002)(305945005)(956004)(58126008)(7736002)(16526019)(7696005)(476003)(47776003)(2616005)(11346002)(486006)(8676002)(81166006)(52116002)(26005)(76176011)(66066001)(105586002)(446003)(68736007)(478600001)(81156014)(106356001)(14444005)(50466002)(69596002)(53416004)(86362001)(575784001)(3846002)(23726003)(6116002)(25786009)(97736004)(5660300001)(6916009)(2906002)(6486002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1868; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TY1PR01MB1868; 23:ovF0AbYSvEHLA+Br3vtyUTD4ya9HQPNcv6El3Did6?= Kp2QK7XAI5YHNM73GDjzjP8v0zjbWbX1xXPVPjUL+MUEU5f0+WyhogacaHEdgeoKs2RHMCSu104SgU2z0PGk+YmgDdegydflNN19KP8uzVl7q7PwIYe/i/GUrsxvzWu9P28SKz+YZxCAaThTC/3SE098XijP2dbInbfoYtkX+jXjYcq8gDHS4oWHjh40pe/iRwWNv9IIZ/hHRTUh2Z14dFok8zCGExwEY0waqjQKTmjgiw2oXUT5A75zHlRgV7UebNrMfAudKLN/ynIs1ZpcoS8SdxXsPlg8/93w3oKeimkcHh8QgWleXs27TMFIu3oH+7YBku3NwfkwAO0p7UpdzlBZhBPOfIzX0GAxBCGLrNaeHI+XEVvbSOF8AcKgkK++Gw50vtOA4sh9caSdUAQJOb4yaw/O5LSPsFEV0L+6UcLqCnp9PGn6CHt46vS/O7530Rd9FeKVOCiepNmAyeJNBa58x8/jltnDGqV/ZCJxEnWihlXqiTTi6OsksILClCv63qjJ5PkIKciYpnQmRXwq5/Dp2qdQEzcjJUZgEXye8ghuNQvoJLgFgrY9A++5+gF8Qm0bKJmY1CvxfHWiDBNu1Te4F57LJMSdQFtnpfZA39XYouOU0dJ+96NqiwYjV6/npoH0YsFGxlSEDonxn024kgyK+at5A1Iin6zzUIM6Vmcrtx7W82hHTGyNqQkhJHCGwAR4uLzcatKtAaMxmh2NnGcze0Q7wMwpx0JEM9Ik8Z9y4Ing6/6kFjOJcv30isU4/Q53k+LaM8DeM3hC+oQ2J6QXwmpmATmlBxEmwhzsvIAIvJfCuvXZXzRxOu4sNh5I7Ht7IS+PHhsCDhohcin8bdrqEhvrU3/UC4O4iXRtrDglGivafHUshOrspMx0d9Uqp7zbLovfpPvhAXi4MaFTlKvZZe4aZSmOJS+Rx9HwOL8+jJPJSET/NVb7lWyn3Wvc3SFNbmVACp8DE2KZ5nfptm1FQ/uh6jT3qnZDbyCyiRa262xlYyNc4zDOkJfxVQr3BXIv598tTZB35MA/ngcQAHEZ1fokmSqt1DnwiADQJtxH4QWEwg7jM6QJ2qwrea26XZzQAiTHP6TyqzAel7lBY0mM+UTaN/lOrS0mOn/U0SXmq6jDeskWFHV/BDKXClUq0Uo0YubvHEZ9EK/4hn9ojc/FjYlTAK+gkPl59M3lA6giw== X-Microsoft-Antispam-Message-Info: g3228iy8eXHpOOxGuwF0LIW7wCBypLf/Jc1FeALQMqzHeWC5xqy9ya7lBdyv0iBtaSEP9HedLxkDTGDLXg5VWe+jolfeq8wVF6SGzKS5XVaa1N6l3I+FD741Fk7WGwcfdAfXfSQzI7J8OVyt03gFP+NVhuEB0VgZFjtiySIBWldsoVf7l7VAkDF7FqPI40gSOBE8XlA/FUdan1WUPgtHjmMVrx4zZFHium7D3rweuIOcGaJKttHx7chdVPJGKzASYEnpZslFhdHC7GbUpU38LS3jsydJ/SbOI9OBp1X92pmlWV3BP5asn/2dVHb9BqwaFyy84vZjXCtl03ZPpBT6WzmxjqzVVRMSNXYapJYEViE= X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 6:U7kD/+2KYDiu5pBUIlYnIN3IrNvVfOej7jZdyjZL9gTllCkcJKUK4DeiHXSVG/xskmllhf71pVnxB7DvrioyVYdVFxfuyJMcHy0Hu3zyB+5wkDtKOl+KAvzqnqHWWyQ3FseTSYwEduHwtlQ3qpCPK/Lpron4tFn3FP/GH2ka6+ui44aEigZIVCi5W9WvYh1jIndyQIG0VG3X9kOA2El31tH/EeE5bDc/n5ydPmlMjqS8N2DthuUBhuKJ/M8iNmgDNhaZ9UzNNW4e79Q3G7e/F2WGic1vxQ9PozFvHTeS80iPlsm5rKyhSAY3T8a+71G64F9KvMj3JtKkCmH2BjJkwDBTB04EKmZ0FfmVIjDZH9XYQmEB+t79Tr9M0je3KNXzMi4ViMvlamdeo+H5EWdmKhgZUvcxl/3Pn04H55bI7kcv7UoVi61ijvrs32UVEXS/aa3wUypvwCkndMK6rQHftA==; 5:LcdDGTIahhlGfhy5I+DsmFkJEqSAuHf3nJwPx0XVD3fqMQa/P7o71OHpi/N/kn1OkN4PHeQBd14nGYQZ+zQYtjVhPca0y//fk9/87C9/nyaJSslWgnJz/NLusYuzPcrSfWpmEvFOl2OQmZGGurhEeeMzgsqWSo0BcOVwarDfwI0=; 7:W9O6qRMn8EXOHxKgRVDdYHZX5cu8qMCAkgcphdA3vYbfsWy4CqhWsB8YJ3UiJAePJJe227EtNnR1g7v9ibIZv2d260MQFkOx0Rdj66KkTSSfFH9HeGbRCoxeJUI/845kwQde219d0Qd71YRpXzTjrhPQYSuvxsjdQ8EctoyqEvozFDCrCXMhpzYNE0NxbEpjFJYzi7XN89Uc9XI3xXWlBwGTdBCXxL4WVg5R8He5yaPIN9beJsX8QXlGpLK8KHXQ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 20:nuc5dQDB8hCwnXkfWuDHkZTw2NaPl+zl/5YH+NoR2EgDOVALXRPX3dCKyHpDT6Fa1cyflRUN7zqh7Htw85p3CIvbq7brfHHtqomwDw79Em8n3qUFss2ERyTRmkTKJV/OYDWlSYcbZvXifii3CMFcxzwZHoNE+VEcKg2wezN4F2Q= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:29:35.6664 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae5bcb34-2344-477f-70ba-08d61d063182 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1868 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 05/11] ASoC: add for_each_card_rtds() 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_card_rtds() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 4 +++ sound/soc/codecs/hdac_hdmi.c | 2 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 4 +-- sound/soc/soc-core.c | 48 ++++++++++++++-------------- sound/soc/soc-dapm.c | 2 +- sound/soc/soc-pcm.c | 12 +++---- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 1fffbaa..164418d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1130,6 +1130,10 @@ struct snd_soc_card { #define for_each_card_links_safe(card, link, _link) \ list_for_each_entry_safe(link, _link, &(card)->dai_link_list, list) +#define for_each_card_rtds(card, rtd) \ + list_for_each_entry(rtd, &(card)->rtd_list, list) +#define for_each_card_rtds_safe(card, rtd, _rtd) \ + list_for_each_entry_safe(rtd, _rtd, &(card)->rtd_list, list) /* SoC machine DAI configuration, glues a codec and cpu DAI together */ struct snd_soc_pcm_runtime { diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 41d90dc..4e98548 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1604,7 +1604,7 @@ static struct snd_pcm *hdac_hdmi_get_pcm_from_id(struct snd_soc_card *card, { struct snd_soc_pcm_runtime *rtd; - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (rtd->pcm && (rtd->pcm->device == device)) return rtd->pcm; } diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 6c36da5..afc5598 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -765,7 +765,7 @@ static int sst_soc_prepare(struct device *dev) snd_soc_poweroff(drv->soc_card->dev); /* set the SSPs to idle */ - list_for_each_entry(rtd, &drv->soc_card->rtd_list, list) { + for_each_card_rtds(drv->soc_card, rtd) { struct snd_soc_dai *dai = rtd->cpu_dai; if (dai->active) { @@ -786,7 +786,7 @@ static void sst_soc_complete(struct device *dev) return; /* restart SSPs */ - list_for_each_entry(rtd, &drv->soc_card->rtd_list, list) { + for_each_card_rtds(drv->soc_card, rtd) { struct snd_soc_dai *dai = rtd->cpu_dai; if (dai->active) { diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4951736..7efcf34 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -342,7 +342,7 @@ struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card, { struct snd_soc_pcm_runtime *rtd; - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (rtd->dai_link->no_pcm && !strcmp(rtd->dai_link->name, dai_link)) return rtd->pcm->streams[stream].substream; @@ -399,7 +399,7 @@ static void soc_remove_pcm_runtimes(struct snd_soc_card *card) { struct snd_soc_pcm_runtime *rtd, *_rtd; - list_for_each_entry_safe(rtd, _rtd, &card->rtd_list, list) { + for_each_card_rtds_safe(card, rtd, _rtd) { list_del(&rtd->list); soc_free_pcm_runtime(rtd); } @@ -412,7 +412,7 @@ struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card, { struct snd_soc_pcm_runtime *rtd; - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (!strcmp(rtd->dai_link->name, dai_link)) return rtd; } @@ -452,7 +452,7 @@ int snd_soc_suspend(struct device *dev) snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D3hot); /* mute any active DACs */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *dai; if (rtd->dai_link->ignore_suspend) @@ -467,7 +467,7 @@ int snd_soc_suspend(struct device *dev) } /* suspend all pcms */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (rtd->dai_link->ignore_suspend) continue; @@ -477,7 +477,7 @@ int snd_soc_suspend(struct device *dev) if (card->suspend_pre) card->suspend_pre(card); - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; if (rtd->dai_link->ignore_suspend) @@ -488,10 +488,10 @@ int snd_soc_suspend(struct device *dev) } /* close any waiting streams */ - list_for_each_entry(rtd, &card->rtd_list, list) + for_each_card_rtds(card, rtd) flush_delayed_work(&rtd->delayed_work); - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (rtd->dai_link->ignore_suspend) continue; @@ -548,7 +548,7 @@ int snd_soc_suspend(struct device *dev) } } - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; if (rtd->dai_link->ignore_suspend) @@ -592,7 +592,7 @@ static void soc_resume_deferred(struct work_struct *work) card->resume_pre(card); /* resume control bus DAIs */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; if (rtd->dai_link->ignore_suspend) @@ -610,7 +610,7 @@ static void soc_resume_deferred(struct work_struct *work) } } - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (rtd->dai_link->ignore_suspend) continue; @@ -625,7 +625,7 @@ static void soc_resume_deferred(struct work_struct *work) } /* unmute any active DACs */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *dai; if (rtd->dai_link->ignore_suspend) @@ -639,7 +639,7 @@ static void soc_resume_deferred(struct work_struct *work) } } - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; if (rtd->dai_link->ignore_suspend) @@ -674,7 +674,7 @@ int snd_soc_resume(struct device *dev) return 0; /* activate pins from sleep state */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; int j; @@ -694,7 +694,7 @@ int snd_soc_resume(struct device *dev) * have that problem and may take a substantial amount of time to resume * due to I/O costs and anti-pop so handle them out of line. */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; bus_control |= cpu_dai->driver->bus_control; } @@ -839,7 +839,7 @@ static bool soc_is_dai_link_bound(struct snd_soc_card *card, { struct snd_soc_pcm_runtime *rtd; - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (rtd->dai_link == dai_link) return true; } @@ -994,13 +994,13 @@ static void soc_remove_dai_links(struct snd_soc_card *card) for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(rtd, &card->rtd_list, list) + for_each_card_rtds(card, rtd) soc_remove_link_dais(card, rtd, order); } for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(rtd, &card->rtd_list, list) + for_each_card_rtds(card, rtd) soc_remove_link_components(card, rtd, order); } @@ -2014,7 +2014,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) /* probe all components used by DAI links on this card */ for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { ret = soc_probe_link_components(card, rtd, order); if (ret < 0) { dev_err(card->dev, @@ -2048,7 +2048,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) /* probe all DAI links on this card */ for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { ret = soc_probe_link_dais(card, rtd, order); if (ret < 0) { dev_err(card->dev, @@ -2169,7 +2169,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) struct snd_soc_pcm_runtime *rtd; /* make sure any delayed work runs */ - list_for_each_entry(rtd, &card->rtd_list, list) + for_each_card_rtds(card, rtd) flush_delayed_work(&rtd->delayed_work); /* free the ALSA card at first; this syncs with pending operations */ @@ -2211,13 +2211,13 @@ int snd_soc_poweroff(struct device *dev) /* Flush out pmdown_time work - we actually do want to run it * now, we're shutting down so no imminent restart. */ - list_for_each_entry(rtd, &card->rtd_list, list) + for_each_card_rtds(card, rtd) flush_delayed_work(&rtd->delayed_work); snd_soc_dapm_shutdown(card); /* deactivate pins to sleep state */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai; int i; @@ -2686,7 +2686,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card) return ret; /* deactivate pins to sleep state */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai; int j; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 43983c6..61c76a4 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4184,7 +4184,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) struct snd_soc_pcm_runtime *rtd; /* for each BE DAI link... */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { /* * dynamic FE links have no fixed DAI mapping. * CODEC<->CODEC links have no direct connection. diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 1eff1db..09d0f66 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1307,7 +1307,7 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, dev_dbg(card->dev, "ASoC: find BE for widget %s\n", widget->name); if (stream == SNDRV_PCM_STREAM_PLAYBACK) { - list_for_each_entry(be, &card->rtd_list, list) { + for_each_card_rtds(card, be) { if (!be->dai_link->no_pcm) continue; @@ -1326,7 +1326,7 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, } } else { - list_for_each_entry(be, &card->rtd_list, list) { + for_each_card_rtds(card, be) { if (!be->dai_link->no_pcm) continue; @@ -1382,7 +1382,7 @@ static bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, int i; if (dir == SND_SOC_DAPM_DIR_OUT) { - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (!rtd->dai_link->no_pcm) continue; @@ -1395,7 +1395,7 @@ static bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, } } } else { /* SND_SOC_DAPM_DIR_IN */ - list_for_each_entry(rtd, &card->rtd_list, list) { + for_each_card_rtds(card, rtd) { if (!rtd->dai_link->no_pcm) continue; @@ -2761,14 +2761,14 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card) mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_RUNTIME); /* shutdown all old paths first */ - list_for_each_entry(fe, &card->rtd_list, list) { + for_each_card_rtds(card, fe) { ret = soc_dpcm_fe_runtime_update(fe, 0); if (ret) goto out; } /* bring new paths up */ - list_for_each_entry(fe, &card->rtd_list, list) { + for_each_card_rtds(card, fe) { ret = soc_dpcm_fe_runtime_update(fe, 1); if (ret) goto out; From patchwork Tue Sep 18 01:29:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603639 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 BBBFF13AD for ; Tue, 18 Sep 2018 01:30:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A87D72AA37 for ; Tue, 18 Sep 2018 01:30:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B4042AA39; Tue, 18 Sep 2018 01:30:07 +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 E54CF2AA37 for ; Tue, 18 Sep 2018 01:30:05 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id BE2AE26788E; Tue, 18 Sep 2018 03:30:04 +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 2D865267893; Tue, 18 Sep 2018 03:30:03 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 5741926788E for ; Tue, 18 Sep 2018 03:29:57 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:29:56 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id AD2AC71674; Tue, 18 Sep 2018 10:29:56 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="292746949" Received: from mail-os2jpn01lp0146.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.146]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:29:55 +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=RsPrBiSFY3Pzbzb+6bzQuOJ5/gnMyrW7VsyBqtr3kX4=; b=FRsbp+elBclTjRjFsm+st55CPcYClbCtrXj1NyaU4HsZ2pbxqLSO/0Lg+nag7oNM8/U1WuqIS8Fu50nyh4rrrkz9OVHx2PkH7p15sQxCBiKiyQu+8XRnHQomf1CjB0xZMpTsAuUW2reO9cc4Tmb/jJAcypowMEcFe8NvEB9blY4= 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 TYXPR01MB1870.jpnprd01.prod.outlook.com (2603:1096:403:b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Tue, 18 Sep 2018 01:29:55 +0000 Message-ID: <87sh27ppk9.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:29:55 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: OSAPR01CA0135.jpnprd01.prod.outlook.com (2603:1096:604:f::27) To TYXPR01MB1870.jpnprd01.prod.outlook.com (2603:1096:403:b::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4c5fb71-6906-4b35-27ba-08d61d063d2e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYXPR01MB1870; X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1870; 3:BBYsy1UkIHsVYbi0s6mBvgNWHVmKbxDpM6tt8v0Zz7yX5Emb+ov4yb7IfnQStHKQ2ZHD30MIGaYT/Z+MEYHPeEZ3Tqy/QPSMLQMZoHUwvNgqITNFIRhqTeL1E1rvq0nRRWwH+oZ2N/wF0M5cwv5LyF3RK526KMqsQCFVA56cICKOZ3YNZ/L9LxFxZhCMwIxTNIvyJheqVYzgVHAGsNkvnFfq/6BYIDLLB/JpD6bhBgOCfrX+eVPmdtyw+OYdpg89; 25:+Jv8Vw8RsZWTfMgpjNWi6J+Q2M9y1FdlZYrrCkADlxxoqCB1YEW9CDOprmMOLK8HqRMwdNbJzxLpguOjl8kLPUWQlqRbWG6QJO4xFvSYxFL06DUNeBHf4Xa/3nVLXxzQ/hteOQ6kzPOF7UVY0wfE+zj67OtiSbZJHyQOd00TYt+BvAmW7d3OsGCMfEZ+xoS/t9GPnRrDSU7SUKUT36LE0Zhw2q1m/s0Z+67J+rD8y5Yyya/wMQ63PLrzWI1yg8t6eZ50Hv24+bnmxn72hnsjJspMBbyt1DJksb20m29WGUiAvXGlTGGGWrcssUEORI66tA/6Wj3uYfFVy/XDf5BXgg==; 31:6MPdudDWsJa5GG56GD8rVoM4QKVT+Q28pdt1pRHxCzwGNuxn4lhHGlcTftVMio/mFvoxTPUzfvQR32oUefrlwQHLyblJtbXN9OO6wxvrSvZK69gBejjbMdIdvrF5PDqAdrN4+FwqM9xCC026eexHZmuu4RqYr/o0lRLLJHBuq+m2WzlrAzdrDBmYUcpqFwKZLL6S7vT18mCE29m16s5pGESQJMkgrEA5qX/9BpVTaJM= X-MS-TrafficTypeDiagnostic: TYXPR01MB1870: X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1870; 20:luKzXPFgemVT7BYprVU0FdCNVRpQv8S1S6ky1zV/U3j+wjWxxdcxF6X+SFh9k/cVKP2We5CjrJfEkKK8edXBAy1rD29NJUUpBuizCfxJSXg7flCFz9tEQQ3W95bizOUgc6I8PkklglFsgaRDzWN4iYjEy8WTmpodcz8G4Dut20sQcfehwmrBr45Nu+K2Ph3QglDaByZSdvRVQnr5VBT6vt6kB2HlKPgG7Y3SGlI+ZQhNtxdeHGt1v9u3ao8YeN6BNN7390dtvIKV9nd8M2r/121LipWq1qOyAoNavrXGI2YO8x62Q7eIC3sikJ2Dxl7uCZE3nnCamwttm4+2Ns46R8WxOe0GlT9zd1Ik9zjVi+9oQT8/Ys4nCM9pYGuYYavLeFdguZioRM/wk7deBQ0CWopgj0tNeMSTihxIi2O1Qh090DpzVC6bJGwph5bK4C2JQFMNZI/ZVvHRhqM7vToJwdMKjF3EnBedWJ/iUefXTPkRMn+cIkIqcN3mWrOnMOap; 4:WMZ3IqYk1jgcJIrXcqr7WNRCdRmBTAt4yg9A6ndmPp33fmrd1GDG48AWdpz+3kfL0rELqShQyzqCwQuKEiLjpXX45ZhMLErhx1hXeNHEwB0WzmwmaJStx9ZeXSO/zfviGrfZhdPFPDdOjKk6Sc4sFiooPFRymchCTQ1b1b1RGmPt57PlL0TBg05Xxm4UQ+ETIy+dECvefOG9nrTV2TYUSBD44jxz98nMzpDK7OPnHyq9BTn2Dy0w1Q9tG7tw+wmZavHeDF+e+QG0JjUYohq/HVpyrZ0b2exdqYRHdtMMQe39gIioSUwgiuZfjrtQvveJ 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)(93006095)(93001095)(3002001)(3231355)(944501410)(52105095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050); SRVR:TYXPR01MB1870; BCL:0; PCL:0; RULEID:; SRVR:TYXPR01MB1870; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(39860400002)(346002)(366004)(136003)(189003)(199004)(6116002)(2906002)(106356001)(16526019)(478600001)(186003)(47776003)(76176011)(16586007)(7696005)(3846002)(386003)(66066001)(5660300001)(316002)(25786009)(52116002)(105586002)(26005)(6916009)(53416004)(23726003)(53936002)(68736007)(4326008)(486006)(58126008)(305945005)(81156014)(8676002)(6486002)(7736002)(476003)(50466002)(14444005)(36756003)(97736004)(11346002)(69596002)(575784001)(81166006)(2616005)(86362001)(446003)(956004)(8936002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYXPR01MB1870; 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; TYXPR01MB1870; 23:KoY/m+00wcoqnYuYUJHImmI6NUAtrtR/AwHz/byE4?= n9IabDuRaQaQv9SnUS7kSFR8MMqrjEE+BMx+MNSrdsY7N2c/sLKwudZToc4CsNOoiSi0h4+R1jtk/s2bgJ+0nYUGXJ+csh1i/rXQSrKD6DO+te/ksLk1ZTjmF42MjQeOWKGCMEcTbBfyeVvUqVFjaDZqRfCfXDVqXHLtkZxygWaWen9AXu5dSu1rCoV1tKY0iK7B9HpZMafWUUYtDhMwuTUoWBdvfHvbFbvcFH0J4aMOLPoP4l4i2/tFdxurFXSkGYH/kZUnvmx28fxh+v7zAZXrAaJr7Y6hUip05fQx1btSQRNiuxo8oVVGYUBAQpdeEwt7fGZWYdfAllMNqimqtrFKyFF4a+LYh9P7SuoEqLpkjsUk4TKQjX5uHsIZBUH7CoGWB9f31KkxdpZcexQLimaryE9ufrCuN6xewo5KC32ghQosqyqWJV1gOt2OZIstMOomSwAp/TyK223nZoyICZhP0sTuSYcNHS6mhaG9ao/SEvSHx84AUn269XwXya/6m/NhVwXkgbFsh9UkdPkE6WU0D5Rn1jZruDzuHL0yROtvTnQQYv1MjYz2Ie5xYphCM9U8tSCCpytTc/vkF3OJ52w607Ko3yW4JPiVUPCCd1Fm0z1Md/E0I6Mwv3HwPb3aPnuOK7rVsY6mbTs7S/38ASec8WPrxmEp3ERpQkkEM4gA4EAl/5aziElDwE8+K8c41WGmvxQEUrRALpGIuGt3tBlcLYovvF379lQJdXQ1rlMIWQqBQArpHWIST2jrfXAhZ5c0DZVrvGnQEXCpU0sHnl/UadLJem7ImttxXkmhqXkUKJb+H929jh/yX1gt3Ggqo377JJFLzoVxA0Lxfy7LqwiF9e97nUqPRzZXC6qAe4Zp+zkeJ+pfW50oJnIIMOTlQu+Q4vMGzjXZUlmJdgrDwGn8SLBFjts8sy4kiZ7XCsvKf4pS15ahPp+IJvqTlpe2kLIHCmzkAc7amnqP29bfgL36621Rkh3IEnKTMoTTFomkwo1s7pOBi8+j7Q3TUj7dwNmGD742ZTQ+D1A6Ny6Hb/ISUhdCm2wSUZD8LWsjI9SCZ0mpbC+Y10Pl6k2sdpicwvKekRJcriTQSOJo05GPDHzXHCg6Mg+ENppgJ58/0GTgxzhisZNpOk21eRAeK9ifCOrLsAcBv7+SoXMHtdNLNkCmrxyOArUSI2oUet4zWqKhw== X-Microsoft-Antispam-Message-Info: iKU8R2BXJswdS1Zt3M+y8NDEjv8AhM/x6p3RQeBpn5lQy/UY0wGS+QA9QSemQ0QD7DqHdSNMwtuxsrsuW8b+apTZUIE6vYnnw3GUUcluV37ywr7pcQcrtEoMBcsHg12ZL02QQM9YXGjea+SSwZjMF6kpmm1tC/+jZIZmhzvNhtMTwh9w4/Nznlx260HP1Ooz/tKw8RGQGSlfMYpSBSFk41gk3+0pqsk5+/1KgwRplMsdppH5H86G99678Y0Jj77UvNLMW7CUTTIbzHLcBR2NDQe96OBbZdTXyRu8uK21sPwOyYaFJVMFjJ7g0co/ushWD/yP1rEREisCxzmKJqXJRJRv6eN40mf+mj3jPtMKvlU= X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1870; 6:yYOJK7MTOvX2Xnhp49mNF3FkyQNZVfJNNwBFirtddoP8hnCCN82w2OV/kQISBBkmqnTNTDQCxvj6q4ykiZYnYDblnBtILiNb2v4OA/3i5XXihzNP3zY0iddNbZBgKVfZR/FydJaXE/QZyhvhkCIkhxM6lK7zX7fnqbN1xo2VTxoAV1A9kLm6wbypPOiM+muI2VBN5iVMQmvWmJXRPeFbbzlvhLOIfsceasvluKE/aIrejhHk85pZg9LorYe9NXVX3sZX+Hu/DRdZp0fcvGaypehMPjcD8lQ1ucG7w7l2+i8r0prLzClwPx7Xl4dmceo9m/ZJCRBow/z9hQvWK/h2ah2Al9GHGEuzPOsNakIRQ87u64rCsaP4zMwvSTqp7ATGhvreh/jmL6SBhARqBVXpiR11i5fo6PMTn00pZsAP96JYCYzPAgAc2b8y4h/7ZGZrVpy4mnksH2SoOtOmw5DK0Q==; 5:trigK7i3jFZABaXPib+oYPgpxlMLc3/GyUFxwfPxXVmoxUOmppXEHH70WJb3ftcxLiPvWEpYzwuew6IAmHsLr476xABP63E+eyuFBrIKf4PNjlJKTqKc/HGFPUsQZGuMlakP6WUlJUWLvOyf4ETk7fatzy8f0QPE48oSWAa6Noo=; 7:PTp5raIeC36JWL2MNRpO9wGcfZMmB0rPUMPG8LIIPmOlGpyFiql4pIMeUfS0u8EPRP9r4i8TXh+Z7zZSISvMbcnsmYgTlo1imPBhXXMDs1Kdkax91gaffL13KTBS7qLKs3Q19NusQsLEqvfW19jbJ58DfpKgOgCsFT+CSVKHthdH4KtqKBFkonx7zOXEl4TF9syQHsvN6QD7L/V5WyJT4fU6OmaI1JphMcpzeDIQ62j5agJkHbDvbFElpsOeC6mm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1870; 20:DaV498cjgR1j5kgJnt3QTimWxMWt/E0dXKnHqIlBX2Hhwzte69OJlkNpxnSe3QlK/NSa8S+ICh/BM/B+DLfc+ZjGwA7emTVc7tAAmU/KpBuAlcLeV6SnwYlH1vT41QRGJ3r+03H2Oc8vyLbyAb/E+hwsiCmGIITDeoLe+VKi758= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:29:55.1847 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4c5fb71-6906-4b35-27ba-08d61d063d2e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYXPR01MB1870 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 06/11] ASoC: add for_each_card_components() 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_card_components() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 3 +++ sound/soc/intel/boards/broadwell.c | 4 ++-- sound/soc/intel/boards/bytcr_rt5640.c | 4 ++-- sound/soc/intel/boards/bytcr_rt5651.c | 4 ++-- sound/soc/intel/boards/cht_bsw_rt5672.c | 4 ++-- sound/soc/soc-core.c | 5 +++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 164418d..34efab6 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1135,6 +1135,9 @@ struct snd_soc_card { #define for_each_card_rtds_safe(card, rtd, _rtd) \ list_for_each_entry_safe(rtd, _rtd, &(card)->rtd_list, list) +#define for_each_card_components(card, component) \ + list_for_each_entry(component, &(card)->component_dev_list, card_list) + /* SoC machine DAI configuration, glues a codec and cpu DAI together */ struct snd_soc_pcm_runtime { struct device *dev; diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index 7b0ee67..68e6543 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -223,7 +223,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { static int broadwell_suspend(struct snd_soc_card *card){ struct snd_soc_component *component; - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strcmp(component->name, "i2c-INT343A:00")) { dev_dbg(component->dev, "disabling jack detect before going to suspend.\n"); @@ -237,7 +237,7 @@ static int broadwell_suspend(struct snd_soc_card *card){ static int broadwell_resume(struct snd_soc_card *card){ struct snd_soc_component *component; - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strcmp(component->name, "i2c-INT343A:00")) { dev_dbg(component->dev, "enabling jack detect for resume.\n"); diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index b6dc524..8587bd3 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1048,7 +1048,7 @@ static int byt_rt5640_suspend(struct snd_soc_card *card) if (!BYT_RT5640_JDSRC(byt_rt5640_quirk)) return 0; - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strcmp(component->name, byt_rt5640_codec_name)) { dev_dbg(component->dev, "disabling jack detect before suspend\n"); snd_soc_component_set_jack(component, NULL, NULL); @@ -1067,7 +1067,7 @@ static int byt_rt5640_resume(struct snd_soc_card *card) if (!BYT_RT5640_JDSRC(byt_rt5640_quirk)) return 0; - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strcmp(component->name, byt_rt5640_codec_name)) { dev_dbg(component->dev, "re-enabling jack detect after resume\n"); snd_soc_component_set_jack(component, &priv->jack, NULL); diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index f8a68bd..8dffeec 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -742,7 +742,7 @@ static int byt_rt5651_suspend(struct snd_soc_card *card) if (!BYT_RT5651_JDSRC(byt_rt5651_quirk)) return 0; - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strcmp(component->name, byt_rt5651_codec_name)) { dev_dbg(component->dev, "disabling jack detect before suspend\n"); snd_soc_component_set_jack(component, NULL, NULL); @@ -761,7 +761,7 @@ static int byt_rt5651_resume(struct snd_soc_card *card) if (!BYT_RT5651_JDSRC(byt_rt5651_quirk)) return 0; - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strcmp(component->name, byt_rt5651_codec_name)) { dev_dbg(component->dev, "re-enabling jack detect after resume\n"); snd_soc_component_set_jack(component, &priv->jack, NULL); diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index e054318..51f0d45 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -347,7 +347,7 @@ static int cht_suspend_pre(struct snd_soc_card *card) struct snd_soc_component *component; struct cht_mc_private *ctx = snd_soc_card_get_drvdata(card); - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strncmp(component->name, ctx->codec_name, sizeof(ctx->codec_name))) { @@ -364,7 +364,7 @@ static int cht_resume_post(struct snd_soc_card *card) struct snd_soc_component *component; struct cht_mc_private *ctx = snd_soc_card_get_drvdata(card); - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (!strncmp(component->name, ctx->codec_name, sizeof(ctx->codec_name))) { diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7efcf34..673a694 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -510,7 +510,7 @@ int snd_soc_suspend(struct device *dev) snd_soc_dapm_sync(&card->dapm); /* suspend all COMPONENTs */ - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); /* If there are paths active then the COMPONENT will be held with @@ -602,7 +602,7 @@ static void soc_resume_deferred(struct work_struct *work) cpu_dai->driver->resume(cpu_dai); } - list_for_each_entry(component, &card->component_dev_list, card_list) { + for_each_card_components(card, component) { if (component->suspended) { if (component->driver->resume) component->driver->resume(component); @@ -1354,6 +1354,7 @@ static int soc_probe_component(struct snd_soc_card *card, component->driver->num_dapm_routes); list_add(&dapm->list, &card->dapm_list); + /* see for_each_card_components */ list_add(&component->card_list, &card->component_dev_list); return 0; From patchwork Tue Sep 18 01:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603641 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 ADB8D112B for ; Tue, 18 Sep 2018 01:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BC6C2AA37 for ; Tue, 18 Sep 2018 01:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FAB92AA39; Tue, 18 Sep 2018 01:30:21 +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 823122AA37 for ; Tue, 18 Sep 2018 01:30:20 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5AFB626788C; Tue, 18 Sep 2018 03:30:19 +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 156442678A7; Tue, 18 Sep 2018 03:30:16 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id D710C267893 for ; Tue, 18 Sep 2018 03:30:13 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 18 Sep 2018 10:30:12 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 233C671703; Tue, 18 Sep 2018 10:30:12 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="292747025" Received: from mail-os2jpn01lp0147.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.147]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:30:10 +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=3w6BeO9bTT5UPlx9y0nlBuVhWRGGav4QDIvB8O7sOxA=; b=f4eRPBrb4chfk8fhjU05VMcl6zDrZyfGVKOgyuSe9lN5RvitpdSi6w1KDal80+QGhm9Wg3nDUa0CQSSpvZQoOa5hVXjtdlKcUrmyC0QyWNePNxMtsUI/mu9a7Vw0qoM8LyEuO8T0iEFYI1uU/ZVULzUvrcumScUQCRv3rYHwtYg= 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 TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Tue, 18 Sep 2018 01:30:10 +0000 Message-ID: <87r2hrppjo.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:30:10 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0105.jpnprd01.prod.outlook.com (2603:1096:404:2a::21) To TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a620a405-fe67-4e09-0d28-08d61d064651 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYXPR01MB1869; X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 3:zzamfYFqVgDuUy/bMMW25ulIp0k1IK/drNE68aDB5PBh9PNrFe5DVrkwe1z8FHgxV8NDqJ1lbDNsXt7mNj3F5S2HOWFqufT10TxILo2LCZMx/fVCdFx+j4S2Fs8hL4lUCQ+P79vYLam2Fna63hPToTkko4faNX4ilBETpapnfBeWzryCPyhNH5H9ZKM0aJ4Vhc8om3TsvsOXwfx8+oBgYksxCKB1t+ia1ENFdNTfnCPXiJdcxhV73VItQ7tHKwhP; 25:/BVXYQZRoQQhWgTpMfD0HNQydl8tqxP99/XKZ0M6kLDxSizuWbyACIUiGdGJ6KExvkvxbUjuHReyWXxdraBoYnL+bvJ/aygwHJ0KFwWzVE48Rmcz3H1cWWuMW5IYVtiQ1Tfl0BBZD02g8Vd/iqGyUEY7QCYknjbSOkOOsktoF6XtRteUoZ5jISyLp0nZ4L2sX+hdMw1NFZBju4VAc0fbRPreec/dyJIBfUM4KknFRhOlVlixqvOA/at2laNi6pPLzOsJ04FkUnAU2zqDjuYAdJBmgyxLyjbUYBRLuy5hVAGSRRM4HC1Vku13oYm18NLclOw0jjjOIt3L4UHJvYE3kQ==; 31:DZk7NbNitf9Rr6jXPlkTfHUM8bY5SoUSGlLbeRCiH8gkjxh6qvCdPTvAheaCUGFePSMLg0UBCxDyM+WP4scZAH05T/A1IFURpluUPmFBUIr750lJ7ggXa2n3gHJf144I/eO1wHFtUqDlxeeJRUiQLQObpxJpmiSmFvIJq1eJ4YYadDoxUUKlZDj6YwIbN69RY17eLoXTXW3nUlo1otJVRhOpXYGeLcnVFjmnfQFW2KE= X-MS-TrafficTypeDiagnostic: TYXPR01MB1869: X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:MafNv8QlclTUz87rMVQVa2Bnw0HejM8BgCqoUbAU+4aUmjuC5w4ANpr+ra8gn5KSGlBNswHA6B7IwBio+q9sRAcPNTUdk6mNK8L9UvC9xj/ztGbrkVFdm+sahOvoD9sv+1dIfquQtXTM23KAPmh8WK9JHvqeu/LpGT8tx5meGJBdwV2WAvOpVAqBvnzLBlv7SnP5R4koRBH/Bv5Ml7fBTlJwRd5Vkr2pG+8sOAHycRsUysho3aXiEoH7nHXHsfu/huFzyEndqFn2vRkfwNiR7NCJmAD/zdON0a9M4yPtUYKiV3pgyFX5EaL9s2/So4RVuRV886uatVADYRfy93+ouXwJaa1QuxTVgWJtUK8hyoU26e9Zfyu+uwvUWdnGD1u6uWUeCxxbfUdPmqEsLs0ABBYOzcrpW++65/oLkrNMPPq7bg66kJj2Lfhp/EhU0p05c1GaXfZrgYLsX+n9VKN7LkOfRNYYtrK6i046oB49r8r1zdwyATVBbROrgS6gYZn9; 4:W0QvuuiIVjhjq+II36/gp2SaHUhdeboBCsRq011+IZq3c+5JEUZ432LP0xmxHGFF/zk1nw22DvA0w0ydua1VvVX3/7QT/X86C4UoyQRttTzCK/OpRWpB0TA8vwvVoWi0dAaPigeBMsDcqVrKW7BYiVHCEpzZD9aLW04HhIq4f13JVcau3GKsahOfVl6Fgl5boQXthOXi5D2Pf+19sFrjNrCtPa0UPZ4PtH7lX7tcQ5kjjKjTnoywnzG061wky1s5XngETMwFj1ef632jUD9cIOrEwoxMREbqi43CfEfLjjoUiSWrwP5PGiaSn5MTE+6e 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)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(201708071742011)(7699050); SRVR:TYXPR01MB1869; BCL:0; PCL:0; RULEID:; SRVR:TYXPR01MB1869; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(396003)(346002)(366004)(136003)(376002)(189003)(199004)(16526019)(5660300001)(53936002)(478600001)(16586007)(316002)(186003)(8936002)(45080400002)(58126008)(4326008)(86362001)(6916009)(76176011)(7696005)(52116002)(81166006)(386003)(486006)(50466002)(11346002)(476003)(26005)(2616005)(446003)(81156014)(956004)(14444005)(8676002)(23726003)(6116002)(3846002)(66066001)(97736004)(47776003)(36756003)(105586002)(106356001)(69596002)(2906002)(68736007)(7736002)(6486002)(53416004)(305945005)(25786009)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYXPR01MB1869; 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; TYXPR01MB1869; 23:WwHaofauqX1PtxwUL5tnvevKotaFNMdSqyufx/e4l?= HpgmyffOSaOkJtKuqMFIpqVQ4RlodZuZXfpPngLGpf2xCB/mqf9MaE48l8PZk3CbFGvyelNpmlfifjMSHgFvO+9BRN+y7xEnTRrBdAjO6wv/lHqP5zCRMnCgHozAbFEcZO49BiklT76avZfW5gQBWyAU19Y4tSqL/HcvxcManXk+57jccyFoR0b/XsqT/0Vtf8/J/Jd620sIkc/d5+zOyUfNestDwQ4BU35/Du4XSsb4o3FzHJE0/47mqvuuNDJvRjhMxBkUsKaWvnie0XsPafyveQjLLOCz1+Zk4jteSbFDuHQ7e1mHUcU+53uZUeKvKRv24ebls4/nVDM3BkbsKcmLw2FktKEUbRKm6oeDGEoRxKyD7SOGA6JmCuBG9bhjjLekc8A6JcffNTvz+rLhpENaxUgRmBMeTXPnhbQ1Ja+wNWJKNmls+vv71PyR020RqH11PGS/Ci9++Ogo9z0ckXYR7ytAqRv+sgCcv1X6/VavD3aD7RPM5K7dmTSbEiZ5t0x2NCzhGUl2pmwsDeuSOAYLMKlvJ+/SX8gF6w1NOsoI4nn038u96QZEO9Z2jnvTwSJ+8q9zkRt8vAh0SqSvssiTHymD08RnK/3sIDKuHa2EVW/vqK0Im4h+Jwkcj3RTTtS14EWeCCDctkiuk8A8GhjGD+85MajOrDAEEif54lYuFh2tMegh6tzg7Y3jjMn39/EoYB4RQNs9VkKZDwgzDwr5RLErK8XQ277e6/yFcMTaXKd3zlEx3dCdTQNrrFmXoXDqdq3GwVciqC0uayvf61RR23VPhQerkbT4mglTBQc+dfFgL0uTX3H3Wpq1nhMufka7fV5ComnND5f4R0iYrEgF5Zyr175GJCt6SUrNDL6gN0o/Iy7AuojIUEAVcbBfePPkYcE/kFiPRfR4Tfj/YFOaXiRJsCgiNzhdZ8YEGaYNk8Sfn/Qod2cf0MUiSX1gUSQQeRS828cjq52jZ/emmQaN50xhc23dVuhqp5NxVikfJGIMxp+gTncY0daaWWFstl/REf5kg//015BjFelqWFT4OPANWZmjGgUTGv0kyTdQMd6hknj6yVa7SmUPmFyXppMxNqeCkfqB42sa8+019DDhW0eNPkAGpmKCSL9OQ0WgTP2dsokpGHKje7xgHGkn9OmL3ER93eOU4CiRWjDEW0staYgusvBp1N1uq7cgouMiA== X-Microsoft-Antispam-Message-Info: +Kp+8abqBCYeuhQA2ko6QOQQuX2FVZ1LcLN7kKdr/gkCnh3K4F0xVCAQPvt4uYXLD+EHBW1lLgAhMpcuYx1v2o4NcHSiTild5MBX7LizYUMm1GWfHdV3BexqIpKcV8m9qpf/TBQg/7vyPSZbbukcEfbkzzO37bzB5s8RAsnRJNGYArx5o/fAHFGucvLahRhiYbA28BguWZ+E/rG+UNby5Yz6PkTg0TJvc3gqJEQAGYKcBz2xYiSd+uNXlRPLqKcv9iEwHp2P8old7+QhxrurJh23qj8bJ4et1+3DJQ9OD+7aojlewrAWBiITLcUEHbv7m1UR7Bz//7bwqyYSw4G0a9fyeQOwRoj5n+t0eI1Z+dI= X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 6:e1sySgP1nP7FwjWTyxybCISRlryxQqB8d9d1BsIH/VH/TVxkUPd0xL9tMj5rTh9sd1W8m7tOhLw185x2g1NSh+wqdAX23QiV/JzZW5G3y5uXmgTBB9yDOHKwwJ0YvHjWjhnY47APwvpLdrZp3cPziSlnfJoXE38X9q0NT7KclZJp2bfPiBQt6eO9cbp6Ihb0LTfe/iMsBWulmkA8AACxAQZsR/7HiVMNeMyANLZsWOWUkietO1J4VwplPzFt0ctppDtPXi8Uqwetq6zvINui4uey6Orh47whvAyNonUGEG+QPgjKVw+yKyjl3WqB/CSk2tJ6xZDm46k/MMHHdrrudQp3llXZjo32MyGO7fMyaLRn7ysmIZ4mCCIHKKTofBSg/fStPcikYHKbB98E54Axg0Jbw9voIRDCwZvTNr6Qsl20PI2ivwOtOST5J0O+QdkwxiflwdyN8kGzuenmSXlgcw==; 5:SiITWKuJPnHXNYUbJeitft8R7vYnVUq5vOjXi2bygzcszJsex7TQKYwaoLr7iTxMWF7COPGdd9ix8nx0qLP/mBHEO9qTFl68q3w/FOEktuuYWQ/oNSemXQ8H0nqflrD9Cj7A71W/I6HbiC4fBc+ZqGfMnb9BKenb+ajet1erOzU=; 7:bXDi4PfMAWwpJ53IAGkvN2jYheN8qkFn7Vn0RgYAqaY78mVzXfAkaVKGN6TuRXfpbU24+3rASfxtlDv4EDaKuFblO+iNisHfxwg97EvauLPr7dbyXgMN28G0OnQjdy6RGVMNzG0sMqj/2JxWhG4Phm7MhY/11Kd9ChjrdRpgNX+8+7wDP8UWENhG6q3vI7GhAGM8VtQgnpzpGlfWTkqyH3mvBr+CUO4kwExaz+CTIl2WB5cPFS26yQBQsVPw98GH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:oX7BuVn/iD/g1VuTuTZK+hQeJ6mew6QcNwOiNOEyzpGLFJzU0zdDWZx7KIavzDyNKYhx/PEvmBymiGKCnIcdhZl79umjE4RJ36G4+yHEnxDxvTXot4OsgUVcqC64dXeXY7z53859ozWH7mNajIVBJmVQXzJvpT/FKqoR5lk+hJs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:30:10.5761 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a620a405-fe67-4e09-0d28-08d61d064651 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYXPR01MB1869 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 07/11] ASoC: add for_each_component_all() 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_all() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 673a694..eb33e7e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -54,6 +54,9 @@ static DEFINE_MUTEX(client_mutex); static LIST_HEAD(component_list); static LIST_HEAD(unbind_card_list); +#define for_each_component_all(component) \ + list_for_each_entry(component, &component_list, list) + /* * This is a timeout to do a DAPM powerdown after a stream is closed(). * It can be used to eliminate pops between different playback streams, e.g. @@ -176,7 +179,7 @@ static int dai_list_show(struct seq_file *m, void *v) mutex_lock(&client_mutex); - list_for_each_entry(component, &component_list, list) + for_each_component_all(component) list_for_each_entry(dai, &component->dai_list, list) seq_printf(m, "%s\n", dai->name); @@ -192,7 +195,7 @@ static int component_list_show(struct seq_file *m, void *v) mutex_lock(&client_mutex); - list_for_each_entry(component, &component_list, list) + for_each_component_all(component) seq_printf(m, "%s\n", component->name); mutex_unlock(&client_mutex); @@ -725,7 +728,7 @@ static struct snd_soc_component *soc_find_component( lockdep_assert_held(&client_mutex); - list_for_each_entry(component, &component_list, list) { + for_each_component_all(component) { if (of_node) { if (component->dev->of_node == of_node) return component; @@ -775,7 +778,7 @@ struct snd_soc_dai *snd_soc_find_dai( lockdep_assert_held(&client_mutex); /* Find CPU DAI from registered DAIs*/ - list_for_each_entry(component, &component_list, list) { + for_each_component_all(component) { if (!snd_soc_is_matching_component(dlc, component)) continue; list_for_each_entry(dai, &component->dai_list, list) { @@ -902,7 +905,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, rtd->codec_dai = codec_dais[0]; /* find one from the set of registered platforms */ - list_for_each_entry(component, &component_list, list) { + for_each_component_all(component) { if (!snd_soc_is_matching_component(dai_link->platform, component)) continue; @@ -1878,7 +1881,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) struct snd_soc_dai_link *dai_link; int i; - list_for_each_entry(component, &component_list, list) { + for_each_component_all(component) { /* does this component override FEs ? */ if (!component->driver->ignore_machine) @@ -3097,6 +3100,7 @@ static void snd_soc_component_add(struct snd_soc_component *component) snd_soc_component_setup_regmap(component); } + /* see for_each_component_all */ list_add(&component->list, &component_list); INIT_LIST_HEAD(&component->dobj_list); @@ -3232,7 +3236,7 @@ static int __snd_soc_unregister_component(struct device *dev) int found = 0; mutex_lock(&client_mutex); - list_for_each_entry(component, &component_list, list) { + for_each_component_all(component) { if (dev != component->dev) continue; @@ -3264,7 +3268,7 @@ struct snd_soc_component *snd_soc_lookup_component(struct device *dev, ret = NULL; mutex_lock(&client_mutex); - list_for_each_entry(component, &component_list, list) { + for_each_component_all(component) { if (dev != component->dev) continue; @@ -3664,7 +3668,7 @@ int snd_soc_get_dai_id(struct device_node *ep) */ ret = -ENOTSUPP; mutex_lock(&client_mutex); - list_for_each_entry(pos, &component_list, list) { + for_each_component_all(pos) { struct device_node *component_of_node = pos->dev->of_node; if (!component_of_node && pos->dev->parent) @@ -3694,7 +3698,7 @@ int snd_soc_get_dai_name(struct of_phandle_args *args, int ret = -EPROBE_DEFER; mutex_lock(&client_mutex); - list_for_each_entry(pos, &component_list, list) { + for_each_component_all(pos) { component_of_node = pos->dev->of_node; if (!component_of_node && pos->dev->parent) component_of_node = pos->dev->parent->of_node; From patchwork Tue Sep 18 01:30:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603643 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 BC8BB13AD for ; Tue, 18 Sep 2018 01:30:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA7182AA37 for ; Tue, 18 Sep 2018 01:30:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DE362AA39; Tue, 18 Sep 2018 01:30:37 +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 A8B4D2AA37 for ; Tue, 18 Sep 2018 01:30:36 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 88F6A2678AF; Tue, 18 Sep 2018 03:30:35 +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 65FA02678AF; Tue, 18 Sep 2018 03:30:33 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 9D867267893 for ; Tue, 18 Sep 2018 03:30:30 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:30:29 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 4C27771757; Tue, 18 Sep 2018 10:30:29 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="292747061" Received: from mail-os2jpn01lp0148.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.148]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:30:28 +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=tFAF2OTDf2mvkzTAyhoiWZ1P1+IwJDbhDTZA+sPvsTA=; b=ofBcKqrcT7oSRpOpf4nfX9HHx8ohE91WspiInh717KbotdSacKz+fMjgQTlXtBGayk5qPJMyjCGTPq3QPzzVbzFk0snLWzR/OAqt0yTt/3m3qZiMejXRMrZAIh8QeFUZ7/zabxUWRcxyj450DCTMV1K+e8p2RiCKr/nAFuDlVps= 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 OSAPR01MB1857.jpnprd01.prod.outlook.com (2603:1096:603:2d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 18 Sep 2018 01:30:28 +0000 Message-ID: <87pnxbppj9.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:30:28 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0158.jpnprd01.prod.outlook.com (2603:1096:404:7e::26) To OSAPR01MB1857.jpnprd01.prod.outlook.com (2603:1096:603:2d::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7e75893-1f89-4b2b-c2aa-08d61d0650c5 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:OSAPR01MB1857; X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1857; 3:aQ0x3SxIIpFBCkY7O8hIQDQz0EkQkg7/4NKRV7PyLF53RylnMxMCCZUFGekkvv3+9RNnl+b2fZtWeMZBk0iB2DlWGVP7rGjLe6EmxK+j1XvRJFhQjd5xIEEGztVxWvF+k0PzpWOM6Aw6bqA1GReFzHE4mXBoX/XybW8Kskg2DHLh0RwKKHxf2QuaGZr+s4tW3Lpf2KlIg0oQMq+Q5IcsPzMVPCG7lkMtJw4aOLACmHejD4R146im44bBUuZKWmGE; 25:qfUO09Moxi2eYk0vOJol827E0LIlvUA8AdIzFsrr9wpyJtB/t49nHsQHYasKZowEDbrAjOSNpB0qBYSO3sLpN03HvWD0f1ccgzol17CHXfMlbWdr643bIeOY+ivL51U/1rooG1Vbv4tyUJkjRA16bvZJ2BNj/mnWZu0BMM+ETRY+UfoGTYNUCE2ZthKSKJFMoysWhk9nkxMV2HZ1OiWWrYBVOnM+zDTmMmkvia6842/CCbrhlkixMB3IRCjaXB0nmAsv/00mZOyTu2/KtfdvCfJd0x4kUOkGBQBRMCy8yJADnhQEZCi4FYs8zcpHkdpUsJIoDBSBgQZGglfmnjjZHg==; 31:f/Wg5pWw8ycKTflHg2xpyZGTN22eizIFi31VxfY7kWQWB5KYswN1JoZu5XQ25fh9e1XiRzgmXeKyXzzlZ0NtYWhXvmERNNxtDyZFaronZ4QGTOAwRP/3fqxX7sPftP46siKcs3pmCa5os+e7/OkIOJMWMMdPh3vtNyCDp7hMnVDh/l2xhN+b8dq5I5MA5Hs2mDIR67OMeZ0AzOb0whqtW8wJKrgt+Q3gr3jO9ftNQlo= X-MS-TrafficTypeDiagnostic: OSAPR01MB1857: X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1857; 20:lAsW3QUC0N3Gg36HaHGw2qFdqlStRfRftBlOvi8+CA1CJFIqSZwR9WVmLfJfislngrhBhNw3GbVH8H6yA9RtWXBs2eKYCaoGtkXk++vVv5HMCIN3izqYAI3gKMAH+hfNJxP9FDu7R1aRtrJyKvwBT1oG+CQh5PasfdGFIzma1Kd1qPvxDnFYeeuvs17bNJCMEfnKM7JTfZqDxDFK9Q1WPjsEXXxC24HQRsx1RVzNEUjH7YyTaxgfZ9+mqseyHHn5IubsMeA5W0Je6WjXBqy2sO8/cCmcP+9cHAqNWplhBTB6DKaA47xQ20TS7C5FYj8bnJbaFTYudRH1B0dBfQxwAJrd9I2JOZgZk5xUXhzWC3AUVNtbBGh1/Agku5pYZyFel8IIEHrp+vvWGvUcJ/h2/m8oklf26eCnbpeQmS6BGJdRw81wocx6BBSnO0gUQmQ0R7Vz6Z0hLbQ777zGzYfqYT5+rsm3iYAEvLZyAUJ1qbH7Wa3/fj1L8UA+OnRp8Lfk; 4:rNzj6UTLkjVZTGuFcPtWfv6H3m9ptDgttNnZe5d+/EYwMjec8CSn8lwSUHv2wGqM0UzszTgtB4Rp0C/gew+/qUe7tM6TZkZYXAbyLBS4yghwsy+gA249flcTctx4VWY8Gm5gDwmhiXFnNWR20x0g6LyODyKWHTYM/Fq0//czHxGeuZXpqC7s24KFlDv6CLQR/pfxQCbjRLbvn93uU8BZN7GFEZ1USZTzasLA8tq0OyyjBZ9ABxBQttIU6OxERWSTtZ//yKovq4NTg8KgjyWS/ppCHB0rl0YzYGEGMimJvptDZjUlV9+XkWlAQLfX0c6G 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)(5005006)(8121501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050); SRVR:OSAPR01MB1857; BCL:0; PCL:0; RULEID:; SRVR:OSAPR01MB1857; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(396003)(39860400002)(136003)(346002)(376002)(199004)(189003)(386003)(478600001)(68736007)(66066001)(6116002)(6486002)(3846002)(53936002)(25786009)(86362001)(8936002)(45080400002)(11346002)(106356001)(81156014)(446003)(81166006)(2616005)(956004)(53416004)(105586002)(50466002)(36756003)(5660300001)(76176011)(52116002)(7696005)(16586007)(16526019)(26005)(186003)(305945005)(486006)(8676002)(47776003)(23726003)(6916009)(476003)(69596002)(7736002)(4326008)(58126008)(14444005)(97736004)(316002)(2906002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:OSAPR01MB1857; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; OSAPR01MB1857; 23:hXfhQNV6vjoWS2S6WwbhWB/LnpoBBpVp7ItNwNsiU?= G1caa4f1SzBf0P/VYxLzlX8Qa5139/H/Xl4vwHbD4gmlaui/1EjyIRrlwwd9W4hVkReNwPrX16yP2O+qeF6FIr18LaiW9pdgmvbx0IH6OZzVgsuzGuweZSiLcOy4aQ2Q6ZJZq+Gvqqr0/Vrwf2utc/wkOta7eWOjb/6cUIIYnHxRgsPcnsirmqZutHCUNqK9MhKqyEhFq5LiI5X3GCNU5zfRN0D9Y6ngUiT1fThQ1jv9DcjZHQpuzjJ2loPR8KifrJWiEYBP11q5QICPn4zakr+EmMCyTqxwBsSko58iKow+DC1yMSUd/oQjmnbKexTIod7eWyKXuPherU3LtmQ+5k/AurGSKqmbUlBBv4uH7LomS/q8KldRcbk3tVr3ok1fqFf1QKazyh6wwZBDJyEFNF1wicRM+yboeiZfmIuGqAnDABEjxw54uXz5122sMrBLnIdoRw1llkICetGxTQH0nqdLUBMz1CX9kblXgHqktoeO6kuXv1Hm8jQ/HQTE9rKwmrb+DI4Ep2pU+Z7/yV7j9Ap1N7t7+tBsGcAe/Qxm/UnAnts9CiTEb/W/HdJlwtSahzNpMc+8MyLswvn7jMwW9sY2KMhK4kDh21xTNm8KBgncOY1mLWUqkyd8Ya8fkDyHUoo3w+17SruiOBRA5ABELLmLwS+tdBiiS4fCkt9KOSyRDPl21e0HBuSvD9GGc+jOODHsWObD8q5JSVaZVf67NKqt54KMmDzpBJpeOPwaZyxassQ1vC8EirtdI0NMHzjNqA+psxG5+GRibRwRAVNTdjeMdknpolZwP2h5HISVY+ttLfc8/O7PBLaF94Lj7gzDhIDG3M4EbQaP4j5mSe9tQdaCP3eWte0WRuNNtrmjAQ0NnKs5YpgKpW+biBlOSr7emlRqWPCHbkdJmU9Qh4hUj33S2kIVMJ1QeHrqGHxaID6KDef4hHNWVv8wZ60g33IhLaYaC2BO4SHxwT0H+NX0Eagqzb23nojfazcc/gKJXmbM+fHXGA6JUKp4tDav5YMgyi1IDDiCV38EIIJADBE3F455ovV9jJxc9aD5Cd5BPCBcxoyZXyE81Uz5NbEtSciKk8B7Kq1xEB0eJymGkwTmLSVjVvbONzFUyhqFsDs8sk68u9UZJ1aDalqlr3ZYFf28goeJ8FoIvob3eCFHHx/d731MmCz+jFsRQmPZwtSLZsBNg== X-Microsoft-Antispam-Message-Info: Rn+2gMCKoXTwrfigrGgyk52tFl6/Ti04KHfXoMGi38U+CQLxLTbv8gFCp1RfT/Z6PDhv1n2olWmC/se5o9U5nQvT5A0rLlPhbG0EeiXQFyKC47aeDtFvZ/BvWcZ8d0Bh1cJ7HXJxwDCrnfnWy6vgm1Jx5/vTJcHgIGKvKdiCETGpIW0+S9K/m0UBMoFSztd+AtMM0SqtzCfLILuBVyHwx9F5yVws5mMiau1ZOuAVDDNYUgoM5QMqRRlXPuud4Xl4V3HPbcSb/BFmhfDjKxEmjO00kdBcBHyvXPFm41iAksHZW84f9v9bUWMd3NKyQrx55iyocV8s0/uHa1YAUW+qsWh818zKyyLiM1UVkHGfZxU= X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1857; 6:hhPaunUyvoYfSp9G+WD5QfRR8QTsvNT5l4FtOTL/NQCy7fd5dQzBiIP3+lPgN/Jj/nnSu0Cj9WLthcY7shFy8KeJ22fXY6pv32mF+pBWsexP3kSqyP9epaw3XWKMSvF08aFME5UObuPyWkSIIytzx8DypA6ZKY3BizULSAkHtp1eAG9N/d857Q6LBj+DDY3KHswvx7x7wzVOACypXZddHbYaCJ5Sbb1HCDV7UwCw0APbT4pPnrPDmWA7G5PrU13xM1eUIqCdjqaPkoJ4QDVrXP8xlfZ+7bNOgusJotniHJh3MJIuOXkIXkZHaaP+mZ/INtDWd5ySTW45tmfsIgeh5fuyu6kPj9HW8+bxD79dK+OxxlmUC/r0SNdr8mg0EwuKTY3T8JcbLUH/yxmsTnx+0Xv+SdE34wVLGImOIB6TZZVM2LupD7EXSRtvqH57vec02WfYExP97E2WyEhod/OhAQ==; 5:v44JKnySBw+6a9dEKJ41CHwYssY7lo4kdvtJepcl0arsQwswRAOdKxaRYYIImSJtDjRPOz3lqOeCF3tolSEQguiuGJgraAI4MyF/ldOZHG5YrxxHc2oCirRPvhohqtqe1xgFqEJl9K/uYxMOr27cJCT9OOOfp8x1G9P+2dRR8F8=; 7:unxst/waPWOPeNKP4qDG+2Z9LNNwXps1vMuCgsCjFqq0dkhAkmQzTiwp2EAoy0egiULLk9bjMl55nIu97sgkT/AlNSJf8/crJchlgajaIDFa4YhcjuERXEJ59NaA7wTKANPGf0AL0vrQPhY6SPjW8p1p7BCom7DJFsLwIWY8jvguiP0cTry9v4N/PIqY/7GItgtNSv1w8ZkFFifEYy2yJN46AH7rLxoGIMVQIk4Sfg8y1aElI4nHWDDBH+Nops1o SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1857; 20:eXOgTY3n0GLMucZth5J+TEw+VDWIR+AQV6w38Z3kxYBLiHuiy9ie0lJ25VyAaNCC6fJNIl/Iv7i/UGJwGEM24xRcbNiNuEJQGPaeOD1+BfMNn6tC4cPau188efHU3ePVWNUYCWAaZ0qDrC+PReQHJ9KU6mIiIEWIcRTl2QBSt1s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:30:28.0820 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7e75893-1f89-4b2b-c2aa-08d61d0650c5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB1857 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 08/11] 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 34efab6..52bc289 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -859,6 +859,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 eb33e7e..d583602 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_all(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_all(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))) @@ -1314,7 +1314,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, @@ -2848,7 +2848,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); @@ -2900,6 +2900,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++; @@ -3734,7 +3735,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--; From patchwork Tue Sep 18 01:30:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603645 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 73DB0112B for ; Tue, 18 Sep 2018 01:30:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6129C2AA37 for ; Tue, 18 Sep 2018 01:30:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 550D62AA39; Tue, 18 Sep 2018 01:30:51 +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 664272AA37 for ; Tue, 18 Sep 2018 01:30:50 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 47ACC2678B0; Tue, 18 Sep 2018 03:30:49 +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 B3E192678BA; Tue, 18 Sep 2018 03:30:46 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id EB1E126788B for ; Tue, 18 Sep 2018 03:30:43 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 18 Sep 2018 10:30:42 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 796F27177F; Tue, 18 Sep 2018 10:30:42 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="292747112" Received: from mail-ty1jpn01lp0183.outbound.protection.outlook.com (HELO JPN01-TY1-obe.outbound.protection.outlook.com) ([23.103.139.183]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 18 Sep 2018 10:30:41 +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=j3ocksVFKoW6poz9z3NfOVvjVpU6dQwX17DSSceSMkA=; b=Etza3ptCNUJlzl7IGMps13HV5JIjRQ+tEToevDAuzECKnDVYBDjDIaCRRbSzbCPMSAUEiOxay5gI1gbAVIK5rUvYcN5UFQ0yZFPKJ8RFWrEodt3f16a4z5guKKVQc8p+BhEmxzi31+HnLlYn9qjpOp9ctdOVol7LwCJnRNOcx+I= 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 TY1PR01MB1865.jpnprd01.prod.outlook.com (2603:1096:403:2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.17; Tue, 18 Sep 2018 01:30:41 +0000 Message-ID: <87o9cvppiu.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:30:41 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0112.jpnprd01.prod.outlook.com (2603:1096:404:2a::28) To TY1PR01MB1865.jpnprd01.prod.outlook.com (2603:1096:403:2::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86e61fda-ab7e-4115-7ace-08d61d0658a7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB1865; X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 3:aXCkuC6WPNAAfozhcouJnP2DP+dMyDhR0lYGwk+RZnMsGr4xe/ntBFN+MbhHh4j/mbtZzAQXuG3ZVXLTAdTBldmMl+N4qbtQT9XoTeYDmtFA6fRSTmZRIZ6Ve7CjVRyENLAXW0JoQZFe+4Uisdr21DyyHxqJjcBIcANrEISeVsGZmfcSvJtMkgJYHBbo7J6/kQ6m/tYom5VgKxQH5/g91R2Bm5its5J+nOSlCDsLv6hcJgMfq+z79JCLV6LAsU77; 25:ryNKzEkjafuq+grFTpbbHJC/siKMhiEb4WAxMWHZGEkGJpJ42X2G9C4JVxCnFOesKhfCrL7zpYSFmzKnLJnVyL9DcTd9A2bGU6XucQ9PkWTYf0IPKZbF0eV2l+nEwzQ4ZiOJaa1BKsOJp6QdJm0GBVxo7BgFwQM0fcjW0vmIiccHO8R/MZ66rl/YbEGI70NXuzUeb74nJ4D2jVxiGB9Sz1hrmGkYU4XfUBkdH5IHLRygWhS0O+/ngbavWRe8UHhULcTzQ68rKs5v/CYNpIWyZHl3wNxVKzpgz3CSTBg8odJ7qzWciKyjxy88hv59dYsH/NkJDJaOu1L7Z7bbT8Txdg==; 31:LgngdxTpeR/NedbGfeVKfT2Mu3fdGf/xbA/shqYRGKmAds8TbYKZIixbIzbZV2Hlu7PCidpBivbCsXwEeQsxzsKbTpeKkHQgowUXxooxhuhk52AoXqxDHSxmBpaGJ83hw8Y7fzD3za89WaOEcnomzC2MfwRdKCAEaqUJ9R/bztcd2J+/ahR+OC0qq+Sy/4zxo7IEAhfmkdfM/CIJa5ccLq/RFdtkNTIxHjnYR+1ztog= X-MS-TrafficTypeDiagnostic: TY1PR01MB1865: X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 20:fwFxZW8QVcaI3mKpsQKJYn9fDGwUZUKp1fNiDCH+ZciNkttg4+orua999I24a2CfM4s4WTYlA1hzohpbyyaHg26yQS1oFJuiHei0ZNkmdPqdljfvam1MiUXzKsu4cr/2noReUa4QkjTmPEyTBJipM9CHX72cwF1ELC100TXE9iJ0W8ngJxpYQUIeUHFvhrspED+DXPuWqPldyIVBWXdFGXe0kvkdFg++TbGlrAqJP2KE7nqUNEn6JcrxYX2wzYVzE4m9M5KaQXZjRIDSwJW4N724mAss2GlbXt3uxv/MKsU4ZqjSY8mLcKS8d0irL6LAWO+Olm9gKl9kUorgWFXmYUu0mThRKbNqA/wINCV+9a2DLGzNdUjzqIfQ1Ef6YE+jxgaEYH+WfhXnk1z323JzONJxoki1ziqbTDW6L4M4NEeDO51CboZwhxS1VU8nNXUNYzXicbdf71vkoCQjazTJuLn/G/X/3nO9IIsXY9s6mvJU6JX0eOjPEtdtufnmDuNM; 4:5dXdXLMfRJVp5I7TVDMW2rrxh2kFMYZB5BuxxI+54rwkfJ7HdRBW3zjHNwQHtIi6UtSwzOKxaJDRqIrKjobxA3TYqHT0BUTyEVVdQp+0tll5Kd0TUbMBC+b/E1h21hrMpsz0wkR7vzdlxsaR336ILG5vxfL+izeNbkOzgqYHJib21ofjmwboracpbqNDvlxQVSReDkXPJp7MYcBbsoBBbuQI+0R135kKFMXcFJ1InqLnmQaWDAj6EEqYBLwoyxkDlf0YyfD1vo+FZeMJKQ206v+aN4WzzrswoHGlGd4o+Zcwq0WzcuCoeO/FrE6UTCpN 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231355)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(201708071742011)(7699050); SRVR:TY1PR01MB1865; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1865; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(346002)(136003)(39850400004)(366004)(199004)(189003)(66066001)(6116002)(3846002)(36756003)(52116002)(7736002)(11346002)(23726003)(25786009)(8936002)(97736004)(50466002)(486006)(956004)(2616005)(7696005)(14444005)(47776003)(4326008)(86362001)(476003)(5660300001)(81166006)(8676002)(106356001)(16586007)(26005)(69596002)(58126008)(386003)(68736007)(16526019)(53416004)(186003)(53936002)(2906002)(105586002)(6916009)(6486002)(76176011)(478600001)(305945005)(446003)(81156014)(316002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1865; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TY1PR01MB1865; 23:DB9I11KNWjWbzpyxS5vZNsM3iGyNwlnjhfi1QE/4f?= DMFKJC14a40KUV5JNuTj40errdbbyYzdJ7kCp1LJ2XR4uNYc10es2QX1ptl7WqdyYL9+aK84EdqWiRH7MZfDPpiksReCjKgvTFdkSNWAzLabIMYRIiRMUG3HNIFvHHBbYa9anfbd+E3pMs9KRTMoSUhiyTex3+5IvfKO237MATNWUQxfLLW9tq+Vkfbn66R+TLHoPyMnqHx1ezrcNruh6GN1S9qvtKna5ABzKzBVrw0YjZVVlA5S3u2hTUX4WF4AYOIDNutk3HuaJ6Fwt07wg1dq47phg37QR5gEWv+ZqQ3k/AOimOjuJVa7119IzX/PGW+q8/rNmN7cf4//1k9uTQE1nspSrXrFMvFygUUjnqypfVRGa5xd+ahRNRoVrjdP9LaNZ1uLONgXI99D+z5bc64WOpozg/bCloQWHMpCtAwlgGz9evMtdLWly8NXlfktvRULa+OFBHidS9tJOHt48fgKoaV6+OmNub0t+xCRChfbD/wOT5zgvgd3SALFYCm+88nPbbCwpGiinM++2YnHiPYFgNuwh5qL7LyaZZaCbtOQaFzLBu0Xtw3w1R3Dy8cheOyo/JlfHssjHvUErlc2XTcu5PqrjbqvmggHmwk7qJAZGsH85cIX3L+fZVJYRIZSEyYXFpcpizfVH0eDsWunSZidLVJQHnLOfCsVsdwKTcxCO7aBl0xVcxNK3vHSrulF3t4BEd+GDGaCJ8qmPrPbJDw/UJFh/57s93eW2Nxqpzgt7SCt5PKKcori19y9LZBKXCvNlI2+dZQ/BCW9rCEY1mk62FW5M8z2w3BlznSc+gUZ49nxefQeOM8DqWz20mONOjyNk8Y5LIX6hyb4NW8SfBj5gHy/rNjmaOCZuP3rugkg6kEecCCOsSYR6C/lp1lmMzzm/PDw8jnz7lY/YjiZXoiStNiVecfav3VOS2eCLAKcF/NkyOWrkoUghzv3NFz3VnqJ9CpzB12maxeJMc0QcndMkL7sHB5X/2CFmxFBuqGOHYOUWKI1M63p07nBRJA52qrt0qcwWWeU9SJmt4y7UGbs/xBfXggKfIKHzZK2ZMs7MAMAZKTGzfiJjukB8pWd45bDTiZuetu6xgj1CL/rukDe6OiHLK6CXNf+GbNNNENDfmGqv10eACXYUCmorZY4cYzoslqeSigHsl5JBrT7b1o X-Microsoft-Antispam-Message-Info: A3RgHK2xwPjcGCprSE+yzRPaQYvInhu3mTkw4g1U2PL9JeCWzJBtfH2E7uYF59MXu2QiQgr5RhhfCmQR2SBNTH5/Cg5ttm6TfhIn71TS19LRCvX2XpbLJIEoSP1YvN125rFOF/Rlk1G+LoY9K/FZLeg9JcVUk5K5lHP2OiairIoSk3oJKDoZAnxi1ZenqOvOqdNXLBjUaMHagtOhGszqjvQf9ChVZ9L6cT762hJkGLeBu2qKuYdzgBkyOGLdImZCZdVBgjn5171JvivIuevqCB7WFowayDqAOdLwwHqR1iP8DfVm8gW2Gykk6LPSFM2263tIqDK0U4EcZ540StOWFo5yTyLY+0xeTeVE5bh75Hk= X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 6:h4Q3LyIrO9C99etFdeneH37UwQ6qBWnZSsMfgoi9vdalTQJ2ivjv3PbsLTItFSDIuQTUxFEQv22XsGc2gyKt7oPQaaS4UZ+0o9ZivGqRkC4pfzqR8PouzJqjdlxQ3kBMsBw5qFAlVk1rhNuQpCKc0ResxhE+uWPNUR8iUE3OPBEaQTXf/S8bj+lNgOnD/MJP3u80COA286Jima00d/K0NC2t1I3rVoXjJkkqBTqqwSLlXRwsKReNaMOn1oEqKi+PPC6TrMSv3XQRVNxMaEOlqThbaa1mHJU3wK50oSdR1jGLj56Dw1B6EJIZNPvmx3tHm6nh51t449UeOc2kREUXTy/DusvnpI2pEI+UNP+cfgDgGcOqvkFZ+kF87/gjZQu2hs6ONknByKaEiEEWDyVW7H0do6xru/yY9WVA/N4uJO/rAR4pxqgVgZLySHgCReLns9keLUdoVVga/2CK/8xCNA==; 5:dpFSmejb6ZivIRuFJIGDcHzY2EhtrlLkMaxwCLF/CNg+8jYhVmlanoxdFHgPbDtCYl1cRpyGiafT3VYN9qj5xd/ERAPENfu+l/Uuai3EYAmwBHI8nYTLj+eIJ6V23PTlMDy6cvZtxQBGO0jtzVJG2Wl4R/1xtzyXaZRuCdDP8oo=; 7:rrbczKooqOgyRwPG5qK5ER9eJUrjNcmDclnNTiw+U6aKGVbAvWgqS1xmnyGKfa2OJjg09s0NqTa+t17zyU2LJQImtk5XKpuF6KZJclgoU2jxVOZof0JxANOsfrtNKf0NljOw/n6pxaHGkFlDcu10rVjL5jmSDtg8Y5i12nC8IBcHRCMxtUaTGy0nYoxFFdmRlPf9+ltnSIGqqsjDfv8dPBOH70lcAGLiDljV6M+hbqVb4yn3zNYjCmk5aTrvgt0z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 20:yrhO+2nOM8LKSVTys6B7rcUY9N5uRrVnwd1or9LuI5tNFMEeMZthnfP3e3M6MPNQWiVtdHvKQDRJ8w6gMcBWzRYtdQquUl8IUIKNUfWzWNcI9SVzTiXEL6zNS4VUZaRNTqk5CWq1YSa8hpYSq8DEVtENIzjThT/6hJkfU/Z6kmU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:30:41.3363 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86e61fda-ab7e-4115-7ace-08d61d0658a7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1865 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 09/11] ASoC: add for_each_comp_order() 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_comp_order() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 5 +++++ sound/soc/soc-core.c | 18 ++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 52bc289..f1dab1f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -372,6 +372,11 @@ #define SND_SOC_COMP_ORDER_LATE 1 #define SND_SOC_COMP_ORDER_LAST 2 +#define for_each_comp_order(order) \ + for (order = SND_SOC_COMP_ORDER_FIRST; \ + order <= SND_SOC_COMP_ORDER_LAST; \ + order++) + /* * Bias levels * diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d583602..8f56725a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -995,14 +995,12 @@ static void soc_remove_dai_links(struct snd_soc_card *card) struct snd_soc_pcm_runtime *rtd; struct snd_soc_dai_link *link, *_link; - for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; - order++) { + for_each_comp_order(order) { for_each_card_rtds(card, rtd) soc_remove_link_dais(card, rtd, order); } - for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; - order++) { + for_each_comp_order(order) { for_each_card_rtds(card, rtd) soc_remove_link_components(card, rtd, order); } @@ -1620,8 +1618,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card) int order; int ret; - for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; - order++) { + for_each_comp_order(order) { list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) { if (comp->driver->probe_order == order) { ret = soc_probe_component(card, comp); @@ -1643,8 +1640,7 @@ static void soc_remove_aux_devices(struct snd_soc_card *card) struct snd_soc_component *comp, *_comp; int order; - for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; - order++) { + for_each_comp_order(order) { list_for_each_entry_safe(comp, _comp, &card->aux_comp_list, card_aux_list) { @@ -2016,8 +2012,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } /* probe all components used by DAI links on this card */ - for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; - order++) { + for_each_comp_order(order) { for_each_card_rtds(card, rtd) { ret = soc_probe_link_components(card, rtd, order); if (ret < 0) { @@ -2050,8 +2045,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } /* probe all DAI links on this card */ - for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; - order++) { + for_each_comp_order(order) { for_each_card_rtds(card, rtd) { ret = soc_probe_link_dais(card, rtd, order); if (ret < 0) { From patchwork Tue Sep 18 01:30:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603647 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 9B52C13AD for ; Tue, 18 Sep 2018 01:31:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B39B2AA37 for ; Tue, 18 Sep 2018 01:31:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F7A72AA39; Tue, 18 Sep 2018 01:31:04 +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 B31DC2AA38 for ; Tue, 18 Sep 2018 01:31:03 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 96D1326788E; Tue, 18 Sep 2018 03:31:02 +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 74ED7267893; Tue, 18 Sep 2018 03:31:00 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id B6BCC26788B for ; Tue, 18 Sep 2018 03:30:57 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:30:56 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 47D83717CA; Tue, 18 Sep 2018 10:30:56 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="291183556" Received: from mail-ty1jpn01lp0177.outbound.protection.outlook.com (HELO JPN01-TY1-obe.outbound.protection.outlook.com) ([23.103.139.177]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:30:56 +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=6/vbcZw2A3fi5soJzI6slvdTjFIV4X9SUMcOux5ehcg=; b=W6P72G+MlifaGEeCuA/i4tWU8lJmBrNiCfWmJKwobkQbZnvo7/9h9YQeg6SuVXc39PCgszKJGWfRSsnPVTEkovqixEOG5VH25MnQbK/DiO++nCf5SSc+MKnhFquQLT2HcvDkLKzK7UNHfBjCRfydTu3M5sP84+DL94v02Y+Lb6U= 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 TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Tue, 18 Sep 2018 01:30:54 +0000 Message-ID: <87musfppig.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:30:54 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0150.jpnprd01.prod.outlook.com (2603:1096:404:7e::18) To TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18a0dad7-b801-46da-59f4-08d61d0660cb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYXPR01MB1869; X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 3:hp8tQJqG9JuBiJOtLPNhBF+4sudo+lx1ylqWXogeRLEojpN67zyc1CjYyFvlHb5Ee1A7SIncC3qqA4ep77Nuc2i0nfn3usv/VJ05RBy5w+CiCbFRqb+UN7qvYzkfiYa1Q0uQ1OAg25H7pMvNHkCLxcUtkR8jkPgv12qNK42jMEEdDpTQ0KVOSHXMk2fdYdK2Kfz2SPc3zJcjGkZlBG3DtqMHi/uZ8RqqqdCwLnWyrj/AwRrrVfICHMmVQ5h/NxqF; 25:ETMIKgqaqpL+puf6PTETJ85YSlv90wsQjcxXE3g3PRNvho+Sj823Z3bJia3qOr80Dk1ZDZU8VOh7Z/ZIs4+jWFACdyLqUtYF4tQcqsgyKYRQvlxCx81TlqKkmXR/p9e8WPC414JXyEceFi43CvDLJsNZB295oaZtcvdlWpNq5PGE/lQMIq84nHD395I1Db8AHnWXphHH7TmloczwgAEWiei2xOdQg50MyEZZeIMmtzpDoOHX17Lq8nRINjZDWgJJ8yhx0OubqhX59d2V/YgIpuBYmas865U/aASc8pFS8F3dGMyym73lUXmY/0CvVzIYHWuT1MgRYvS7u9s7enmH8A==; 31:+au+eZ3UU+mDGZcYanGLnSDz4ZjRQ0D79qbTAVKesylCr+yU8YXQKfKAUfkwvq+xvMjjuUOPEbN4lhA78vMruX+JdgphOjXznQ2Byt3H1a0ycG4LxiWu8TiFZ5FXnjhy76oXRlO2KOYpesZjmAl+35Si0yBz6pjhrIiwf2MS21nPH/BXO6NzipiKttZb81lIFv3MHaeDepwfVH/IHr7ysXXArfa4/n+Yrmz67qA6duQ= X-MS-TrafficTypeDiagnostic: TYXPR01MB1869: X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:c1SHdiJ/U0RTBb5YsXX85Uprz1oNbunbEuEMK734ljh4TclPD+yIAF9M2Q7r0k0E1CWQwfAxlRi5GHr7kBmuzP7R7pzKqZ0YzcRYXkyRNO+gvzXojd0ZDctpTpES/C7O8r0ACwt1mO/VPB1KLQzj+hCQsushyZ2monXqmjOcS0x4WIEUHN7a/Tl5VehWejJI3XPEvGH8zi5KVo9clrzEIVQT3fbXiIZdwgHFuSpz6tzNdmKzxnMuKAt6tGROjIbv3lugLsMcFnbzI9feBCMcpMEtaZeAT6DBXmsH5KB42pfrWolWvEwuPvcL8tIkzUKWCK1hZPle0nKyV9Ys0B2jKB0aHw/QYc0vCKSeo1RN2t6Gz1go3X8+iFb9W2VhlDBPuljAtaoqpBqU92bQ4nEOYBX2fmyoAMQX756UGks5Qc8SwKEvRw0CidymBfmya3+KSueWR5ux6QluINRRsf7piR97klqIUCgReoHp8g0lRvoZOdPUb+rxsoCdNnQxOmS9; 4:eQ2otmaUjpr0qC0tMvBnJIdX++/Sgqu1o3d2n2Ddd886/CMs2yycO3N4Mvh1GsOo56mCQXS3uFgGhteNkzvXFz+zRfz57/16dH75F7zkjXCjF+9svuRGqhLcFc2AzrNKO4CGI++Y6okYR4fJV9ONqElfdLtRYefWGg5HpHrhsOVZ6+nl3J3617MirZ35f5e4cHoO8hA42YqoFi4T40Na6KxEVRHC9oiaL+VKX8E/n9/y2o0iKdfH3pmnd20wcOSEDvZvkGYklRsMqEXAq+eu31aRzixJZqahtpDlxWKcsn14F1X9z2St9Uu6MwtvVetm 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)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(201708071742011)(7699050); SRVR:TYXPR01MB1869; BCL:0; PCL:0; RULEID:; SRVR:TYXPR01MB1869; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(396003)(346002)(366004)(136003)(376002)(189003)(199004)(16526019)(5660300001)(53936002)(478600001)(16586007)(316002)(186003)(8936002)(58126008)(4326008)(86362001)(6916009)(76176011)(7696005)(52116002)(81166006)(386003)(486006)(50466002)(11346002)(476003)(26005)(2616005)(446003)(81156014)(956004)(14444005)(575784001)(8676002)(23726003)(6116002)(3846002)(66066001)(97736004)(47776003)(36756003)(105586002)(106356001)(69596002)(2906002)(68736007)(7736002)(6486002)(53416004)(305945005)(25786009)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYXPR01MB1869; 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; TYXPR01MB1869; 23:EglWRmpqzYGQOD+rZZtEvVNk7Xny/C8lpScGFrfqx?= sJ3o6N++3sXljrQ2tEH8r9akKqTKbXUtuvXoCSo6jQ0R0mknKiLzO8s5YU7lyIt5b10lLLY2aYnXpcclsbbyg8RgJVx58PZty0T+31HH3AI/4VjbO+OM4mmeLVcA5f/XyzbfKvLIDT/QD1RZfI8tvDwOUc7+dyIeYcxJqaq3pU3MdOvsfk2WBPWOIqjjLHokQ52LpEGUyBPnmaJzS8Xc1dd/W6RUDs+l54iivKqfleHyAJkMIq6V344VO/dvElZxTR+aczN0W0Kdg9zHniKd5qJGYDra4vNZ0RjdNMOx2VscPLTZrItf33ikJgAABgVDhf58x+vti0AFZouWPbZ2GgbxvOae3iv36fJkZEy1LbEJwPiH/xxLmxlk99FU90EX2n18+TYfrzQGmIZ2UV07/anRaDAAjZm064TVtY6X5OHH1RPUPWJ1vcBiZp/h3/5FNDayV8RFBbO5Wjwk4q/t9/DKp938Gch6CbjwBvHewpd3mpOZuP486X0N5lKV6QJy5InMaAQhZM+r+Z8ky7MGR2nV3OWSrBMwKI9N5KaaQB1tnlJZGH91y8N5zADBbmiHRmO31KM+mh99TJfFU4V9vBrnp8fQDU2hbTS7sfjTg83Pe3a0CyrzmO++M+n3v7sMFLe9KLZCpHsZAYeL/B90pEdGboB7B+fgUuWbJgwUSG7pmRyjUgXdQuEJX5ESd6xvSegvQhTx7+zyqT+/U2B6Y0+Sqli4Ez5LK3ygeAa3FsF5gnpgbyxNjnQ5ZmqFf/vbgLvaF8PTsfDF/ir8ac26BZY8uHk6JJ/G8DJqPtjQYLNdKPrlD8XlPwIDrGhms2zOf6gWBKXBTZmvjBbI01zm/hcwTRO1vaLVCIxPLSZeljJY2xkXGegDFgSFK4Cxb5xaT5GuxdqYdKyBUoLvIBi7n6dnamTciXWOMjJklZbX+FMs1Y09LSXetfYAFqkuEW3zN9BLY4Qr6hjnge0a9e6svlxeZ9LFW8baQ/K/J2GSacli/OCGoinvhgKJ0yKLYAcNSu53sHDU9rU8YdGgoJTcgqdCTATvHISTyCsOedE52djsVV1LS+u40qeRhMhQi4v8BG3o/kM3IZ5KfUoFaPvdjquNfreQj+sOhUVbiVxJS7+XzUrVxIThGkUBp97p/0fytKEzBY2Ui8jQCV2/7soV/dCyvtebXhcy2vscPksg3zeQQ== X-Microsoft-Antispam-Message-Info: T7aIhY36nNJJqGZljI0lh1LUZ7EYBWa0qPVL+bVig/yHeoGNWizA5K9rKJX8E1G9sQVHZjr9a4G4ct5dR4WwIpfD/K393GtF5vs0cnNVg/tDG872k+rRHVtd/w1kRDZ+RzVe5pM9MpDXB1iO6f6EOc42XZju+k7ncT52IaLsOLfPam/UDV2QOJReOor0wiz2bYC9cOtuXyMtgwTJihMJGsdMu3adTjsiK8P/Yr8sVshzTyKBfNej3mK+oy0kUrwcsfcBnfaFasp5GappX/eYDlu+DKHY32ky+oJmSZLHvzSq71uGh8OKeXeijEjQ10Odmose/KrarwDHL42Ez9R8kxyyREyC+fhCblLGuofIcbI= X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 6:u5oB6shKzhkcedgmkckBFUwUNucKsVKeloSSV3/Q4v3ZFbOgxUud0Ywc4nEYu7itsosToxJSaxuPLoeKyWNJlC7GU1SXi5M0vQhcOA61CG62jOYrN/aLdRBw4t+GpXjHR/0fYicst2eSYoJLqJKi4WlizHZ9upgCKxkhzEfSEo0kemjHvoa5DvuBDEnNIPKNRQgi20eP3ZQ2s+DcvseFMd2uiyBBTt7Xx7Wd5P160WTb4JNGa+zCBxnlKyCAK1gizCVyOAuBnpjLDWH5bsh6An2WpK8T8vGDl8YRdlDcBwhLfXwZapPhxuVgMIqOnP9BWsghbKwwxITB4CMSd1JqtDfs12/l/RY9KOFE/kjzpVK/wQHjo6tHUyfJ/kYtY9uPSu+voBCj6mjOgRoiV9x2KUR4ereSz9Qvy9wx3XWrrXZE6c6BnufkkoQopooPhJShql6VCM5eF+ioQWcnPsnmyw==; 5:zUfwgT14MnvDceXIjEHHBmlQlDeNfzyrwl9yCFy+W1m0o2vWUT2U/Sz2ae6qGVkWDG8nGRkGAvhsJRUfMejY3ZkNOz0d0AYPkGgiWbAQUtVP7uyz4VpJSpy9OUqreome3qrB/15lEt3fTy+XbgMowI7BaEhl+/s8CqUeMyrDpY0=; 7:mbHke3DITdicwGM8YfhQY1ve8tkhs8d8MR3/YFxTeSfPiyDnrogAqlYNGZl5HznNz+S7vzidba7aPs7G7vbTb1RI9ljajsatY7UjnVKZBqB2fwzEeBw+i+QPPvBL4LD57nNZrC2Ku+gn9WmeoycC1hC27ccTl7tMvRl79ebqVUocLuXZ1x0BMqZO3m/G3x9lK5A8Y40YlT4Ei1G9BDZRSuU+D8n852WnREGGOxq5crqYstsTL0FFN0gDYukromLU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:I5MFNIR0TjSJNbYpLthbtHnWy7ZLZPay9Qp8l8slo1HyhgCydZu8GcONYHnj9htYjTRcQGq72PRnIWoY8lfagL97M4m2LbLkUrLpoFcMuESul++DE9Fr5zKi1VTOW2Hk8iN5rEq8VsxbDc9sOWqOPUCCFYbQ9YAXbuDnYn6XCjI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:30:54.9983 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18a0dad7-b801-46da-59f4-08d61d0660cb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYXPR01MB1869 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 10/11] ASoC: add for_each_dpcm_fe() 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_dpcm_fe() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dpcm.h | 3 +++ sound/soc/soc-pcm.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 9bb92f1..f130de6 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -103,6 +103,9 @@ struct snd_soc_dpcm_runtime { int trigger_pending; /* trigger cmd + 1 if pending, 0 if not */ }; +#define for_each_dpcm_fe(be, stream, dpcm) \ + list_for_each_entry(dpcm, &(be)->dpcm[stream].fe_clients, list_fe) + /* can this BE stop and free */ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, struct snd_soc_pcm_runtime *be, int stream); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 09d0f66..e791663 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1252,7 +1252,7 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, be_substream = snd_soc_dpcm_get_substream(be, stream); - list_for_each_entry(dpcm, &be->dpcm[stream].fe_clients, list_fe) { + for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) continue; @@ -3219,7 +3219,7 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, struct snd_soc_dpcm *dpcm; int state; - list_for_each_entry(dpcm, &be->dpcm[stream].fe_clients, list_fe) { + for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) continue; @@ -3246,7 +3246,7 @@ int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe, struct snd_soc_dpcm *dpcm; int state; - list_for_each_entry(dpcm, &be->dpcm[stream].fe_clients, list_fe) { + for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) continue; From patchwork Tue Sep 18 01:31:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10603649 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 0F8E513AD for ; Tue, 18 Sep 2018 01:31:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F07D02AA37 for ; Tue, 18 Sep 2018 01:31:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2DC12AA39; Tue, 18 Sep 2018 01:31:19 +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 811892AA37 for ; Tue, 18 Sep 2018 01:31:18 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6ADFE26788C; Tue, 18 Sep 2018 03:31:17 +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 B0CC12678BD; Tue, 18 Sep 2018 03:31:15 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 7FE1826788B for ; Tue, 18 Sep 2018 03:31:12 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 18 Sep 2018 10:31:11 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 11EC17181C; Tue, 18 Sep 2018 10:31:11 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,387,1531753200"; d="scan'208";a="291183602" Received: from mail-os2jpn01lp0152.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.152]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Sep 2018 10:31:10 +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=m/fIcicHHnxug92SlMMPAabSPpG6opQEbpL4mgs9A74=; b=JZKIb6RYeH+1AZSYP7TW1p/GV9SC2AjcV8J1PRSrsmUiHUl+hlgGf/3/mqSrVNwRkjx+qT4Z/voDpqYSA7dHdV/Fv4EOyh3S9aOvtd0zePfxU5u5oo7hfPPo8w8brAITpmCLzU329gW1woW6vGxMhjmEpLXbWtV9n9XqUgLF7MQ= 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 OSAPR01MB1858.jpnprd01.prod.outlook.com (2603:1096:603:2d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 18 Sep 2018 01:31:09 +0000 Message-ID: <87lg7zppi2.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: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> References: <874lenr4a3.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Sep 2018 01:31:09 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: OSAPR01CA0144.jpnprd01.prod.outlook.com (2603:1096:604:f::36) To OSAPR01MB1858.jpnprd01.prod.outlook.com (2603:1096:603:2d::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdc45b83-c976-428d-4d8b-08d61d066958 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:OSAPR01MB1858; X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 3:nuIR3ralCIDPvX1xIBAKvqZz3l0s2NqU/P5mDVAAdU5vZwndBzSx0G7XjcVqszolA34zGkj1ZkZU6ssDbcSEyDyCpOcOUcN3Y3t6IsgKuhn4x6N6z6bOjsIHaSBsT8pQKTsHp72Ihf1rVRoZxo6mb3fl1P8asmRHTyg0gIBvoIFe0UmfXj+QLxYUX89ZI0OIk+geEzeR/t3oc0JuJXiJG2a8W66hzgwqSwEfnQ0VZpwMFb0atsRCh1peKGMMBhFb; 25:z0i+3r/SjyvryuzcAI1d70yw7Q3cM4dEhy4mhbKxEKqOm8La4rgPElkbhKNB6b5S3ZpnEvGfFvi2LUmUMJACD60CBj6RBHEZp0mLKbzaBsf+8HxoU77fGXcJq6RrAyPDe5QsgKcsd38dS42X13pqATJcH+oZnKCqrxhEV4JCekKZYeQkYkJdbglzBCQTqPCIRUOoOx3H0/3vGmZtcTsVVxZvPgji/j/DxtbiLWv+xo8UQFfyaz4eRboRawj3r/Apuaey6MJunI92PL3nbx26wF0ETCPcozuTYtnbQuWMNLUSGU7cjCH4ypQ+0M9kzK44Qjrp9vykJ8JzS6JujDt9GA==; 31:ZrR8ghmY+IWO5dh06wSCbyH0YM/kfeN2TNaEcSxqO8h23vfPF2QdhNYXorfG8yB7k2qgpUssrYUaZPG/GE9UTBeRONYHBOJgraio/SK7LSGlLCtURJsZipAeQweBp35uCvioSHJKGxYy7XtsCfvSoh6EEfC5Dxr5at/WCLdTkcGco5MshN6AtCELd2JqoYWkycy6MlAeEAhBuVwqynFcHGnL+fS4UpF0HqUg+73bkAk= X-MS-TrafficTypeDiagnostic: OSAPR01MB1858: X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 20:TxzaB0jylEXwUObIYiLQfI0CL+nzeYJdu1HTE3iKEgYwcXOdSFNFA9s9UZRBOE8ff5Rhh9gRtJZXju2qi5kPmxWZ1OKdz/wxvkEjeTaHJlQim06GdxeFTLHvN020BTeLlAinxffxa+oVgEV09FYTaVh1DY4N3adnX4iYHS9WTTynEkS4s3JAO12BQ0Dey90p7pfFdKA/+coFSUoBcTVrIbys3yoscyRYAqckwr6QiT9zscS/Wb3H3DITxJounYjSJGyIrCsFAwDIiEFRVzQW7wapJZj88CdkoBHhd6yKwsL91UO4FltCSZMWNOoebHX7GosCfyQuAR+2Qcs6DcACPQJ/VA99l1AF5XcuUjjbqhRdFzsynUD8IhfBaPBorj4/caT0xmStmSOMSh2vmDsrz9+ha5S432oZLEKfqKY5zA9bI4qBuuDZU7uND4Lx1Bv4+FJa9XIsiuAlNSTEUoZAzyk2EPiX/hwAZGRigJeHB2D10Wh77oV8TWPHbfpvmMRj; 4:xNESpyLe7K8hyQ9yo6cM/XpUhfBQ4zQRZG4DIgxpsdjgpeEujD0C6td7Awfllye2Z2QLZlsGPxiRTwQoGL2e++19wLZvc8feihknvI1bz1Bmt4VOHIid2pwEY0vGdPK1G9vsalreBqelYr3xlQiZd6ZGjp07L2JzzpzmrumlEflR86VpS5zzNWvtT4DLytlggkGMmqkON4XroLukuEN2fOIrFEupoBL8LR7JImnCX02U2lfJQlmOnbtMbJaqbYSjALCGx2Ug0BWWGCgk+xb4kCHZvVBZKyAJwkcFQ4v1eWFhLEHlLHTS+tV+P42cxae/ 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)(5005006)(8121501046)(3231355)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050); SRVR:OSAPR01MB1858; BCL:0; PCL:0; RULEID:; SRVR:OSAPR01MB1858; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(396003)(39860400002)(366004)(376002)(346002)(199004)(189003)(25786009)(4326008)(50466002)(58126008)(476003)(2616005)(956004)(446003)(11346002)(7696005)(486006)(14444005)(186003)(16586007)(16526019)(316002)(53416004)(86362001)(69596002)(8676002)(6116002)(3846002)(478600001)(23726003)(97736004)(105586002)(36756003)(106356001)(66066001)(47776003)(6916009)(305945005)(81156014)(81166006)(386003)(26005)(52116002)(76176011)(7736002)(2906002)(5660300001)(68736007)(6486002)(53936002)(8936002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:OSAPR01MB1858; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; OSAPR01MB1858; 23:lJbm9E44W1Jpat5naYmhbzQYItviXkq3giri08e1C?= aea2p9QPWYpRR90VPVkCNHbu8CIMBQ7VjfSyceBsSq+sK1Y589Omv5B1obm+fFQQ0twIzyqm8I+GRUc2yh8bYOzoYMaMxWvuZ+O7A92HMtC/1U1oAGaR+fnuBpj1ACHiC4NYNiEkJFAgItwzR6lnLFLUYNQPoca5ZPirOvTzEJ40pPOGcTZhi45rq6qC7t5YAEEksXkG08Ectxf2P4D4aZ0jfy7B01QLu5kCJ9jKbIx972bFCcUll4NDrnzYV6/m+fuMBFLo6ojUTIzgALtYhUbQlPf0C/ThJcj4DgsDuD8PLHBznLEtirKVHsGpYG5jHlLWBA4glWjeKDHmpngwHjJIEVHtfBVl6qpZKZIRwgKuXOL4pfXKEp4u4c80CJTQ1nXXHkKeRXCYfXO4z86Yikycr+Ce4k0O/Kc3QW5TYlALK1+yEns7j0HNa6TWnLk1zgyGsE9qnvMufQZAqelMCZP/IsMnxvIUlh+ceRC9GH/lJrHndmrtnOCszNNJ9yywNK+IPeKSIsa+aXZ7ID/Eol+3JBlBes+++bAHhetC+g3Hx8vJbewUVSSlQKzjitpO/0x6AFhNI7OxsHMCpJo53sRDSYQ+J6Vs/0SJ0epoW+vxS2WYPeC/11hXcL1VVUu5ZIkfDOT9hH3A9tU7WJ1DdSGn37TY0brgaHm8qVIdA5It2/sgfKtA4SACusbqARJlLVLPC0m437r388A9jyv9AqkUv7qzxRY9uB449iElulcflSS6Y3Qm+vfy2P8d5WnqZwX0oU8j6T10WS+V6scOKSrIoy9MExFG9XCfhg9MGDU6j1Q2yMzZDfumhTrdjaEpUocyRSR2mij01Tfn34mbgMvIailrzABgshFoM9heFcReqtpGCePVbs6/kdyA1cQElhyi1d2kzMjIWbOcswi+NGipSecJoXh4pATpNIUOdUPTTQwYD8Q557uQHLRd/gUW3x85mtO73WVBeKc/XZIRJVHbtEVB8yk1jYRjCu4/T+e2jrPg+bMiYmQmXTw/v8bvSWUN1HDer8Ti/wTTmB6d3J/kI100yvuLUMFCgzNBu6O0vIee4/EcdIljAm797pQmJoDOfoLCQ0/MRuD0LwYP2CMvq3a+TBYkTwsYJeNIbxNVervuFmyb+/7Md8PAxPofkfHE8mjHJWzZjXi2TjqNRRC X-Microsoft-Antispam-Message-Info: MyNYxxkyLQ7JlbU4E/M3nhS/PT194j3twnrScngMr03r4I0fZRALN/wtjt/p5qAk5Y2NKEap1rJmLR0pNjPeSYDvH8Snvnj8RLvO98e9Rlrl2rtpD6nSAgdw74iOJYxa5aoEdzivg7W8vLu0QnXnkVDZ+0Yep39DvTFaATIxb042HUpmKPhHMILz9u5W4cbx0XXRJowCTY+TDhuPMSsA9k2lcNj5vV3qWk7UtkU0sM1ldBheCnDMIvYpJECOpnHrUocs4/o0kkvOTGy/5Nf/PjnO9DyYAexgkrSD9XiU5w6LiMXUUBCh/mtCsVhAxD3A6Gv56y6DY72W1kxTe40/kEWVK48D0xjjrehWzR6mVGE= X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 6:iKPjmJQndw190RKb/rfbTZm11WcI7neMqgTRRzrl9ZCQb2FsfMLP3h5TvfSNzZuCWHdPTEzfjXN9Zzgh699ZGxl7imGsn0jCyaTmrDMpIfkzSQkVJ94jugrHniM2F0E764/G80SoY8oyQ0F0IirYc4PQoLFRjtSiaH2sQ/Q1FhbG3B1gK1QGO832Mw7MsxIj0h0K+TzkgCQnVItPuIKXET+FfiX6hnTX6G69b4rd6kbqThDSkL0MWFO8XEvCh4dMoVPiSFY4mQPKif9QHC///qBqF7WW80R1QL8GI7wwzg1TfHYqO02n4XOvPUFd4KJ/gv5RPhxp3HaJWtrDeGAPlspa1sl1hvFvh/JxraoAk5vOyrQI2M2X8I/BOsKsYO4a88J9/04lNbxs3jfeQgiTCALEd5ssxzQCc6mF+d6P7XlEtcLEl8xPItb9F2WjvpBRClS3qKpAnG/ravk6ejoCFA==; 5:b2rLd8nTeMkeMmva8Sctl0lGzUHutdAA5Hx5GQu19Tj4ldjZslSGM3inGA92SH4COlSBxBMdKYXDv6TJqHBHSTZ2QC04gwTDr1l+qXKOj7HmL4G4mDKzBfCUNHrCAyBYvFXT13vCugwHR5FrxgVoEVdIN+6vFGgsP9yk/+EtAL0=; 7:ElISzuMc3BjpYC70MV04yNwrQgp7Ypzq7iRvuA2Uj4K1Kb+MD/gijC8rEebwgGFiPk4CRK5JP6Xi3lWpjMf8y/g4Whlfi8blese7zHHNSqCiKoWdPfGo0flOpuNh/CyO+NKFQpK3GmPCO7X0P59yrmHJe4dw9ujauEoL6PKlfBlrDBeBF3bPCxnINmkNNfgiXDUwQrrBMld4JAJfOZ2WGYxvwOHvvGmcIxq0XmDX/0RhqyeCsA1Lh214D1eOVSl0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB1858; 20:cwCNsNICX+OOYrnwZhNjlhU6u9+JTBguKklQZCE/XjkdiXzDM+OtKkEWNTLDjKlLEfhPeq/hPYZ69BWzSAUBJBwW2HL8dehEqrwfwyJWt811tkGsWF5fDEYheZ62OD4A52cJUGzXkdUlvC3KoMqYDee1cSQydqSpwl2vK4xnXDA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 01:31:09.3087 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bdc45b83-c976-428d-4d8b-08d61d066958 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB1858 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 11/11] ASoC: add for_each_dpcm_be() 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_dpcm_be() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dpcm.h | 7 +++++++ sound/soc/fsl/fsl_asrc_dma.c | 2 +- sound/soc/sh/rcar/ctu.c | 2 +- sound/soc/sh/rcar/src.c | 2 +- sound/soc/soc-compress.c | 4 ++-- sound/soc/soc-pcm.c | 48 +++++++++++++++++++++----------------------- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index f130de6..4be3a2b 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -106,6 +106,13 @@ struct snd_soc_dpcm_runtime { #define for_each_dpcm_fe(be, stream, dpcm) \ list_for_each_entry(dpcm, &(be)->dpcm[stream].fe_clients, list_fe) +#define for_each_dpcm_be(fe, stream, dpcm) \ + list_for_each_entry(dpcm, &(fe)->dpcm[stream].be_clients, list_be) +#define for_each_dpcm_be_safe(fe, stream, dpcm, _dpcm) \ + list_for_each_entry_safe(dpcm, _dpcm, &(fe)->dpcm[stream].be_clients, list_be) +#define for_each_dpcm_be_rollback(fe, stream, dpcm) \ + list_for_each_entry_continue_reverse(dpcm, &(fe)->dpcm[stream].be_clients, list_be) + /* can this BE stop and free */ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, struct snd_soc_pcm_runtime *be, int stream); diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c index 1033ac6..01052a0 100644 --- a/sound/soc/fsl/fsl_asrc_dma.c +++ b/sound/soc/fsl/fsl_asrc_dma.c @@ -151,7 +151,7 @@ static int fsl_asrc_dma_hw_params(struct snd_pcm_substream *substream, int ret; /* Fetch the Back-End dma_data from DPCM */ - list_for_each_entry(dpcm, &rtd->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(rtd, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *substream_be; struct snd_soc_dai *dai = be->cpu_dai; diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index 6a55aa7..ad70237 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c @@ -258,7 +258,7 @@ static int rsnd_ctu_hw_params(struct rsnd_mod *mod, struct snd_pcm_hw_params *be_params; int stream = substream->stream; - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { be_params = &dpcm->hw_params; if (params_channels(fe_params) != params_channels(be_params)) ctu->channels = params_channels(be_params); diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index beccfba..cd38a43 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -158,7 +158,7 @@ static int rsnd_src_hw_params(struct rsnd_mod *mod, struct snd_soc_dpcm *dpcm; struct snd_pcm_hw_params *be_params; - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { be_params = &dpcm->hw_params; if (params_rate(fe_params) != params_rate(be_params)) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 409d082..699397a 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -157,7 +157,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) ret = dpcm_be_dai_startup(fe, stream); if (ret < 0) { /* clean up all links */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) + for_each_dpcm_be(fe, stream, dpcm) dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; dpcm_be_disconnect(fe, stream); @@ -321,7 +321,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) ret = dpcm_be_dai_shutdown(fe, stream); /* mark FE's links ready to prune */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) + for_each_dpcm_be(fe, stream, dpcm) dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e791663..03f36e5 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -174,7 +174,7 @@ int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir, { struct snd_soc_dpcm *dpcm; - list_for_each_entry(dpcm, &fe->dpcm[dir].be_clients, list_be) { + for_each_dpcm_be(fe, dir, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; @@ -1211,7 +1211,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe, struct snd_soc_dpcm *dpcm; /* only add new dpcms */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { if (dpcm->be == be && dpcm->fe == fe) return 0; } @@ -1272,7 +1272,7 @@ void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream) { struct snd_soc_dpcm *dpcm, *d; - list_for_each_entry_safe(dpcm, d, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be_safe(fe, stream, dpcm, d) { dev_dbg(fe->dev, "ASoC: BE %s disconnect check for %s\n", stream ? "capture" : "playback", dpcm->be->dai_link->name); @@ -1438,7 +1438,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream, int prune = 0; /* Destroy any old FE <--> BE connections */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { unsigned int i; /* is there a valid CPU DAI widget for this BE */ @@ -1544,7 +1544,7 @@ void dpcm_clear_pending_state(struct snd_soc_pcm_runtime *fe, int stream) { struct snd_soc_dpcm *dpcm; - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) + for_each_dpcm_be(fe, stream, dpcm) dpcm->be->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; } @@ -1555,7 +1555,7 @@ static void dpcm_be_dai_startup_unwind(struct snd_soc_pcm_runtime *fe, struct snd_soc_dpcm *dpcm; /* disable any enabled and non active backends */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = @@ -1584,7 +1584,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) int err, count = 0; /* only startup BE DAIs that are either sinks or sources to this FE DAI */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = @@ -1638,7 +1638,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) unwind: /* disable any enabled and non active backends */ - list_for_each_entry_continue_reverse(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be_rollback(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = snd_soc_dpcm_get_substream(be, stream); @@ -1695,7 +1695,7 @@ static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream, * if FE want to use it (= dpcm_merged_format) */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_soc_dai_driver *codec_dai_drv; struct snd_soc_pcm_stream *codec_stream; @@ -1736,7 +1736,7 @@ static void dpcm_runtime_merge_chan(struct snd_pcm_substream *substream, * if FE want to use it (= dpcm_merged_chan) */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_soc_dai_driver *cpu_dai_drv = be->cpu_dai->driver; struct snd_soc_dai_driver *codec_dai_drv; @@ -1788,7 +1788,7 @@ static void dpcm_runtime_merge_rate(struct snd_pcm_substream *substream, * if FE want to use it (= dpcm_merged_chan) */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_soc_dai_driver *cpu_dai_drv = be->cpu_dai->driver; struct snd_soc_dai_driver *codec_dai_drv; @@ -1891,7 +1891,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream, } /* apply symmetry for BE */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = snd_soc_dpcm_get_substream(be, stream); @@ -1976,7 +1976,7 @@ int dpcm_be_dai_shutdown(struct snd_soc_pcm_runtime *fe, int stream) struct snd_soc_dpcm *dpcm; /* only shutdown BEs that are either sinks or sources to this FE DAI */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = @@ -2040,7 +2040,7 @@ int dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream) /* only hw_params backends that are either sinks or sources * to this frontend DAI */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = @@ -2109,7 +2109,7 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) struct snd_soc_dpcm *dpcm; int ret; - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = @@ -2160,7 +2160,7 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) unwind: /* disable any enabled and non active backends */ - list_for_each_entry_continue_reverse(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be_rollback(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = snd_soc_dpcm_get_substream(be, stream); @@ -2240,7 +2240,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, struct snd_soc_dpcm *dpcm; int ret = 0; - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = @@ -2426,7 +2426,7 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream) struct snd_soc_dpcm *dpcm; int ret = 0; - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; struct snd_pcm_substream *be_substream = @@ -2636,7 +2636,7 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) dpcm_be_dai_shutdown(fe, stream); disconnect: /* disconnect any non started BEs */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; @@ -2781,11 +2781,9 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card) int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute) { struct snd_soc_dpcm *dpcm; - struct list_head *clients = - &fe->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients; struct snd_soc_dai *dai; - list_for_each_entry(dpcm, clients, list_be) { + for_each_dpcm_be(fe, SNDRV_PCM_STREAM_PLAYBACK, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; int i; @@ -2834,7 +2832,7 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) ret = dpcm_fe_dai_startup(fe_substream); if (ret < 0) { /* clean up all links */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) + for_each_dpcm_be(fe, stream, dpcm) dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; dpcm_be_disconnect(fe, stream); @@ -2857,7 +2855,7 @@ static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream) ret = dpcm_fe_dai_shutdown(fe_substream); /* mark FE's links ready to prune */ - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) + for_each_dpcm_be(fe, stream, dpcm) dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; dpcm_be_disconnect(fe, stream); @@ -3326,7 +3324,7 @@ static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe, goto out; } - list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { + for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; params = &dpcm->hw_params;