From patchwork Tue Oct 25 00:36:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9393837 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 5BFC760762 for ; Tue, 25 Oct 2016 01:51:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8725C29077 for ; Tue, 25 Oct 2016 01:51:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B0F329128; Tue, 25 Oct 2016 01:51:10 +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 097D829077 for ; Tue, 25 Oct 2016 01:51:07 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 46D93266E15; Tue, 25 Oct 2016 03:51:06 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9E3AD266E00; Tue, 25 Oct 2016 03:48:48 +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 77CA4266C4B; Tue, 25 Oct 2016 02:37:06 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 41C1A266C2E for ; Tue, 25 Oct 2016 02:36:59 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 25 Oct 2016 09:36:58 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id A1A2242E8C; Tue, 25 Oct 2016 09:36:58 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 9088428070; Tue, 25 Oct 2016 09:36:58 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 8B0AE2806F; Tue, 25 Oct 2016 09:36:58 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id KAJ25408; Tue, 25 Oct 2016 09:36:58 +0900 X-IronPort-AV: E=Sophos;i="5.31,543,1473087600"; d="scan'";a="223816426" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 25 Oct 2016 09:36:59 +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=DbecUvS0AIoyWf2v2ngQ8V9tQGbZcZK7d9v+X+yX4yo=; b=PUDEBAxNMVoBGqTkJOy0vm241CtaIjWeUxSBqNYgstHojMHxvGdUIGXI+LPMzrTMp7IycnJSBfjmZTuQDa/uVP/QKINYwAWtZeIo8Uzz4KAbY3qedvOBAUF3Yg93ACmmzQn2zILZfIOoCPFBmLjjxQRellCrwtqfuWSULch+zwY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Tue, 25 Oct 2016 00:36:56 +0000 Message-ID: <8737jlcly4.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: <878ttdcm17.wl%kuninori.morimoto.gx@renesas.com> References: <878ttdcm17.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 25 Oct 2016 00:36:56 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0017.jpnprd01.prod.outlook.com (10.168.40.155) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: c99ad4a7-5860-4750-7532-08d3fc6f065b X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:scstO51kTFWzIZqoNOdE2E2/tmRfLi291F0MOsNexJpMUJdZTaD+dTDqcPzLwboBNiV7LDNa3WGN+hayC0tIzJSMom/w3/ZzhalnMk9i0Agt5fLfUCJlS5Ms9m9J00U6a6/b4YX1rrndD6BRX9QhT9/Sw600DDTIAm7xeVqXnGH/kLTr9BTWhmy9WOuSD1cVVEzhlicJrk7fFJYin4gzPg==; 3:gfwJuGxxqdrs9ayloqcuYHgqI2QafG/TZcCBllw9JNxi5UJsJq3ISXEJEFi07tO/coAKNCt/0ubXao+2hAJpgMVtwIkQ+nrju1F5AElzapCUi5S3uNfDgN+1pdeygxcc0YvYL9WZKGt9sVApd1bq0w== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:BCSL5T1Vi3wVU3TAegXfDb5bhFM3EaYGtVK+GnF0TFZ67ZEU3mYZKmwkUwQ+eRxKAZvlJQ5LTkBOG9A3DlDrzI7e+B7U5Q4exg2H1tEw3hhEMmYxniA1hdRoBLNke1V4xoYk71tgu4aZdXcJ3/FsAMQub4wU32bUihBbKQFBeR/a0nWv0U6sFy6b2xG/T+/BCxkpwpYdla7Dtjirrc1h47kR5hcmErTGL/eCCXdT1uudNT7CU800wI+d+GlAjre9Iu565dXfJ62Ptj7gwchCwaCA6WSrxCmsoRVVEmh7XiCxckFWq4VTwJUim2VWmkZ0DNWIYWqnN/3UevPuZHdKPONtbJcLmIz6t47mTPwrwb4yJGdughJ1tnDBaaD6x4STqOiGlFBcf4TZ1Y7RXMPnC8HflopSxf0KiZMCduVAeS3Ol+oEv6g6XvKGz4E+KNCrMB73In8UFX2POT6Kum/2XLS7JLjufsn0gattCVhYv3HIErx6dBnjtuRrHbDsRqwuH8stu+VBDs74dat6bbrDLzG1dZHc7YGkOaF35fWU+h/1gojN+brWGUz7F03IGA9573Ck5w3RNI6rNBR/NY4kR6fjdZuc4hrIqNQg+MWauSlxJ3kmag3lHDw8QX1OOBryCCPjrr2RaVoo+0HY8CSsYRryN4DnJMpSSNVPmKubPpAsUCTjkoGkYwEb52U6UXT0PQEvuAulcTOrZHgHUshnKr6AH6Mkjiy/mt2XuNyV0l+1oXP2/1+DNraopLThL7Qhw0hdCZRUszLbPJu2Z/8Zgw== X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 31:n9GW5xNk3XLPN4RT2pVw3U6xzJFLfFWIVfsnaJlwg1MV7vKq1imC9caE9NdEkzYUM2rBEQkIbpEkZnV4MYx/l4i5qKl9if110cN7eDLvN5Y2MdCR5wzDQHbqpIM0gpU/g0DLVTX91jSqk603ZJczoAyezp+cK9EU5YWGFzW27GmPPh7K3RbEMfR/KVruSKz2prcay9hFwUmrStRCf2/K5C66EowMVAAR/C3hRrRwfjAso4YSWwKF/ESKywvwfSHb; 20:jwK/bZvVdRsYskTv1KCDz3kc8B+ug27mksAhOtHG4uDIpOJQMGcEalV58Vvrdd8RGTvgSAQHw0v4jYzOwnYefIlhlAChba5TIJa0ruKLJF527QNtXyWp6rageAJlgAe+p4zdRD8OzyBlyjcNJKq5TpJbIpjsvZe/a2OTZjv3SEZ9hEhSG04ttmdgT9rNZZ3OZeBmdoguOhhXA6+3vRB3aqKF7fvsCNG5t1S2EBN4d0MvfRBPSDtSMw5qB5IQ5RK6IGH0DZ3NrYWJ3B2g3wtsdWrJfoZ/H8zrpGNn/iq5h72/EUWik5QDFYQSlk2vrIJve0fICXimR0cRCpU9bsqTWI6fO36dyMo/xbrhxHzpz8qrfAd+fMoDFwLiib8TDKQIAZpj0mw0iVOAeP08KJ5HYSc0fO5FMXGr5/UkR19/VXfzlJUFPUbOCfJlmxQ7tbegTMFQ/bAu+NnXRgnpJhu2YyH6RlXP3HxnTYtRa0FctBIZNUPzwQPDeUdxi9RlU3fq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 4:2/VM4Qpl8fpSvfuMUstBwjn3EmhzN5hvLUFrJs3zfvCtz3KSLnFd3EusUn0evR9LdaMn7TWdIRzlSgL0PiJQU0gNrmembBCYknQritOYCIJLDXwQChzZCidrOCxtjuruIwdufpNH/qb/WuvUoQBHSW8z9H1XhDGGc/ELJ/hFNquogkPmTAXPQE5KX32/lnkiVb9psi4usfZalAC6Z3XeIXYmJ7s5aBhMa0+mCtf8kxGR4KcBX0lHQcVSvXjFyEr4eBnM7YgATgwuPAUz1r2boYDoKb9dmGBvQZA74TpNr1ehhsu00nVMO70RqHQQ0dEaR3/oypsXinDVtqNXFWyd4MhD6T4bm1OJ1lrmjDp1ZtvhveViFFhj7FC8GQsomR5P2SfowIBttSPAzME6M1OvlUgIhrbXej83i/q3qpCxkWQ= X-Forefront-PRVS: 01068D0A20 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(229853001)(33646002)(69596002)(23726003)(4326007)(2906002)(6116002)(97736004)(3846002)(68736007)(586003)(81166006)(92566002)(19580405001)(19580395003)(81156014)(50466002)(4001350100001)(189998001)(50986999)(76176999)(2950100002)(36756003)(5660300001)(101416001)(54356999)(77096005)(8676002)(47776003)(53416004)(42186005)(105586002)(106356001)(5890100001)(7736002)(7846002)(86362001)(6916009)(110136003)(83506001)(305945005)(66066001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:IJw83R9oQQKQmCH81Pu+JOzKgpIx+8ihnvSBxIB?= =?us-ascii?Q?DHsfppFzGzLbMLXBcVxtJyrPFQB4ZI+NlclXtKfHUbhM8r88HWLm6lINuSX+?= =?us-ascii?Q?TQdOIn33XpLKULib5SHYi6miy8UWhrtk5QC2Z+37vta56aenRa+IbfmkMLaj?= =?us-ascii?Q?QUtphcElb5F4RWcyDqu3v4VjEsK1s2+BJKVDnHPotP5RRP4+3CR7GZ4SFhyg?= =?us-ascii?Q?aFxG6b0HYdh7Im/z8SYDPjYCg1ZtahqDt/e8125WUK1DnoA0YLJM0qNAlCIO?= =?us-ascii?Q?B0ZieE4D8MYgT8v1gfsnLAQp+ALmHBwSGDTnsbcz34aNDSZccTqvCeq9HB8+?= =?us-ascii?Q?abtFuRPdK2Vv3LeTlrFVItXzvO+QGighj2MaY6/ShhFCOC/tM/m3eR8HGSp0?= =?us-ascii?Q?UPtZXv0+fjCgQhTlM+2XDjwHMpYaJiazW17ABlzrr4PBLxgGX1lK2f6hlLGt?= =?us-ascii?Q?hRjuoiOn2H6grPr1vlZFJH3z0WgDsHVwbphH77ZfHoquN5flEOg+sksAoYg7?= =?us-ascii?Q?bqoeUTkNZX4fRYPssKiMkQMv2iu+Y7cfbrG8GGSPWPU04XzXaBFPK+P5td0C?= =?us-ascii?Q?IN2iGqxoDzotEux/pyTcTG/DrNpMmc89N51i6e6fNWgKXkerVzypNPW+95yr?= =?us-ascii?Q?mG1+1i7ZipFfp36HheVMLjJWkXG4pipipi9edyqSsMXQQhrlt77lwTw/qzvG?= =?us-ascii?Q?xnrDKHk0n02kN3FuQmackHcBfQ/ILRFFqw61zzVWTuftsx7aBJh6ATYFshM6?= =?us-ascii?Q?67BmLi57Q0VWrPnqBWfWqmgiLgBEcQq+ZAstmG0rpGvWE+0xzbXJICmrw79H?= =?us-ascii?Q?wZHH6eMFTcDjV5ypKI9XQf4mtd7Shdc+9ZtonUJQTXl2QxAovFO/7VZjETS1?= =?us-ascii?Q?ufGVmISyeVu5ctuXrHyc2iII1ao1NwXyxaOP2eCyeXIW7cYojOkNPZgfKPk1?= =?us-ascii?Q?RZ9K6ibe50l7vae3Agy8g5/fs/GwYUru/wWCiekxbEUgWYnUviZPG+6nffjI?= =?us-ascii?Q?9QoeH3vCzPq1p8v4TrCBJWn6dttt6RfhDcUYjdQzVeXBIbt+cRTGnWoHRf36?= =?us-ascii?Q?3jNDd4jSGZ1VKCucJdnfjoGEBjsgUQpKzzhC/ewwCyWDU+ZhzrkGCNXtJITM?= =?us-ascii?Q?QqE8Juj6cB609jDtzNdSVsLEYfuX6bSzBCIH0u4/lO4nFZiSRzR6hiBG8Es1?= =?us-ascii?Q?xLFpiuE9sfttxl2dzRWTqlVb3kymRpuN5ZsrV?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:mfn8Jia7KXxbkpatdhDD4VHLepCWYjCzqxgl7+/TiyriBapg56gBQWDKgp8+3CdYUkWWQZGu4+N5zZKgmdiaM8oUjxuvK1YvGw642HgdexF97mOKZAcd1xkhlJYhW15EODnIv99Lb+UgF42LuCOHLeNd0lzM2E5nJwC/o1mC/JszLzixUEbmcP3tK4RKbBQ21MSXG3YDNweNejQS01bmga4COwG2av/3u8d/2KHrx7l1iJm72psnSiO5u4AE+Qr3Udql95r1yA/iUtdlolBNgH30a3241hIhAXcu+qNlh50BsBVE7G2YWcBbBMTenzEl4Tap8lDJ8cfHz2DRYUKTwxxHMu39f0bB/ferl56/pvM=; 5:l1jrfifSK/7Ti35AMDPoAwFsww3gVQilSNsvzEa2iXUJPbqvmgJcuXe86oeKIVhPmLJKpZdsxmouqs/joa47D5Hl4VsKZN/R01xnvFPuIA12D4I+pBadIvJJFG0fZ6kT3r7Fym0a4lBY1EQF9o2k6h4qew0gdqkI7qFpq16Mf2s=; 24:KR5btDCJtq19i7bMAvn3RuztADOUxa3kQf34dkZk+2NwkVztN9NfZfgRPRk3qq38quDE2pyr8bmQzQichAEcLJkBqhhiFGwG/LERsn7+LA0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 7:hgpgbpQNghdXD78G2MyUrki2EyjpfZVvQRas6uQ9fIEtYDXYO6Mg/A3czPoe5+6Tmgf5N5rCgaiDa/495ATOBQeuOJiEgH7+Rq313h+am9ab71QclkqANUWA3PoIXfBup8SkhEi5/OK+MQAj9pO2jtzqDns9PfOuYcxHbDaHJfSy1NRPQztwQkdTp5KdtqfML8MUI9KLpWmEcFz7mhbj4n63ZIVaxpa14O4z9+N6vOGH6/mEkdGwfW4PI0CT5qaryHAMuqvcIhTwj2Ff9FezRBR5WCWwgJ9ZRmCVe2vdOvZqQdsopln6gIfPVZECPnZdmDqPM8fsj6NrSlH+sj/wLn+ZU4HETGEHsd0LNpyCwfg=; 20:PY+vdRWVOkqwGx9DOsCiVvdNTvgBH1kj7iS1i/X1hgb7NDjsn22+ms43p6OW1FNf6CPpnLHgGenkxAzySBHqO1nSuYsFnY/ePgMeITfYBpTF1Dey06L1u+4HqBaUSOdojfDqHWdwM72EWHQ9sG3W2F06Dn2ITA4UZw/OU5RlQpE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2016 00:36:56.4405 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 4/8] ASoC: rsnd: remove rsnd_dma_detach() 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 DMA mod is now connected to stream via rsnd_dai_connect(). This means DMA mod can use .remove for its clearance. rsnd_dma_detach() is no longer needed. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/dma.c | 11 ----------- sound/soc/sh/rcar/rsnd.h | 1 - sound/soc/sh/rcar/ssi.c | 2 -- 3 files changed, 14 deletions(-) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index e0761ca..c85a551 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -698,17 +698,6 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, return 0; } -void rsnd_dma_detach(struct rsnd_mod *mod, struct rsnd_mod **dma_mod) -{ - if (*dma_mod) { - struct rsnd_priv *priv = rsnd_mod_to_priv(mod); - struct device *dev = rsnd_priv_to_dev(priv); - - devm_kfree(dev, *dma_mod); - *dma_mod = NULL; - } -} - int rsnd_dma_probe(struct rsnd_priv *priv) { struct platform_device *pdev = rsnd_priv_to_pdev(priv); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 2460d1f..c1cee1a 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -200,7 +200,6 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg, */ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, struct rsnd_mod **dma_mod); -void rsnd_dma_detach(struct rsnd_mod *mod, struct rsnd_mod **dma_mod); int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index b0338d0..e23e07b 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -701,8 +701,6 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, /* PIO will request IRQ again */ free_irq(ssi->irq, mod); - rsnd_dma_detach(mod, &ssi->dma); - return 0; }