From patchwork Wed Aug 9 02:16:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9889445 X-Patchwork-Delegate: geert@linux-m68k.org 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 3155360352 for ; Wed, 9 Aug 2017 02:16:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DC2B28795 for ; Wed, 9 Aug 2017 02:16:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F338B28800; Wed, 9 Aug 2017 02:16:26 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F34E28795 for ; Wed, 9 Aug 2017 02:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751971AbdHICQ0 (ORCPT ); Tue, 8 Aug 2017 22:16:26 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:5540 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751919AbdHICQZ (ORCPT ); Tue, 8 Aug 2017 22:16:25 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 09 Aug 2017 11:16:23 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 3D1FF6066B; Wed, 9 Aug 2017 11:16:23 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.41,346,1498489200"; d="scan'208";a="252927548" Received: from mail-pu1apc01lp0021.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.21]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 09 Aug 2017 11:16:22 +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=TODCXSopCWFgXFMycOGmviPHKmutJONEmTiH8Bsw1p4=; b=J3Fd6q7l+TdJXteQnKmm66RHW7zbBRKBZtNeldsQ1cS7oIx1pIiSP7c4sAH9EqBEbON5yG9PLc+nIwNnT+sc79l6LiwyZWDOqyptIPvLNkv2ImMZCd3tuXAGA2nKGch2NkHckQI5VrjOotbdDPJ9XZo9LN/rm92MIZ0Lnd8t+ls= Received: from morimoto-PC.renesas.com (211.11.155.138) by HK2PR0601MB1873.apcprd06.prod.outlook.com (2603:1096:202:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1320.16; Wed, 9 Aug 2017 02:16:20 +0000 Message-ID: <87valxebkk.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH] ASoC: rsnd: avoid duplicate free_irq() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown Cc: Linux-ALSA , Simon , linux-renesas-soc@vger.kernel.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 9 Aug 2017 02:16:20 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: SG2PR06CA0101.apcprd06.prod.outlook.com (2603:1096:3:14::27) To HK2PR0601MB1873.apcprd06.prod.outlook.com (2603:1096:202:a::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b875ecf9-14f5-49fb-50e4-08d4decca0b5 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:HK2PR0601MB1873; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 3:9ty+Coipn5yHA9BzSGzzemnpFMIWiaO9Kho/PJIjDyVksxI2slh9a04+bYwl0QCiONKMYILbHe9FlSRxGXeegAUJhU5BzxcKjB72q42d5Z2Pa6CpZRGN5lq1JmlGR2xOsW8j0VSY63bh7ulSDIdOS6fRLks6RH/C58gB5BPVrvRNCyaDRGSOuMIpi/Cwm8SlqhGdey1yz0+fC8Y3clqljn/3cBgosgtw2O5AzcKrf5NUo9YhCV0HnGFg1mIRkY57; 25:h4N/KHAk7P9Ff1ihpfOQs+HIm2QVoOaT7y6ZhKLs7h/rjnt1n2zMSdtw5zzeHBDmYESTUFvL/rHvbR36u89jas9jFB2FV90ou2OAHlmurcymuANF+p9+30mY95udkVsLgwpApklzmuV9+PqaieZi2RjSRlfca/dVJA8e/roF3EnJLP2do7iizkqPxHhUR32hKIZeNpubeMoJquj+3dGizBJQ8Wf6MEXpaPVZwG83SAvfhnZIicKMboSsAVx3j7tpU63q47ncyFpSm0dZA7soQG8OEBC1v8SzERa58Ajeq2nqcIzP3SKeobsBqclldvH1t4sc+9KzL8Gn8gL/DackYw==; 31:NT6xWFH2ScANfoDK4YDMFGikm6p1ZOAUmePngXzOwaIFPK4Q8VBUHQ0Hhk2HY0zssJgdIKpm5Ul0BhyZvVlK7QY2XdVpUYb48Luk2g2XxpbZHVIpZwsYLvl/9aw+pQObTfgB+e3bMEjVa9uJqlyLICcSSPoIwr+5PVNImvlCtOUdlR5+hwAhyUbxo//mIStGeCbpQ0ajWCk1q8x7bjGu1kCwIUiMpCqrbvDWjtFAxLs= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1873: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 20:wFT3XE18Z4c0omy22KxhP09010B061dqMyViZUQ9iej/bTzttxSsjzr41eSaIgp9IEQM5OoAjTx7O1WCZ3zTyMD2pOMpkns7DFf4eCVEQObxY3TuXpkpxjsj/xh3hz+p+MrA0U/ipuADt0GZtMY0HLlz/1Wj/Ddd9/IWiujcEdB1jvxLNyvAwttPPT+LUecvndVwaCqPFBplE+NPxHUlWBdio2bS3laIbrEIWyR2a1xnC6DTE0zTfQuymGFNUG9FvPPvlX38gfsbeceSnmYLPUO6czqZln3D2PuuWWMebqQe8zIQ5NUkR0mAha+SCGDu0hv2lbAGu6KoHvgZISFqFFXv7D2r64xbQlZM6/mc/KymjYhmiToHdmTMv780Z7YJfMJ1j4HdLik7vfQDProGlu2Hnfq6xSQfQmXYujjaFB0VHhK2b++8fzwAk5zRQ6cDwjTjC6TAhBkaVNPZCYiTUASlem2DQ6LrCaIKPQupD9ohVzrk+cC5s+WAe6zMxsSf; 4:aJ4ZylOGaVBOv5T436DfRnY+35yIx/JcpZxf175GT80JmHl1GjvidQB7GkacfjeluY5OhiicBmJI3BVDPnbYdPNwdKXICPnUar5uDFsYPCAtZeErHZuaHlXtOxd3OJ/WKnE1WBo6eFsMuMc9pbxhaPOanJJl7pVG/wKuDqLWR88I6htJnmHHTFK3pBLnq3hTZIv1VSbiqTGpx6K5gyfbpNA0gDwrd3p/b78x12vJSi4fRLn3UUdkCXwfiL9sWEUg 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)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HK2PR0601MB1873; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HK2PR0601MB1873; X-Forefront-PRVS: 0394259C80 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(7370300001)(4630300001)(6009001)(39410400002)(39850400002)(39400400002)(39450400003)(39860400002)(39840400002)(189002)(199003)(81166006)(81156014)(7350300001)(6486002)(101416001)(50466002)(105586002)(106356001)(8676002)(54356999)(97736004)(5660300001)(4326008)(4001350100001)(83506001)(69596002)(50986999)(110136004)(54906002)(66066001)(305945005)(38730400002)(7736002)(33646002)(25786009)(23726003)(6116002)(68736007)(42186005)(53416004)(478600001)(189998001)(2906002)(86362001)(47776003)(6916009)(53936002)(36756003)(3846002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1873; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1873; 23:0NYgbv2Kq6OjReHNQa3+1Q35GBvyuL6CX22+ne+?= =?us-ascii?Q?41zpOEcdbY/NO8BmyVejRNiSfiYzeYe9fPbDYvTjC5i9ZWELkRBReEtHMhdA?= =?us-ascii?Q?dVhExqz0EBIDIEoo6dFjmctj49drWJQYk3ZzXMhzGu9K0GZAawH4pCquxOTx?= =?us-ascii?Q?c9hGJtKi7l95elXgzo6ZtO38yLB728bGL3JxuzKqaJU5rEkFMvYdLm5xzQ5y?= =?us-ascii?Q?eyOA74KhUPBs9HxGASDKIcbvImFPsIxep4JwfnA5qXEL9I1kceRTUKFS3goa?= =?us-ascii?Q?X2zDy9Q5qmsVf5lFIiqmadtrWo+PkuUIPaYWD0zpXoholgJGrVzfgSqrArI4?= =?us-ascii?Q?nPasZeoh0XSPikQnMeZIMexcroF+GMibU18VzW7xtD19plbhnLbj+EyM3oWE?= =?us-ascii?Q?cFjmzr3W8nFunu0lI+3e45Q3Qk3jR0IKbxh6kK1LciH2fMxVLVoDETe5AWg1?= =?us-ascii?Q?QyeXh4tEkj+Rf/6fO+LutseOBXSDQQxMyb6Sv12Og1u1SqyJzFvXOZoHY5mM?= =?us-ascii?Q?1fSc4AANwtqC/fIX3HocjNhXobmgLp+xO9WyrRD1YoFUfSHP/uMdsK/6AELa?= =?us-ascii?Q?gFnPuH/K7orHM0HKV0anpdHa2BEZUB0P2xMWXRzfPxeip6UZ+DA02quuSzie?= =?us-ascii?Q?OHxx1Wgi9eR+BDd7OaDIV8EygqwtCwjI6RQsm4LWJzjy+k4ltOM2u/zm7xT/?= =?us-ascii?Q?sd/7k5A7bywrwxldFdzovxJsh/kC6mFiyeDUWMoxdvL4K90wCphRQ4tQpQue?= =?us-ascii?Q?MMi85G650oY2l78Qls8kVY9gm1vAqSUQ7k03XjveFFbjOQeFOLbDoDcvrGnL?= =?us-ascii?Q?Esrt3o9mqFRBXVhcFrtjz65Z5I0imt117pZmoJul7oApVA/TPTDjuNQqlqge?= =?us-ascii?Q?Tz2fR4xb7j4SBvVP3tQeHQWC2C8DHAI3qfZu2VDDGKGEhJqFTPXXy6q7tXC/?= =?us-ascii?Q?5Hotj0AgqGIpK8RKuXheg3aE1SdmJoGyzB+r8H15K3t79mJB3yu6s6BXhh4P?= =?us-ascii?Q?LHvjgjwgFDuLQC2Q6PfyhSjDHREbavZtOqncpWARl0LRziFz75zQOrnG5aqI?= =?us-ascii?Q?vst2iCVD+SIVTwAe1ZnxgJtPrNt2KGN/VktIdDv2ir7xYJmwA9dfy5BEOWGh?= =?us-ascii?Q?X6ZCOK3GzWmag0JEYIW2PhNXOPtrmQJb2iJ48ktlbU+xG0n/EqfACJUsjTXO?= =?us-ascii?Q?ATgkRBG8uKIInEJ6vX9krLI1ZutYVoBUfLEPzKScPagqTlTFwVNCrRdVMxQ0?= =?us-ascii?Q?b0JBZVk2m/otZZmOpvQW8FQeBqgn5PR94ndDf4/Az?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 6:9joy7xXLMMmcwYjleNF9do/9e9VwRcdJrl+DABbBNVDIro4JaPzqk40tKYC+iniagI5N5i+uJDPCjyOLNUIWDuPcO/7x682+GvgkYduXf3pQHdmBKqnaKib1aVCc/dne5vIARMAv8qMpeJ126w1Gy2L59HBxWurg4sipBIe3fD/DxvufI3TjeIj78ovButzZOiJuQUPK0Qns1nab9fu6ScpFztwPZf0PuI01ym1Geg7fWcby2fTlX9pOv3UDnsxC7D8QgPiOg5V1STLIdon+65O85C4gNYWcZJ6KnxUE5CShYlAKIF38PTuqMjneeGgRdb/eROQ9NnfI3+Zk59muEA==; 5:86NcYBnNrPDRcYwQovMyQ0ZMaMfvofZM7IBnmTw5iBx+A9kGO9ks2k8Z2YHRc2GDZhotnTqqEkNNsv4HRhlSStahusStt8KIDV4/phl4uPYD0TZmAh6Yn6sD3qsTzGiSiN+qnqyjB41dm2fFtKtdng==; 24:Eb15vAgIpZZpZ7XrY1cPzd5yyixpICZDrO1j0SZS1QeN0qVAdl98H09h6iGLH9p6/+L4KDoFKtJhIrXba80X7cXO03Wx3VK17lGPPSX/2k4=; 7:+kL7QvHgDowj21LKVRu4c/fq4DKTWXT05rSchp9T+MHwYeAGIASXzZ44p3t+dIYk4yjhU85A4+l2XrP5mLc4N4VZbHRVr1LKpTzTA9Pv9GsMiAbSWPpfCSVyBgpEbUgquzcTEI7YJ7IJiCa4F+jNT9izA4mWd4xEZUraKuE1YfQ1YyHNfYaX4QKiXHluDspRcv18mqdSdeuobASqTjMsHUa9FMCKEWwZa6Y98rSr2WQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 20:/+FXjQy6FtrJn2gX2UU7NqsjOC+nEoaJL35mdLEJJlsr8ilcFIwvNE2nQqVUntlJprgVHsmQQhZu5joPR6TXSWtaYbCDYw4vwIuOl4Ylu6OUpoouqeRJM+lvLo/AVkBpmN5Q+lv7HwvauGUdQyj3l/00aa/RkKRhM/FirA0GD2o= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2017 02:16:20.9202 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1873 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto commit 1f8754d4daea5f ("ASoC: rsnd: don't call free_irq() on Parent SSI") fixed Parent SSI duplicate free_irq(). But on Renesas Sound, not only Parent SSI but also Multi SSI have same issue. This patch avoid duplicate free_irq() if it was not pure SSI. Fixes: 1f8754d4daea5f ("ASoC: rsnd: don't call free_irq() on Parent SSI") Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/ssi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 25c351f..0309de5 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -846,10 +846,10 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, struct rsnd_priv *priv) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); - struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); + struct rsnd_mod *pure_ssi_mod = rsnd_io_to_mod_ssi(io); - /* Do nothing for SSI parent mod */ - if (ssi_parent_mod == mod) + /* Do nothing if non SSI (= SSI parent, multi SSI) mod */ + if (pure_ssi_mod != mod) return 0; /* PIO will request IRQ again */