From patchwork Tue Nov 6 05:19:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10669641 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 DC87F13A4 for ; Tue, 6 Nov 2018 05:19:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9E4C29D12 for ; Tue, 6 Nov 2018 05:19:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDB1729D5B; Tue, 6 Nov 2018 05:19:29 +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.7 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 E1DD629D12 for ; Tue, 6 Nov 2018 05:19:28 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9E26A2679F7; Tue, 6 Nov 2018 06:19:27 +0100 (CET) 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 585F62679F8; Tue, 6 Nov 2018 06:19:25 +0100 (CET) Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-pu1apc01on0091.outbound.protection.outlook.com [104.47.126.91]) by alsa0.perex.cz (Postfix) with ESMTP id 804A42679F7 for ; Tue, 6 Nov 2018 06:19:22 +0100 (CET) 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=uWiJd1h1QfqiDSd0tggxkG9uVRAbv7sYtBpU85irlE0=; b=nQ+FYunlc0C5vbzINaIoxji8sdpCUmgAu/0nNsjSG5Yl8MjfnVY/Ec1Z9Cad94WAyBw7VWrCZ5R8YWbEAc7oGhsLgKrWhY1SFPOQkrkkU+JlDzDBxv0WrX9pni07snl3mQ+Sl08vRURmdGDzjjhvIkFcMQLj/gXSsz7L+QTzwB4= Received: from morimoto-PC.renesas.com (211.11.155.130) by TY2PR01MB3322.jpnprd01.prod.outlook.com (2603:1096:404:da::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.29; Tue, 6 Nov 2018 05:19:19 +0000 Message-ID: <87d0rix03j.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown In-Reply-To: <87ftwex052.wl-kuninori.morimoto.gx@renesas.com> References: <87ftwex052.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 6 Nov 2018 05:19:19 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY2PR02CA0056.apcprd02.prod.outlook.com (2603:1096:404:e2::20) To TY2PR01MB3322.jpnprd01.prod.outlook.com (2603:1096:404:da::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 767bf627-6fdd-4169-3ac5-08d643a76773 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:TY2PR01MB3322; X-Microsoft-Exchange-Diagnostics: 1; TY2PR01MB3322; 3:jYDg3TCst/hCgrBjqDhtBa2c3eDbwYYPyfd8mVIYj/EnhEfx/FBBdRkvZXPcsWXACYkPclkXO3sGBthd3qqcmzwnMdysu0TIWqVSbKV5WAscD68ecTJ00L1Tb2xYxp/4czJP0wBW4CpUPZaBAN39TqVZpAW3V3SdVEnLMl5W/aazr5yTpXa5mLrAaxAnlNNMum7t5zgaMhLRuuORzDE4Ooj22z75EXIc+/NVZeXu01BPdGqr1e4MkRaaudLx/QWC; 25:64sS+pYckT8KEndJzfi11T6e+9gQZ5A86wcYR1sDOTkcAMQWdijNjA8tQ2tJmuV//Lzpmkwhm09QEFNhzmVrpqWmRIkTa0ooYlJ2t5xD/71Rb5UKF398jvK2HzP4DxB4m0YDQltYEutiPF1vQg02S/mknmWp4EYzZaN+4+q7Bx8yNGmBHAPQgd8eq7orHcaemI1MdGIfJI4bboyzZ5sbaVg8wuYGBaydIYzTWupEJvw7Os43ljHquYKZr///VySo2S74p6AUHObO4plgbetYBFnf7Q+wtwHza0DZwlpLs4SSsgpuRlN8XA77ZZc4QUsu4iI3sDj9A7EwseV5CdgMig==; 31:zbQr64gU3pogpTLCtyMlZtZWLEskcg/EUT2uy4dUtQqaDwvMA1X03/Ppnx805RcJScM+HZje2gmFtgVoxfpDyzhVAADxn9eV94zhvdQMG7HgLKRWifTwaM/Ja8DZvNYEFHpVnTnHZOLcO7TENuWxEyE1XIZCqt1nIhc7/Frpt2kfjJTCK+Afln8ShKyIjORdLcg/TxPtUSHA9H3+45kD2PFOHkq2dFku03OScXmOYwU= X-MS-TrafficTypeDiagnostic: TY2PR01MB3322: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; TY2PR01MB3322; 20:YZDKXWA7Qsd+lC/+0ArqBia05NhyVFxeCRMXhCzSeLEWHbAXHFMbiKUpGXH4AJuh9hAodNMGhnKHjyNgiL93MyxqAyvq5glrSPj4Ig45QFvY23ygsj5Fbtm7OqxMfPKsiphWNivOOG3xlJmGwE42y30pEK4G6FwkY4wiyNUB/eruk9iuZotfJMoFRQQtUaW+AFNtm9q/UYzm7ZAYFNEhCf7Cst2MR/mQXbOReCkKmxg2FNccJVQz0gNvDTEnPGYDvFn+OrVhGQkNAbqo4wnoG3wkU+ebc2oWv4QBU9P+h6GDauUPAUfXkAc+1eRHOaqgr8E5IWRFuvjVeOXa04c4yh16ylJeC8hwG+FL3a9Dh2FJkbAj1F4UNN11jVeQCJjpZquCNzjZTdpbjxaz/bMLxJTsTzdYVvyQ4ey+8miA0SQNZCDmW9TyAyHbxrevVFFYEpWJBHprXxwOVpMorZSuxLMTxa4ZSLf7Rs4b9vVNDX4eBVId3+cU2+HYDIQrGHZH; 4:gotH4an76aEjy1aepag3c9A1WInaR7hHb3hJ0DpBCgibIqrONWWW/SXMU82GniuPqPG6aRK7hbcDxg7nMK2+p7WopjU8zYscIJYHYP4JjywSV/IEZv2A4r1VDcvZNnlm0VoJSUXfuLQrypAhRoeOmrVY4vTezcnn5xYUDM475gkWTFURqzABU2+NRZZkKBk+LwVFmIRxTylflqhW6PZ/izJUg/PMpisz81meqHhYdWNWIC9rmbPmxAe5eOcRZ0um8RBOyAYKEHurKw6UgsmTUg== 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)(3231382)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:TY2PR01MB3322; BCL:0; PCL:0; RULEID:; SRVR:TY2PR01MB3322; X-Forefront-PRVS: 0848C1A6AA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(376002)(39860400002)(346002)(396003)(199004)(189003)(97736004)(4326008)(2906002)(36756003)(66066001)(23726003)(6116002)(3846002)(16586007)(956004)(305945005)(6916009)(7696005)(76176011)(86362001)(25786009)(52116002)(186003)(26005)(16526019)(386003)(53936002)(47776003)(5660300001)(69596002)(81156014)(81166006)(8676002)(8936002)(6486002)(7736002)(68736007)(54906003)(478600001)(50466002)(106356001)(316002)(2616005)(11346002)(105586002)(476003)(53416004)(446003)(486006)(58126008)(21314003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY2PR01MB3322; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TY2PR01MB3322; 23:u8/GHuoHLOjFGWMAIv5eOfS5qJR3Ne2eGhS6I00xr?= NwO13rxmJi7nOZSc5j2medruYkUhZKKDUtrscMMCPvjavaKL/J94vneT7s8RqjRkWxF6hIUNPOmgRCEFv3Yd3ExCTRS/hAo9kz7kgR5Tp8xsLntY4HJJx/jU7hfckNmODPmRFp1p0TWG1WKSDNHLCz8WdEw1sYAJ/nKbyuK4e2A+0aCMTNRfqY4YBuBe0D6aKbcLoEbc0hMOeUIX3VhRu2z1ASFLe4eqs2ngN3JVy+IIXySrJBsHYxoe2GKofohCNfglmD7+CirYxd2M+y1kVR7XWJl0cDGsSEQBmvMXb8q9ALcb2WX4Pz12MX0YkQh2IY8n6IREA8aEdzLFS2L5m2Kqe3gxAJ0T06Lmpc0oogqD0M6VXwgh1oOBYI3wwEoz5bFsT/MuNI/ITNFyURkNVW71nvDSbm9HQ5Pv8a8qpC0rHyuOySovWjgxeoOTixrx0EUIYCC8qNxIzAaHU8H29JbgwznJe5aE0uWwtMXH5H5qde/Ogb6tQ6FzVbpLUZrJAnrFERqZBappVshJuJTIsHz+lqeCTOFx6isLffRkyaP38FKfeYGUTcZwcbAB4fxtt/kxJX+YJflLjq0gRGnXAJrUkwJC3LC9gch6Y9kUp9daJ7GTZVm3ft0A9SvNZ60KIHXUXc/00uiMqw6JnMgirV4wDFIMXCR3CRZakiCkXOdJKqF0uGMMWY4Rg5myKa0pF3lOZXXc2DAmQaOMmyC2/fbrN7Ged3b5adJ2DyRm7VBcn34+cINozaFoLbCldu4Vm4HgSkP5S/awxcQn4yqPlI/z5s5H9VesTGFvWSHVaU+Jyyr2QHUKOEfik6AW4BIe9Yl1+aaLlXZNSmqhfmIJEr/X4ghfpCV5JRMkCaAw0k9UwKR3edEecu37T+vJWIsLZROiMQnlObqiXLuRsHb/4cQ05vUqQ3ZARt/hXSZXet3lBvfI9noYiEBl6dQXwOXq4DYQdgWUHetwssJLTT04XZMIuHa/i7vWRSruCHry4waLEX/qNnAbxcjLtrUjxe64xzk2OBZ7OvTqNgtofKQLac5tMJ7JbDu9Fhwo53NRD5j3Hrh/qxUP5ghehPDViTlrgS8617CxFkj/J7I/JUxWW9Y5vONef5YMSr2wdhP3hqkyUJcxAz0xoIGoAioRfgHin2zGaPZUhQQ1XsdNWKB45+pA9xiwW59AaGiVJgmQ7QMiQ== X-Microsoft-Antispam-Message-Info: ZZOT43l+4ZTAM6g6RgDmzYSb+mEIUipiWd/hkePehCNftqMfxEsqrwGWQGB5pK/sL6cq+CgPZZS3QpKUZTNiXszVB/u3audyLlv6X7Jsvjy9daMmYrmvWamAINqRJmPHW729EZgRUWJZsOfAMp1tPLMGFfArbuDM7fzhXiH5jy9zllPlzv5wwlVoMYS4o7LJuqf0INddZxUJoOXwrUHi/qmkm1c2lcYhCIm0WDP/vD724XihEtyWnWuzwPvupW9ykxPo/sfet75wENHe2YGxFruuu6wBWsFXIKyxdjSAQk8e5oqSolIzOE+Hfl1ukUI996UJwj3shNv+YEfS4qtF2J4DlXarbd90GEUvI0txr3A= X-Microsoft-Exchange-Diagnostics: 1; TY2PR01MB3322; 6:kH/RGm5neIwZLb0HZhCQd8kHBHD5B0x2zUcMQ/gqO0rOro2RUXs1BgC0tUzV3CqtQWwva7Z9cSms4yLP2CSHXQANeN3W5GhaYP9N+b5IjhRGbtwDF3sTm49mqYXk8p6FyZiY0WxOoiBr4btCux38a7e8iyuMx2iQcq/3IW3wRiIB2oU3F4YxcsZy/o7kVAPLkv+eZ1FLOBTEf3lSsXv9ClTteRVT8YGPglOurg0OKanZQCorsO3Lm/hOMxvagXZM5GudYmC/8LaVXuNt9RcQONHFi46p9GWS+KWUXAAR8kxchD9rTD2BNKzWLCjdD0Wu9h1kRA6DPgw8G+M7BBgpfzilaJQfhV6cPbRw6A+64nw4IN0P2XF4uqC38dqAQ0JJCpRViVbKrasZgpQbXGIordT9yGSes/JmwHIh11xAmwIS0JIknQFakrfcI8TGmnU3N/IwFBUPsuSUTvVidFEw2g==; 5:kv1fxYhNbVQQJ0VSvBbXE8qY1W7p0J3xfRURPYHQx/3n8iDq1745iPRrVPtyE/V7thr8YrqfQk0BdCqb8LkoREpEM65h563pmnBpwciNT04gNSg1f47TYNOewBur0JzQLGGNbm4t+8BHGhCY73Cc2WsMhUyV1oDAu1FFcfkpfA0=; 7:fkpAjT/g66mR98fxQR0HJBumK+WAL0+0Qn2B5KV5AkcLUA73aECVhqVmTGyNjDcGF93LAI8odUwAApxI2l4Z2t2t/wPOS28oop20pjP2hy4s+KXzbd42EUbSCCfro5VhKeRndmwGAFsIIok+WS1v/A== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY2PR01MB3322; 20:JRKOgc1YbJvzSDqmufhoW2A8SxX8jBy3XXcmPlvjF3gkI2HsG4bu1lCLftw7ZyM2EtbI3FIk7FrL3ObBMBVPh76nnP3iEjiCCwnSVUrHeAGLA05l/juGDizUwZoIO68HvjmAq9OmEE8vqgGFbVRmOmbPT87bDYGswVgx/9rSnRg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2018 05:19:19.3239 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 767bf627-6fdd-4169-3ac5-08d643a76773 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR01MB3322 Cc: Jiada Wang , Linux-ALSA Subject: [alsa-devel] [PATCH 02/10] ASoC: rsnd: rename rsnd_runtime_is_ssi_xxx() 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 rsnd driver has rsnd_runtime_is_ssi_xxx() functions, but it is not only related to SSI, thus, it is misunderstandable. This patch renames it. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 6 +++--- sound/soc/sh/rcar/rsnd.h | 4 ++-- sound/soc/sh/rcar/ssi.c | 4 ++-- sound/soc/sh/rcar/ssiu.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 5e10012..cbe846e 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -287,7 +287,7 @@ int rsnd_runtime_channel_for_ssi_with_params(struct rsnd_dai_stream *io, rsnd_runtime_channel_original_with_params(io, params); /* Use Multi SSI */ - if (rsnd_runtime_is_ssi_multi(io)) + if (rsnd_runtime_is_multi_ssi(io)) chan /= rsnd_rdai_ssi_lane_get(rdai); /* TDM Extend Mode needs 8ch */ @@ -297,7 +297,7 @@ int rsnd_runtime_channel_for_ssi_with_params(struct rsnd_dai_stream *io, return chan; } -int rsnd_runtime_is_ssi_multi(struct rsnd_dai_stream *io) +int rsnd_runtime_is_multi_ssi(struct rsnd_dai_stream *io) { struct rsnd_dai *rdai = rsnd_io_to_rdai(io); int lane = rsnd_rdai_ssi_lane_get(rdai); @@ -308,7 +308,7 @@ int rsnd_runtime_is_ssi_multi(struct rsnd_dai_stream *io) return (chan > 2) && (lane > 1); } -int rsnd_runtime_is_ssi_tdm(struct rsnd_dai_stream *io) +int rsnd_runtime_is_tdm(struct rsnd_dai_stream *io) { return rsnd_runtime_channel_for_ssi(io) >= 6; } diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 28bd90a..4b547c6 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -431,8 +431,8 @@ int rsnd_runtime_channel_after_ctu_with_params(struct rsnd_dai_stream *io, rsnd_runtime_channel_for_ssi_with_params(io, NULL) int rsnd_runtime_channel_for_ssi_with_params(struct rsnd_dai_stream *io, struct snd_pcm_hw_params *params); -int rsnd_runtime_is_ssi_multi(struct rsnd_dai_stream *io); -int rsnd_runtime_is_ssi_tdm(struct rsnd_dai_stream *io); +int rsnd_runtime_is_multi_ssi(struct rsnd_dai_stream *io); +int rsnd_runtime_is_tdm(struct rsnd_dai_stream *io); /* * DT diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index baac83f..26a00a7 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -223,7 +223,7 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io) u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io) { - if (rsnd_runtime_is_ssi_multi(io)) + if (rsnd_runtime_is_multi_ssi(io)) return rsnd_ssi_multi_slaves(io); return 0; @@ -383,7 +383,7 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, u32 wsr = ssi->wsr; int is_tdm; - is_tdm = rsnd_runtime_is_ssi_tdm(io); + is_tdm = rsnd_runtime_is_tdm(io); cr_own |= FORCE | rsnd_rdai_width_to_swl(rdai); diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index ebcb826..645340e 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -145,7 +145,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod, ssiu->usrcnt++; - if (rsnd_runtime_is_ssi_tdm(io)) { + if (rsnd_runtime_is_tdm(io)) { /* * TDM Extend Mode * see