From patchwork Mon Aug 7 02:06:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9884261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E41D260364 for ; Mon, 7 Aug 2017 02:07:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEE5A28540 for ; Mon, 7 Aug 2017 02:07:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2DBF285F7; Mon, 7 Aug 2017 02:07:06 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no 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 CE1D428540 for ; Mon, 7 Aug 2017 02:07:05 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A9F7E266EC4; Mon, 7 Aug 2017 04:06:51 +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 B82CA266EE4; Mon, 7 Aug 2017 04:06:50 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 7C5DB266EC4 for ; Mon, 7 Aug 2017 04:06:44 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 07 Aug 2017 11:06:43 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id EFF0164954; Mon, 7 Aug 2017 11:06:42 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.41,335,1498489200"; d="scan'208";a="252636863" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 07 Aug 2017 11:06:42 +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; bh=96aNKogOEvBWU5FpjqlvqiYH7xWSkeHJr/wFjPXS1KQ=; b=Hyo2crD38HpRYgFY5G46paUT6b12g0YLUtWgfafQHRy86RrxBLQ3QjeUo1TZVHgCIb2bvD/x21uAq4deLciOazRs4GCzDyINggDiu/7vwFHzs4i3d0JMGrUZxoX4k9jLjby74h+0qPYOXVcs2KW0aiJsmTM+h02EzalTOdqXVB0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.138) by KL1PR0601MB1878.apcprd06.prod.outlook.com (2603:1096:802:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1320.16; Mon, 7 Aug 2017 02:06:40 +0000 Message-ID: <877eygjfx2.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87a83cjfyh.wl%kuninori.morimoto.gx@renesas.com> References: <87a83cjfyh.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 7 Aug 2017 02:06:40 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: HK2PR04CA0085.apcprd04.prod.outlook.com (2603:1096:202:15::29) To KL1PR0601MB1878.apcprd06.prod.outlook.com (2603:1096:802:7::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a3ae27e-527c-4fb9-a784-08d4dd38f1d7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(48565401081)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:KL1PR0601MB1878; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 3:/0F3tLegz23jfypUiWibQ4ovhYTc3PRBz93jWFpjKicqLlnhlWIoUt0asm65UxRpGqu1U7Z0rZclsQSVwCgH/3SoKDwZSvftVavRcNdU/seUpg50xTm9uQzvtI381QXKlMWewIrODCEZm8BJvPU/3FbJIQTqCx0isD8pY2BqHtbKepR+DOdyouoLfoLOnk+eFry4vt/O2eQZXtqEoqiTlv8F9kFi/RUzk89RgOdODIMDofeXJGoHpcTpWiDikBVc; 25:n+UbDukKfO13OHRkKnTWrdUeH2XHCbFFcIJd6nsPOWL8nU0nYHdcBVebfvdL6ixaTl6xH9J8afWIgtnTpQYVeXctGmJdwO08jZ3J8NMuhyBU3Ck/UwYuZHM0NFMbErAOCqOpo/ZrmNxR7Dih+FN8HchCE+ThN/uOqof/br/o0m8Txqrb9M23zc8Jxo0Hor5ovizlsWtKgRwwm5Kq2e9I+3YbVLCjKgKne6+R5kdWVef9fiAiWP/uARUenT0MqdGDWCoG+J+TkKk20Daask5On9BLNhnuQTpH+70oYWs22f9LyISTk792iCDoUfk9yF9zd4VJo++6V6FfshsDHSB8LA==; 31:sXg6laFyPPTMr20TMYcgDbnAj42itrEvA1kmdeV874uea4xLduEuCgSuWmkSRzFHytTyzPNwPCpRI9fE0ZQPi1XYPI2myqi8TBUX4Lrey6nysbTSI0NkeoSXmZjKSJGp5Fa6CqouPXLN7VCpsPnyF/tkBvx0GQzVyEZIz4kijUYx/PhP4gf8jfwMljgp1APuYdEjJmAraye76q+AElIuTokBleQw3djycKi+9ZCl2/E= X-MS-TrafficTypeDiagnostic: KL1PR0601MB1878: X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 20:KjVUanAzcXJYOY8ML6QvL/q5zO6nT9Qw6U8REx8nwC0hjogyXvP6bLGdMQ1EpYujCgOHIaqOkDpXKr0s+j03v4iEJuTdcLtb2Tt8F5KibZrICRM/N9SvK9kzUQo7Nt6gKiBB2s7d66pDUFdGkXXLiChS98xC/+KxkdAW0sywJvg3O6xDUB5XQV/6yp370gmzr4ttBhNKooW46JFAtaydQ3vztOQrkHg5sYWKt3Djl6Ce9O3I4HUJI2i1PAjAzT4lNOeZlimfxSAroOe7i7L2cuW6kJ8aqhyzESzL406hs1sddDe3l8q7/s3vrvWybpkXvrE/Ssu9v/pjVNcz+uzl0SJAgEGCY/g0100WsR+CvsP3e9lUoO6/JkyrH8Quo4GOQaUem9uV+4Yjx2YKQDB5zlemH5wBvgfYWfpD0Btm33VUg0ezIedWLMZgQ2kaZAj2dIy3inHdPvvBMioTFGKdA/i9Vv/7PzSRx4ZpuOTh3cUz8VLgIZ1eH89L/KTXO0Qt; 4:JGRg0/SVLtDTH2ijM6OZa07LbNHSUQwJaauGHwEZmav+j1F60kv/j3JJ0cAC3KlH11e3SdQv53QaaKhhr5mrrSH1tPJr1bAb6gUSFNqBDxCp2A6gPGGBwcla+M+0yThxgrn48aNPzPe46sqDsWbjTDnIjm8ttGPq++/K6y5AXkI/a8RrSHR+m46DVEd2C/d5ba7Fz6M9Bsj5xiMav4+vFwS8bwjluVWEK7/engVis4QukXjNeGEWEldsUtaFBmfB X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123558100)(20161123560025)(20161123564025)(20161123562025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:KL1PR0601MB1878; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:KL1PR0601MB1878; X-Forefront-PRVS: 0392679D18 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(7370300001)(6009001)(39850400002)(39400400002)(39450400003)(39840400002)(39410400002)(189002)(199003)(38730400002)(110136004)(6916009)(2950100002)(25786009)(4001350100001)(81166006)(81156014)(47776003)(33646002)(6486002)(50986999)(76176999)(83506001)(69596002)(54356999)(189998001)(53936002)(478600001)(3846002)(6116002)(101416001)(54906002)(23726003)(4326008)(97736004)(7350300001)(5660300001)(50466002)(305945005)(7736002)(86362001)(42186005)(53416004)(36756003)(8676002)(66066001)(105586002)(106356001)(68736007)(2906002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1878; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1878; 23:+nzYGAa/od+G+3lGd1awgG0LlWsMn7zFxusMzor?= =?us-ascii?Q?F5Ux4wikCn4QnSKcoI0fdRyuh9b86Gc8okGYo8706oem7iA07nYYM2r6xZ7Q?= =?us-ascii?Q?yoJEavGjWrpHUqEjBFwgeV7udjND2th0XkNBbwr+Ijwln5Hrwe3A38OuZYW5?= =?us-ascii?Q?CGWOFcVmi94kchUXAEIEpkhiH4yNoiHsaJI1X5uw4IOc4h8F/gtd/qy58aBl?= =?us-ascii?Q?3ClBY7FgBAt3B7uAOaaQKmP0uBtMbL42u8H38LoPRzYQjw40fMKiFXIUairN?= =?us-ascii?Q?wV0ZXbXRHVNDPZNJF2FCvDLROc3w8TxtzNnsqroKXyb7ohKXPRf7qFRLxu/W?= =?us-ascii?Q?aETTfd3A0YHV64fpJi7KUXSdc54Pd8ByRFLIayahpEi4T+jrdzch/oevHtFG?= =?us-ascii?Q?2tOZS+gO9ld6iGrPfKGJ8R9PXOTqSo4k4Oa/NfnDcDNkrbXJjqu7NUg6T9kR?= =?us-ascii?Q?aYfNTyYNB52KS18NJUCUskc2ZGrYcPbV15yn4blZX1KYvouABv1wD3NBioHw?= =?us-ascii?Q?dULn4bnJ1QoIKxFjSGCn8JceW8OBrGXSXH3RK6pRedu3QwqbxiH721TmQNbj?= =?us-ascii?Q?LkqYxNp/2lmeMZNyqr3nDS7RJzOcufzm22n0EIzJCmh3aasaGN+N0Ophgj3F?= =?us-ascii?Q?I2F7Td+jKVn/uRNCGWUJZmtqJC1kzrUbTcv77PDsIT/5wLoYQnd/Bo11vYeU?= =?us-ascii?Q?O1+7eA8B7cnGa/+Hc9G6KHLmsl2RI8iqvKM/9i1mRJW/mxmQnUrU+6PuUCxy?= =?us-ascii?Q?MYVKe9FhDkTGJXZYI7HklZ3ZZr3EO2G+UG8zmbaAsqO3mGhrr3oXdLewD+ML?= =?us-ascii?Q?wZNi4xvwQ0uV8yLyd30dWatAHn5raIMKIH8Zub+YpmU69/Rf933FwjfRpEuO?= =?us-ascii?Q?714FZbirhtew0m39n7AqIXCnVlgXJok3ZmhwpAexEEJKFXAYpabnRqmvgT3s?= =?us-ascii?Q?IWYPwZphvrYpqfgn0VZV2bpeh5S1nERZmVWVvix2LmmXHN/7Pzs2sa54PXIS?= =?us-ascii?Q?sMKMrSvBLmhu05AmaEZhCvrdIF7aHobewW1wtCv3/3jUHWYb3DVYEzNr35Zn?= =?us-ascii?Q?aZ/QpT2LKErQyKwibA1E4wtZlwulMXt/s6L+mmAHowkurAN9jwkWU7jQW1js?= =?us-ascii?Q?5pz37THT/YVWE9TIoXmlXLzYHPIZ5qku+NTUrnkXCZom8IF4bmAN6qC9yC/p?= =?us-ascii?Q?UrP5oJKf+JJSaNFJ5BZJPpdsWQukJJJBEgc6kTmQohBcsifPf0xRunhu/04p?= =?us-ascii?Q?6whUCkkt2xuTcvk/LNArqGBfytXpF0TpdFxJ39GkUqINP0Qw49Pjnl1lh1f3?= =?us-ascii?Q?cxQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 6:Q2xAACvCsWHAQ2N7obsuRQAL0ZfZOtlCdyBP8/j/q1vtnlS+ZzfOCQqq7kooEnANNohtjcf8Owf8pmvemSyBKOkw0A7t9aWaanknobMYlS6khm67PvOYhI0imucZ8wP1wU5BCT+b9Y47KTGa79LjuCUU/sNiX7Fi88aI0K2xCyYmxKMux/HHrlYuE1l1meYiK1yDVPk7ik4ESwL9h/EZtiHhAUec2vEdoLQEcUKDw1EUDSESxIOu96F4BzBRw3AEsR8Zx+vPOxabyBnchr9IcZ7Q0Ag+Ln3u5oX+2DHFwk71KbOs5OSIEG4UVz4AjjICtPkJSe0gB/sETWJEzE6Sdg==; 5:hLO9DsuNlC/FstXIVzHpZwp2AU2NCdBJEaxhZMdT7ukZCzglUenal6hi8z60+BT9ewZGVA3BYItFvIsCuWZc4opvQMHhF9jS3C3+uMHm6ev39PEQNW2rhfu3e/77w4YEhVifNWNj90lN8bROh4k5RA==; 24:aNQ1UhX1T23toLIdX2pnqm98j3+wtuBRGbEU9mZgg5wZtfwqhlX7L78NYbflFnnCUtMD0AnQY/RBUlD6URCLV2k9zWnTlNXH/6c9TuyD/EQ=; 7:A45U2CG2d9+vdNfMHIdtePWNdMqqrB9Q08JUHCFXs/EB4v/Nx7Ogxs1wzsCw1z/pRj2Ua5MgxpEbqfCoz3sFxajMFub0yvKncTUptClbmNhUyGjmgDwjXS/qAhnagCOAbVY2Q/1Lnps/U615YZIhvwliAKFJjc1NARaz66OhRJpGCV/sp6v9KiaTHYBbVPW6r/PxAlsEZhzbmZXqCncPWLPZA7rk6TQ8Ly/i0GI8hnU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 20:TTUF4oeF46VLCPf8crp/E9c17HaA0FjFJJokP4WfOPJKkTV1NkD7O06hpEp5oqqMs2a3lvw+RaiPBgy8rWjQwymCc/qW223Wo3QbQfeLoz9P3G5Ab2Pv0cbonA/Obq4lcJuJQNI43QMGTglhtbhFH72xFzzNIuU/I1Hzeyq7NC0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2017 02:06:40.5650 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1878 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 2/3] ASoC: soc-core: remove duplicate mutex_unlock from snd_soc_unregister_component() 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 Current snd_soc_unregister_component() is using multiple mutex_unlock() for found/non-found cases. But it is unreadable and confusable code. This patch tidyup current code to be readable. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ac68be0..db67103 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3326,21 +3326,25 @@ int snd_soc_register_component(struct device *dev, void snd_soc_unregister_component(struct device *dev) { struct snd_soc_component *component; + int found = 0; mutex_lock(&client_mutex); list_for_each_entry(component, &component_list, list) { - if (dev == component->dev && component->registered_as_component) - goto found; + if (dev != component->dev || + !component->registered_as_component) + continue; + + snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL); + snd_soc_component_del_unlocked(component); + found = 1; + break; } mutex_unlock(&client_mutex); - return; -found: - snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL); - snd_soc_component_del_unlocked(component); - mutex_unlock(&client_mutex); - snd_soc_component_cleanup(component); - kfree(component); + if (found) { + snd_soc_component_cleanup(component); + kfree(component); + } } EXPORT_SYMBOL_GPL(snd_soc_unregister_component);