From patchwork Thu Feb 18 08:13:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 8347081 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@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 2DC4CC0553 for ; Thu, 18 Feb 2016 08:13:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86E8A20386 for ; Thu, 18 Feb 2016 08:13:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C23F820384 for ; Thu, 18 Feb 2016 08:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424672AbcBRINT (ORCPT ); Thu, 18 Feb 2016 03:13:19 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:62709 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1425126AbcBRINR (ORCPT ); Thu, 18 Feb 2016 03:13:17 -0500 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 18 Feb 2016 17:13:16 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 630DF48B55; Thu, 18 Feb 2016 17:13:16 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 6073B1806F; Thu, 18 Feb 2016 17:13:16 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 57DEA1800A; Thu, 18 Feb 2016 17:13:16 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id TAN06939; Thu, 18 Feb 2016 17:13:16 +0900 X-IronPort-AV: E=Sophos;i="5.22,464,1449500400"; d="scan'";a="204625830" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 18 Feb 2016 17:13:15 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=U+OoDeCkOAnFdQhrwtMBKWmQaLcJC2BS/+gui1CEx08=; b=LiO0e35tsFupx0KR3lo6pM/jliLBMRBSwRE6z94dO68Ax8JMxX3vwUS5KUhLabDcDiPlDWmSIRPKRHj+SEYPv5HFi40q6Hx6u2Qsv2lvtL/6eurIsRNu8B8ycXR6Mm/Ms/1uANxSzFHtJyQKJRMg7xgZiAuV/NedBe0k3cjAhxs= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HK2PR06MB1011.apcprd06.prod.outlook.com (10.161.187.28) with Microsoft SMTP Server (TLS) id 15.1.409.15; Thu, 18 Feb 2016 08:13:13 +0000 Message-ID: <87r3gatp7n.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 01/11] ASoC: rsnd: rename RSND_DVC_CHANNELS to RSND_MAX_CHANNELS User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87si0qtp8x.wl%kuninori.morimoto.gx@renesas.com> References: <87si0qtp8x.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 18 Feb 2016 08:13:13 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0032.jpnprd01.prod.outlook.com (25.165.48.142) To HK2PR06MB1011.apcprd06.prod.outlook.com (25.161.187.28) X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1011; 2:XWvoYVGTu8AFDNYm9kFHGTMpPR8Qg4sp25j5vzdOqhBj8MvRNyjGaISGLlvzPA8MCQSwqpwIDUm61Xm+HuYqKDxp1d+JiyR2g1i78gS2oxy4c3S4J5P3qKiRaSjAjMJxmKW1I983T5JdLn81IcVDXA==; 3:G/9mzjqHV5tLhm1TVl8AUN3SfwMw8OLejAiuaERhOq+9SlDDbBBWwhxbqtoWgRhbKyKleYVlFYa3iiBrZLbxhYKE7veLcrecQ4HUSvjGC7fG+YqW56oIz0K6pFTJHkr1; 25:HUZzmevqPtyzK4umt/o4RVwu4vjVqFcvUs+oFqNQC4aqEnLd2+uBYhlJ1jBEBn2yI8pk7miWrc0xFQ7nVJH/FmYm0eahjVJsq4mzTolh9mwsw5uwiTbw1WIJhkbdyZbU/l331foMuyy+80id0uhADRD3AchvLujxqkwv4gehwebgpWAuU2pOsbMrdeEoq4/MouJEELsCEtPztA+hiEQwNb014gNBEWTpF00wWMpVAak5bHYfgnJubjqWvFox2CT4IyneNZEdM0y7HHB7UNsI1uoA22rTU9V3NuG9tyRmK1wdUkplwcrclGmI2mJ6ptkY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB1011; X-MS-Office365-Filtering-Correlation-Id: cb972b84-8387-4a43-5792-08d3383b5953 X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1011; 20:1bCU+Cve2cSJbJT1lLKLCsmnq49QPJlCHsyoKFPY6hSglnj02pYtm2HzWEITmPUUF13zvwQdN4QksEjXUc0TaXQT4SAP4V8o8pitSnTulQ6Erh2FSm0HL+Cxjwkyyhv0DNi+8xXCSQOcRso+DI0S/eY7dHTjZpSzulyH5XOkE/NLxB67iqh54ZKfOS9lf4E0U6DrF/LokVqrChwPBF7D8JqAJsezWYY7WRBN7nu7S9A9LnxRTSPPOOWO+eui60IsRIkO0ua4cS7mc84/UHFbNF+80Da9acDVKRkCKl88lIxUDiCmz/29251m3ox1RPPF5QG07xC5aIk6DLm+2NuQpYzXKX8OS4d8w1vi5kqPeGlfBNCGwsqlNYKqLujaBxhnrJi9odEx5UvCXAJZpwVjQdsIiKOD1xtVTeAPBh3OStZVP/nDxTiHmDah8hDhyNrS7N2DjUhGm9qXgPty8l5nnYIzXKyqbZsk4vVdR7U/Kj+HIVoiBapOT7cbJEhY2ozF; 4:eEQABfIKP8pDWnkPaLmAGCZ1fWG4Wbz0/9kHTURJcHZD5J5JYv+iWZ178c4BISzqSuMq43BueG9l2uNybAKTm2yw3lhVzbgeZiUIJU17rDUim9+VD8HhzS0A3wtq5JVRlx/L7e1LARYLlWHTzobwQzvfmQVgMLJFzquofTxxHdqYxoOtxHwaPCWtCiw6OigbFsomQAuoSLOEPt3j5EiAWqSLTQd9AUgbi+ceQaM0udAOwWOBsheKuTEhgha3rQYfk6fCTTm8RNut1dRDitWz02XgZWWxet66SKOTDnD6Pm8NSzID9Z73/2QA7wlRBKcnD5412sDCe2csgGwv2I8abiFNRFBfNrmLdXFkjUshsn3GiDA5O412pIvCfVLNIEb+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046); SRVR:HK2PR06MB1011; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB1011; X-Forefront-PRVS: 085634EFF4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(2950100001)(3846002)(5008740100001)(86362001)(47776003)(122386002)(4001350100001)(4326007)(77096005)(50466002)(40100003)(23726003)(1096002)(2906002)(586003)(189998001)(19580405001)(36756003)(53416004)(42186005)(5001960100002)(50986999)(87976001)(92566002)(46406003)(33646002)(19580395003)(229853001)(83506001)(5004730100002)(76176999)(110136002); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB1011; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1011; 23:95vK5n9LSHw2q+zyeox/lmXf+tSYQuxv2Ct2OuRjAewaKgwaG6JeXMf/WGMJg1zhy++tllgJXsS3eG5YmoaM+9Afr17ZGNb6gHW+ND31XKkNVA662nLeiT5/vUkGKGbk/ZTTgQxtGUm3Zw4SEhCD0mrkBEr+13mSwcuPm9XNfNQogiLsdXWeb6aq/8OCpuQtARtRgNGMaVwuX1gqq6bop/Lejbsz8K5TklaL4xgCfOSZl2bbvg0PvpB4phqFS8UnsKCHkkmpT+9g3ebkCCwy0lfN/AgWPXugm0oUIC3LQIe+FeUk+2ddFjpgwYEpWadqrcZrSUA9xID1+T8tkfSBA68g161MhvmRa6Y8btpcE8Ar4hW6VcZ2SEO9lLgUNdED/qpkeVvcC6a1jNl6M9biFEoYqWVB2+EEhFe0lbbHKY2SZ81f6lBBkNGFByXE3xmtGVaAXWaxCmRvkgvQ0aZ0Mk37o0S3ijn/91S9jJwW0N+p1KbBOrUfOaJ27TFjPzdD2ejSCBrC3RM/EUw8fd0TQrZJJ9diCNWq5gJtQXpnyanlMMEaF+1+uNsN3HZMq0zLbgGjsDQB3R8OZCfLKYnZZ8SivmjfJK9znKNG0qjQYGvNAPTl3Y4jAusHXaq1szuzKc9RQJ6HhxsxdDR1BroT89bNTpI8CNk0oH4257q4bFjAns8uhw/y59OsR2eYA+feRxXbKiuKEEqxt2IToIdIhCYjwS4FwVOlYAwQUzXCAD8C60Gn1sSWtUU+rVsOuR2tFjpKkLA4och5tehX/ZdOwI+9j4y+xrQtrcqFl8fhk1fl+fjUATBr/ORRmE7a37UeOYMcuA3Sur5lcfI0b0us+6d9x7qRcu8VxVK1I9yt3hyBLzQU8zsh6waBPPNLDCfgpeZQl/sOYt0YDuaqApQ0Y3npFTJ26qLXrE8Kc5eq4 SWkCbJB4bED0IoVpDY23MI9 X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1011; 5:I4qLbssfDvbfP56RLrLRcVlvp7nv5TMpPIhCVSzEKIx5tInCvYe7mzJgG2L1WMEfVwOJNGNiovLvH9fRVU/uhxOxCxutxiT7OgUSO0OWbx99JgoiLGKt46CuHQ2/uo7szVpulOeQdjvAAGooTUHf4w==; 24:+YucZ5lZ9OYym9DpatkBFe3TtVg9iI0v0DigcbskR03Kn5aHgnJigNYtlfgDfeseXzF5D8h7qSupK6Sv04P9mzvLaX4VlsJaYZpMbneQUFk=; 20:pGyV2sUrADF1PUZjQAsrs/4YxdPbJaTnrYLBdDoERngHHmHrCJhMU9BPniLLittDEM7TpOu0k68iFRM7CNedw80HJBijE9D+BanQ8FMYKlLOdhrHq+fBZmv18Cx/GhTs0kUyOoz7tun+tTvh/DxVLs+Qkul9Sl0OfjjiURtzsQo= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2016 08:13:13.7856 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB1011 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto The channels number is not only for DVC. Let's rename it. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 2 +- sound/soc/sh/rcar/dvc.c | 6 +++--- sound/soc/sh/rcar/rsnd.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 5227aad..f65e93e 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -987,7 +987,7 @@ int rsnd_kctrl_new_m(struct rsnd_mod *mod, int ch_size, u32 max) { - if (ch_size > RSND_DVC_CHANNELS) + if (ch_size > RSND_MAX_CHANNELS) return -EINVAL; _cfg->cfg.max = max; diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index 302c193..d757f13 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -83,15 +83,15 @@ static void rsnd_dvc_volume_parameter(struct rsnd_dai_stream *io, struct rsnd_mod *mod) { struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod); - u32 val[RSND_DVC_CHANNELS]; + u32 val[RSND_MAX_CHANNELS]; int i; /* Enable Ramp */ if (dvc->ren.val) - for (i = 0; i < RSND_DVC_CHANNELS; i++) + for (i = 0; i < RSND_MAX_CHANNELS; i++) val[i] = dvc->volume.cfg.max; else - for (i = 0; i < RSND_DVC_CHANNELS; i++) + for (i = 0; i < RSND_MAX_CHANNELS; i++) val[i] = dvc->volume.val[i]; /* Enable Digital Volume */ diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index bbaf89b..61cb4ae 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -550,10 +550,10 @@ struct rsnd_kctrl_cfg { struct snd_kcontrol *kctrl; }; -#define RSND_DVC_CHANNELS 8 +#define RSND_MAX_CHANNELS 8 struct rsnd_kctrl_cfg_m { struct rsnd_kctrl_cfg cfg; - u32 val[RSND_DVC_CHANNELS]; + u32 val[RSND_MAX_CHANNELS]; }; struct rsnd_kctrl_cfg_s {