From patchwork Tue Sep 11 06:54:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10595215 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 02630112B for ; Tue, 11 Sep 2018 07:50:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7F9928FD7 for ; Tue, 11 Sep 2018 07:50:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC1BC29074; Tue, 11 Sep 2018 07:50:35 +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 4F68428FD7 for ; Tue, 11 Sep 2018 07:50:23 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 06D2D26787B; Tue, 11 Sep 2018 08:54:34 +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 1BEE4267887; Tue, 11 Sep 2018 08:54:32 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 1E7302673F4 for ; Tue, 11 Sep 2018 08:54:28 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 11 Sep 2018 15:54:27 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 5AF248183A; Tue, 11 Sep 2018 15:54:27 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,359,1531753200"; d="scan'208";a="292162666" Received: from mail-ty1jpn01lp0181.outbound.protection.outlook.com (HELO JPN01-TY1-obe.outbound.protection.outlook.com) ([23.103.139.181]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 11 Sep 2018 15:54:26 +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=cjE7xpyzRHbDbJHXNscpTRWsQr1C8oS7Ljxu6giwQxQ=; b=hrX2Nvt1tnVxNYZMTEa9HPdPn0OVW2g1l40q6WX08buaYUh25RVdBgs+OWgNj+bjrB6YfEMLnz8KphPGpSo9SsyiW7CDfpi1g3RcXo0VhR5wWc/P0jVIPd5AzaG8fNhfnU/mCek/Hi5QKq0/W/C2CIlnSegkff/4ESfDaT6HPjs= 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 TY1PR01MB1867.jpnprd01.prod.outlook.com (2603:1096:403:2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.16; Tue, 11 Sep 2018 06:54:26 +0000 Message-ID: <87y3c84jka.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 11 Sep 2018 06:54:26 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0137.jpnprd01.prod.outlook.com (2603:1096:404:2d::29) To TY1PR01MB1867.jpnprd01.prod.outlook.com (2603:1096:403:2::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7802f3c8-980a-4ef9-cc6b-08d617b369ce 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:TY1PR01MB1867; X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 3:JvLRZkhJwlJWGEgIFgebVRxxKk95pSMLQ1+Jhjx90cfyS6M8tDKNTnWrbeEACEb7Y5BpIrabSWSzujVoL0pjzqQReS1kqAKkG7O/j/sf3lXx/0IP0KjFftSKXS4CBkWVDxEHt/+vQ5zc0pUScbUYZE6Mm61X2cl22Cem/a+8O8A4Nc1eOmCK9pskrsMmn9lNIlydD0WYWj/6YWzqVFHRAsQ4fotxcisNdmF2R5YStNCVzkFScNkY2LdIuZH7qqsv; 25:lP3cwk9JltN6YNtw/ryDIsBDoxWYrRibvi82Z7h5UHK8TrC63r5JlS2ilWBjvcHHkUWo5rmvyks6wqmQAPlR+zW4jdvrgik0aqDFlTKo29Q+rGmtGEuS6of/bsKdnHn7INH8ClEJmpGAkPnuffF6mpkMw6sRBfUD4VlLIokTHMtUZJF/dUb+NUazBBNrUvQcnk39pEOcVsnDB2rY/DlHjNlAraytXE/JgYUZWAU5K+Iv8ChYL2PWgKtqD8gIRMsb/7Q6QgqSrXoBIKzU5s0uZAakU+oQrIKH5WSgawqi6uRwG34WcKCrX7LI9SRgJnjxyKWumzLRS6acpPEpPFxxwg==; 31:mETpjZKyFdG4HvF6RI0RXRFZi+YpIFXDLsz/nvNuzeAxS5u4Zk6f1bT4XbFzYUBPUg9xAYG6IIv3iuz4ZaXCvG3Xy4jPx0ncwZsUadDHRR7mkzPT04Ufy44y3dU2ljtdvbEPn26Qx7tTKUAymZqGH1uGq8kSADD+00az4apDvfjty+cd9+rh90os2EI8m5He5cUoGPkesWmbXc3q6POUz+gyaknmzTVeU4QWrPKJJxg= X-MS-TrafficTypeDiagnostic: TY1PR01MB1867: X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 20:uAeRL+xMx6EZy9D7oD+U+8FfDc9WYUnXv7a7lPbG/GHbnJvHX2+JCcle0KgQJExQcE1h4ivTXX+43NA5ryp4yuoozyZ19tR+mhkNQIujVRgQSn/saBKNOGN3u8+rtsfi4QTxf61kXHb+UNM5faZrNU5Hi/r49Hj/qMksJr2Qlbf/qqU1JyBa9WXJ9OL++eduFJ7e4c+ME5UBTOC8dYMYGeTpXtQfIqCawSwaQYaEH9W+THEeL/A+/kiTGYew3u/dII/2gR49Wm7X8Ay7nZ9mDEY1sDitpJcdRJg4WLOY573KGezY6+CRJ6d5Yc4OnnkKqgzqy2NC/IxGR/dWeih2Ev0xTJB38wPerpbXQyR0V+LvcUY+9gWebjuWQrbi2/0LlmUEmn4MC+bamg0I4CUsjHZ/c6aLb6BDW9v64eY/DqNcH/3JMpc31yMMDD4L2JPZrzL+XknDFVbH6vr3vvUgZE5ivG/CdHwzyHUT6nOZtKpLmdljxPCY/iXamUenRZ0M; 4:dT7bAQuojYQ2oHSZzuoSaaIhfkgTTwNTFZ8QT8WmWPzCO/1wknLQ/lkfWdM4Mr3fWWaS91yjEdy7Eja+wUbWpRG7sBRRJShX/gMy3Q++SEz4/S3h0rOImj0KqDgF8pLVGU2iMSU/55s6mqabPNL/MTQ1vXC1zViTLf9oAUz5tZY43CY1A0OXULlXfFWpAo9hj3v4BuTCr053nQcVIU4JX2mw6QQrqDB2ZMvwh5Fd3zt9pYraa7FWiz+UbgkkF/690Oivvn8JqgH6KoK9HHx1Kg== 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)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050); SRVR:TY1PR01MB1867; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1867; X-Forefront-PRVS: 0792DBEAD0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(136003)(366004)(39860400002)(376002)(396003)(189003)(199004)(50466002)(58126008)(36756003)(16586007)(52116002)(7696005)(5660300001)(8676002)(478600001)(26005)(81166006)(81156014)(7736002)(47776003)(1857600001)(25786009)(6486002)(486006)(66066001)(69596002)(4326008)(97736004)(316002)(386003)(14444005)(8936002)(2616005)(305945005)(2906002)(476003)(956004)(16526019)(186003)(3846002)(105586002)(23726003)(68736007)(86362001)(6916009)(106356001)(53936002)(53416004)(6116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1867; 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; TY1PR01MB1867; 23:jD+H2ng1S9J00w9GclFZQwJoJ/u+VgxiSbgAMyOS6?= KJNEFpOVlG/f5fpbY/kxyrqmIvp2UFrPJcpCQW/PsvjH84Y4wyzCaXnIlKe0u8W2VI/hdBfsHrGl56gB26Q2Uhuqvh9viYHel68jGAgrawf8Uh2/VPgcmQ3UAfQrqpwquGKZlDLHImqgy0NsoXEC4X2sv07QdANAGbzuTmz57JWYrU/LEuvniQ1EPTHQghcVfHu3cUY7BVkiPCsnze/C+w34xXhkqVorHCwaHJpbrDx2A6gLK5tWqFLR4bxluNoj0BvAi2o6d6g2V6TDFPjTCu7JAspCpmnm/bbHrLojbfUl6UO5WHfnTmDl9PMlkV31eA8neHx61B00MAqCJNmrD/JDlfpjnQAWC7o4JxTWUl0extoYjCd0+x89STxzZbiNGP9iCd5HOAN3qEz3/KPkO0vP3cjGIFwjcILEWb+QBP8cmiRTvM73gweZ5T3vWskFyNCB3DboWRQpL6AbCkxqo1YiMn0VWLMDFzY+vz47h0GOFMw8Um9dbI6uH38/jlLYPqidtlikHGtEW5AEAhCdyCKzGLGetOU71wlt2ZOYL5avHFUAkPfSxq/3nXwO2n6pss7oosvq3KPStdBMNPiUQuVjScFWiclC1dvr2mWNI8Cv7qk6C7ubA6qJFrXsev0PgjNzkzzz8wIyEctsa7lckIcuK4suS7vKtXcrA5ZePmA6iDcatLCgFSdpr6D0Wi6b+RCnsWjH6556hsxnL0NOylA5Vw/Q7iD565HSTyiOOgL/x+elC+qQA/ZmcMGe6bYtmD02Anoye4knq080PnB5seYP4F6njMknmAaeoHyQq7fo7Hsvk9ovD8rfOCyfvD8+MEu4rIjgbC+hSrrS7BIcF31Ie+AkGcr51lmehJdp65fGyH51LxLuTeyAWPEWslCIecjcFP0SgkksD84y/bFy3HZMyaYrutL9sEEzXVqRewFeH5SE2jVyjrAN4BNfr2gYMo+UFVSgSmZxqECdgFkYgn/84/FZgT0ySG95BZXFw1Tc+VU6eKejFpn2UPMpIYSsm/kAdgFmH510c0wWdZSwYNAFwdY89+0amDZzng/WCWv9zxrnfLmwfdQCDZ+l54/BjFj9pJ02V+ycyrgm7cfn2lmZ5G2PXtXtCL4XYjihDSCdA== X-Microsoft-Antispam-Message-Info: 13TourkTMLG1jhdpHz79LcXGv2Vr9qVA4ZLk0lVrR60BdbRzjF7wIX3d9b2U9yFl7IcJOh4EKqTgfNvFX/5yfo9JFpd5fVdjb1vtW/QK6JQ9ZGiGe0weDPcX83uU/ruSkMdRSEo2l/JPE6XFEn5cLKvjK/eKwp8UHh+P+cIPMgK7j/1oOo09Ajuk8EhgWv9Ug/S2p7uHXyw6oV1/fnvKnGy1Em8EsJxlBqgzgI8poSJZ8y6Y592YxGeI/X6OebfbwVqlfWk9UtgtzJ1soxkIF6/mgj750Zmpst/Rmg6vM+SJ9PZz0r/UeFno7Dh5ifvHr4HJkqi8TOF0j5vk6qzK7LV3+aTAZwEQ7eY+jV/M4Sg= X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 6:gBeQtsbIKs5TK9GDkUvuKYETrqNC2E+BZi6iUvsBnYugTdQrfj0lAySDt2YBo4GKMlEILqrTC3FOm0tV0zlCaa6uSu7kbRJp1RYeF4JVbV98mu59EODbH1i7OUIk9VXt3OuUtIYQmXJ1l7mBsl4d+ebh9C4RX3Z30A44afVuew6bVkqijYVj4RM+CJCuoUm08PyX88yi+mqga6TV8Cmh53F+Eongytj/VAZ8krMIDqQUEVGpQWXGhmb1+pfZ+Wm67GrpewVBKn3FVvnc3/ikO0chWPHfdmKn6C+ernZBkrfgtCH3i5N8sSGOFgCAbwao/eLuCsDJ8XUIAoggp5aSsxXzlCynAD7lY9tqmkKQvRq3iH5eeB1KKn6DfcBLMd4CNguSDrdzH3NCA+WURXcHJLgc6lYDMqOXNe0H7RZqxxtg2+D0/3jdEO8DbqZrkv/lAmEO3/XQKvYVw2q95FNh6A==; 5:1n9D0t8vR3kgTwAcWchV7JvLSboTtCctWaWL/R4viOUA/4FTdaFi1BsZgF52iJxX7HhDQjrdyXxP1ScypjU8ABCqtplwlNp7kehjar6wDI9GQC6otOt78VZW6fxjIUCetztqkEnsngbubGrB83VAVnwq+dMQCnJicBrCLV8ITyw=; 7:FBHP4AQ5awVgWdVwiszmrYOjgIse4hSKNsjrkWXQ+isuKHNg9sFC2RU5VE5hTozriBibwk5cTj5Y+lxBQmybyXRNCB4wtRfheWb00EAl1VLbcYibGiq9P89lFhRVcJByHow99FyrgQcNkdLNCEpX724P6bt+US7Bf6hktleEXAVTpmUurKTyeL4l0+2QcAFF4pBODYyd2EFL5glTenH0D/b/tge5gHP65wQDhCWfAZIfabcYoE2uLX+QCICkLE5j SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 20:bq6/3O8k4uVwvXNVnuC4WIWErw5vqdQXTQt5vjX4dHmN/+/gcnDRwT0ZnmkeKcv04LnRfPRmB7Q/9AoJZP9OYbXdqzqkFc+6QA5d0JZMAQSQgYPtUs7hnh3+0orBTJHsEXGuENxtAyzpRt/p56zhWeK50ehQYw69NCmtCswhzNA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 06:54:26.0778 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7802f3c8-980a-4ef9-cc6b-08d617b369ce X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1867 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH] ASoC: soc-core: avoid nested code on soc_remove_dai() 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 Nested code is not readable. This patch avoid it on soc_remove_dai(). Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c8c73c6..41fef33 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -938,17 +938,18 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order) { int err; - if (dai && dai->probed && - dai->driver->remove_order == order) { - if (dai->driver->remove) { - err = dai->driver->remove(dai); - if (err < 0) - dev_err(dai->dev, - "ASoC: failed to remove %s: %d\n", - dai->name, err); - } - dai->probed = 0; + if (!dai || !dai->probed || + dai->driver->remove_order != order) + return; + + if (dai->driver->remove) { + err = dai->driver->remove(dai); + if (err < 0) + dev_err(dai->dev, + "ASoC: failed to remove %s: %d\n", + dai->name, err); } + dai->probed = 0; } static void soc_remove_link_dais(struct snd_soc_card *card,