From patchwork Mon Jun 15 06:28:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6606471 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 72F80C0020 for ; Mon, 15 Jun 2015 06:38:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A00A32026C for ; Mon, 15 Jun 2015 06:38:46 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4F80A2053F for ; Mon, 15 Jun 2015 06:38:45 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1E5432615F7; Mon, 15 Jun 2015 08:38:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id F10592614A9; Mon, 15 Jun 2015 08:32:20 +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 930EF2614B0; Mon, 15 Jun 2015 08:32:19 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 1F56A261A80 for ; Mon, 15 Jun 2015 08:28:08 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 15 Jun 2015 15:28:07 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id B750B45961; Mon, 15 Jun 2015 15:28:07 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 9E8BA480A4; Mon, 15 Jun 2015 15:28:07 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 97D45480A3; Mon, 15 Jun 2015 15:28:07 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id RAP08067; Mon, 15 Jun 2015 15:28:07 +0900 X-IronPort-AV: E=Sophos;i="5.13,617,1427727600"; d="scan'208";a="188302494" Received: from mail-sg1lp0091.outbound.protection.outlook.com (HELO APAC01-SG1-obe.outbound.protection.outlook.com) ([207.46.51.91]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Jun 2015 15:28:06 +0900 Received: from SINPR06MB313.apcprd06.prod.outlook.com (10.141.115.144) by SINPR06MB315.apcprd06.prod.outlook.com (10.141.115.153) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 06:28:05 +0000 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from morimoto-PC.renesas.com (211.11.155.132) by SINPR06MB313.apcprd06.prod.outlook.com (10.141.115.144) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 06:28:03 +0000 Message-ID: <87zj41trmg.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: <87twu9v6kn.wl%kuninori.morimoto.gx@renesas.com> References: <87twu9v6kn.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 15 Jun 2015 06:28:03 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: TY1PR01CA0055.jpnprd01.prod.outlook.com (25.164.162.165) To SINPR06MB313.apcprd06.prod.outlook.com (10.141.115.144) X-Microsoft-Exchange-Diagnostics: 1; SINPR06MB313; 2:EhpZt+1pAcMGWK/HdPUeyvB9Yk4Zbu4334xEmNWFdSG3ovcYONp0o/CmX2kAev4i; 2:5yeUtPYA2XsIKWvTBUo8INp5V00ykpQ2UX7n5uSuSkdHvTF5xVtBfAsF/G2EFHkcSesZk5B3BEnNx+cV2ffcAgifZ1FAvse0alvj0Vp69Atfgt3pE1Gu+7Lg62V9Dk6XWEMcuxCIj5+4hjl5wozSWQ==; 6:k3OhC9TgSM/Cva5N+PTI2YUlBDSIvuG/v9ZcKAoJhVR6GdMkgfcpj5D3mqR6HYunwVwYOmXDSVrXXVPfKqIe2xKv59S2iprVvGcDpDIbjg7WEvT4FbpFyLzwRlK4yQm05WpaYoxeRVSN41khOqErmT5RodT3AyN9EI4VUFOUBBs8jOjJBGbalfs0rfYOQtVEGYiFTAn2TBqWExRaJjLyykhCacEYrDrPlQFodHoAxzcruZGtxxBYtyk67pf6nD61YsY0I+5sA0sxVhfd4ENVza0kCrjCB+9625pul+JPfJv2nlx4T2/d35vVXGqgeRSwxSbEhgwv9mQzwatfsXLP9Nwipp+ab7iT4bNwTWxb5TLb3hr7GDznfJkQbLD8YhvHEAu5IwS2woO58MS22J456vorJSsuvoUshKgfxm7V19FtU+gKy3VIFDIx6MkQLIaIjYJE29Se2tPFpwnaXmH7hSDj/HORnRj1JMODOA3TOA82e4fWl94sa/ohazdJeCwh X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:SINPR06MB313; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:SINPR06MB315; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:SINPR06MB313; BCL:0; PCL:0; RULEID:; SRVR:SINPR06MB313; X-Microsoft-Exchange-Diagnostics: 1; SINPR06MB313; 3:LSQVsvV5pYOlxuFivT7eMnlPp5Z/oL/sDcmPKPPb04Y/k8wYLsb1EIAdCU1p95zJrCFr7zf/hAooWn+mh8W6NW44VOOOy0rir4sWEMT36zYWuv5tdTOnZNVkWLq1UO5izolpLndsOtAYrIYu5luGkW8yVm4vr9TtFI09+igsaJvjQOW8NPLL49yXn9KAeIquYl4AnTN+BUJQtPUifj5ae5DocK7NjBhwFRMrD7jiCM1AKIPSizdM71gzupVTXWgTnxV/quE0eiTrGPvaEmUy3bMhcLWiYVw4QxQKxbnqQNdwA+Eo8IIPNCF62In3JANs X-Forefront-PRVS: 0608DEDB67 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(47776003)(66066001)(4001350100001)(46406003)(189998001)(36756003)(87976001)(86362001)(19580395003)(19580405001)(83506001)(23726002)(110136002)(50466002)(40100003)(122386002)(77156002)(5001960100002)(5001920100001)(62966003)(2950100001)(77096005)(46102003)(54356999)(53416004)(229853001)(92566002)(50986999)(33646002)(42186005)(76176999); DIR:OUT; SFP:1102; SCL:1; SRVR:SINPR06MB313; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SINPR06MB313; 9:KB2kbzd92Z+pJD1D1zrK4NIKTkNf+16Gm1Ay+m0YzAdqc/C1E53dCsh8L2WM9pHfCiAGVUHuXtonlp/afAf+tSBpY6f3EVc9AcguCBIsAffJct/BhvrEZhd8Tpr9BNNGT0kw1J1cdOhvH2cfeax1CMDBGnu3A3QsDXMSvlFzbnBIjLZ1j92yUUmF4m8SG5iEWH1M5wwxkPQXwx+ggKR+UucaBcG7ViLhVza9R8ngaZRCmynYqotkpnm9ktNVnW/QGoQhDKHzoRjXBKZfyqmSfTI4tDsnU2ch7Dl6Aa/J0a62YjbI3Kvpm8dPPv9YE0xNWkVoLPFfA5fllxNrx98wt0FhKMMo6GVT5VRamMr+z+TVJBRTcob+pW6ojOqFHX0Nr7M+ywfED3a5fEFJSG8lVxeNFnqlGlqunSonrYp0nmJkAEjMfuw2kMDyGT+brTDxarsLNgEXEsNNWotT7WY6GAuxvtdTResdIhCBwcjNXMIPx2p02qTvUQbupR1jPHbepsOR67xWjFrsOk/A4JZDpEeMEeSYuMmGpFUlDlsHcuhwxLtd3JLie3TEcBo1nQBSFRHMkYByhIU+2dP4hvon/h1fQnvPnk1j23cbB7s3n8/A6TPz5t9YB3s/zNcYjVK/ywVMY8T8wtSMvuAluBP8QHXQhkKxXvMODi2RCj4qQxhgByn9wR7PEEbytauF86wnkesAJWDHVJEHYoEeZIJJ6YY31gMebDPEnEuu/Mbw+tZvqJi3uzl3dZEqXyLS1VGjzHAq1tUVsKKwPyEgKHs9MbyoqWxlQ1yBlqWUhpM607nAm4sZuVzoy7AUY8CntBkgw+uI6Oto7Ts+pBcjQ6uuclsGZFzy3BYk81OT+kkxfmrTotITz2dVGj/9RfT68aZ/ X-Microsoft-Exchange-Diagnostics: 1; SINPR06MB313; 3:If0IVc9gPUKLxk8DUCE5XS2jYNYeIWzZcF5vjtDd8qNv5DrACVRvM7fUb1LoRUUPYnSQpYPXwudby9RGPg49Z9J6h51vxGvDNELISr3XxDgN/trxQp8LjHCe/asuV8SQOjvy38BP4Jsuqgcyzbal3Q==; 10:x7L8ZsfnZCWBZLv5cQI4wHiRc4Y03xrTblLjv46MGJV06Ee8dRyoKsrkGBjEsxUBKpFSOv4spNnFLHRVpZOJ2D7DCP2XqOwUgM4B4dtrC/Y=; 6:nsE5kgseNxbhsTyfcx5W2Mb+vJbv7DGOEhga3R6mnIF2PL6PmpFv5oCD24tsNDRblChBQ/fyrKLUzoEQj/x/Q0TUdulQsgViGG9oA6HNc6Fn7LyaF7IqOMoz1z7R77AEQ5+khGZAY31tpG5ku9opCQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 06:28:03.6550 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SINPR06MB313 X-Microsoft-Exchange-Diagnostics: 1; SINPR06MB315; 2:FmY9IvyWwarGSGAINv2fponEMAIC8t+sZTvWjlpNnHciym/KEaRSLw1C4xSQC3wa; 2:DMdPpQiq2EwoqZL2cZ2bRQys81xjnvNY3nhoHhWOBzwfcrPUzL8EMogJ3bORRRx082T6Z1pQ2JPrgXa+35si30uzUcDsn9z+V4eE8wqJyd27A0B4NqO3SFEf/N+Pwxv2yo9nY66rMVF2z1YnGMKzEA==; 9:L9G9GMyDomTy0H9OUq5Lz/BDR2bpIf2AtC3Q2n5HsJtYfO+9Bw/bVCUzDXaXeayv3UU2wydnduy8wqPYAK9ZiM4O9twIemsyNEXK3bwE267zdzrjceFcnswyest69aFHxyegmHdF3c7tBNPCUiEtTg== X-OriginatorOrg: renesas.com Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 21/21] ASoC: rsnd: remove io from rsnd_mod 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 Each Renesas sound mod (= SSI/SRC/DVC) might be called from many path if it supports MIXer. In such case, mod <-> io is no longer 1:1 relationship. rsnd_mod_to_io() is no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto Tested-by: Keita Kobayashi --- sound/soc/sh/rcar/core.c | 2 -- sound/soc/sh/rcar/rsnd.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 1eca85f..f1e5920 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -288,7 +288,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod, } io->mod[mod->type] = mod; - mod->io = io; return 0; } @@ -296,7 +295,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod, static void rsnd_dai_disconnect(struct rsnd_mod *mod, struct rsnd_dai_stream *io) { - mod->io = NULL; io->mod[mod->type] = NULL; } diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 756930b..09fcc54 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -262,7 +262,6 @@ struct rsnd_mod { enum rsnd_mod_type type; struct rsnd_mod_ops *ops; struct rsnd_dma dma; - struct rsnd_dai_stream *io; struct rsnd_priv *priv; struct clk *clk; u32 status; @@ -313,7 +312,6 @@ struct rsnd_mod { #define rsnd_mod_to_priv(mod) ((mod)->priv) #define rsnd_mod_to_dma(mod) (&(mod)->dma) -#define rsnd_mod_to_io(mod) ((mod)->io) #define rsnd_mod_id(mod) ((mod)->id) #define rsnd_mod_hw_start(mod) clk_enable((mod)->clk) #define rsnd_mod_hw_stop(mod) clk_disable((mod)->clk)