From patchwork Tue Oct 30 07:47:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10660553 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 5C17C1932 for ; Tue, 30 Oct 2018 09:06:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D2E7298B5 for ; Tue, 30 Oct 2018 09:06:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DFEE298D1; Tue, 30 Oct 2018 09:06:56 +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 6BA4C298D0 for ; Tue, 30 Oct 2018 09:06:54 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id AFAE52677E8; Tue, 30 Oct 2018 08:47:57 +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 E47F22677EB; Tue, 30 Oct 2018 08:47:55 +0100 (CET) Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01on0107.outbound.protection.outlook.com [104.47.93.107]) by alsa0.perex.cz (Postfix) with ESMTP id 6C1CF2675B8 for ; Tue, 30 Oct 2018 08:47:53 +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=unbNsgQHvoKHHF99myqRUDRggk+lInY7qG5it6/chQU=; b=KOKmhveMrJeUweGil1h3qAbNSWX4Baj0mCQLopJXhEweS7wBQX6oqmWJARt1rLRoqltsjPJRxn0gWddHuB6M7uJpZB2NM+7V4dWK39fKX6hJ8yByTK/ASn0iCr21iW10sUYqv0aH3O7QFoDLzpkvVgP2+9z6wnA7MGSesz194ig= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by TYAPR01MB3326.jpnprd01.prod.outlook.com (2603:1096:404:bb::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.22; Tue, 30 Oct 2018 07:47:50 +0000 Message-ID: <87bm7bsx26.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: <87ftwnsx93.wl-kuninori.morimoto.gx@renesas.com> References: <87ftwnsx93.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 30 Oct 2018 07:47:50 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY2PR02CA0031.apcprd02.prod.outlook.com (2603:1096:404:a6::19) To TYAPR01MB3326.jpnprd01.prod.outlook.com (2603:1096:404:bb::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4daa8b43-0878-48bb-b0be-08d63e3bfde0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYAPR01MB3326; X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB3326; 3:lpDyZ9gMTzgVLwnVij8W0GtEyAzaUtvXylx7KCDtlkguF9r78lHXaDLj1yt49GxAYyPKUGudCz4F4P0VX0JI5XOJ26/drnMUYHg2+8guwRvukj4r8Y/xfsdn62QluiVF3kCCxREh9/YzEMqvs/YBIsI/pVTZHQUNQYAn1JJt57L0jCNuXjjlanzlutVBS7Q2DwE/nrcb7CvFM8IH33w0onPPaOqsvCGSlXRnAxvM5qRxR6+nyuERuRQ89SWppd0f; 25:zhozSVPbV+XGqTWTV49mQj+bfSRJmR3KmdNRqbB1fkAe3lD+8//jdsW9OEfwNps1Z30017Qf9wpnaKcUk1hcc2poscbC21yJyAwzSP3jO/aVqshWdLFK8jBKPW+hqzePsRFH6W5/zolyXTZxWG+TuuXB56udQFXQXIPQ7VR3r8bwwGHBxnOzlbCFNHtQQgEA5dCB9N+GrXAHRrJAUNNCV5PtI+7qNdly6UBslCfzC7LFw1ZqIXsS1ZE8sHlENNIE/wuDmsVRzaxwDqJb9XrsneKvzjpxdWBYD1dOkc0SweofgdJxObxxAqxlqqoBQ0MYDmVhUIGAgsNCiTCmrKke7g==; 31:DO1LThIBcUtwQid3ZgHtmA9GBM0zCmdZ6fC5OtAnYcjzUCRUa3QpFp7dyPUKpHnw7BeQLxLmSCxad93z7oNUzYyoMd3WOLIcQZSHYbRifGstX2BLmVYjQhqZItkbhiEKn8vHPjGCAEP0Jsw0+WylOKSTbrgJr1ajDl1xnXYyC+di7nBrxUQObWwwmjmcBAnxmviBharKlymhQonVEuXHldOlOM/mZs1Ll0PoD1Ocido= X-MS-TrafficTypeDiagnostic: TYAPR01MB3326: X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB3326; 20:m5RfbFqq1K16eOazl1VAZv6mmmkNqkrPzD4n353mY3e1UBQRAqLQyf7tHX2GJKS1qrXG8M0zOqZj9Ka9jT7S1xqGbs8pGlrbPkubhXcy3pZsjt+KIDvAYsfVqJwAukciGEQtXesjHIatn/CviBqTIRTs1cyh3msVncFsmvP+p3zaVeTVHGyLj6CxW7c47/BdkDXHRexq9SR85Qzh64/7bxLeHgT9g3XJJ5n4piB64C/Qo9vHZB5YpWXB3hr/aFVq/jpHOIppNDyEAKDh7nDNFKTxeX0BwH92hOn/p7WMmUYc93YXUD4dVljD3ZBwrhwFfm21G+Z9WPWvGTz5RbjMMOaaDNN0Ey/wRr8nAJ+cY8kuynLwy/R/qdATO38cxGYBb6wRLalE5gpOy1LIS2Zad9UsiQ2K0FMLETB9aVP7lCotHqBU26Zvs7/qtPIAQ+hz+c+RD1jWMpmrI8f2WYKxM7EiV7wrwPwioOgFL5LTe5yL5Mw/XUjhX4AVLMjmm1NY; 4:tRIabzpa4aLBFphlFCeNy5FGk+9+4TaD6I/U72a2UoSWxINOIyJbe1BbCDbf2qouGIpOixG/Wabt/kaVZLLSG2VtYnkbOA8+MHFEj3pA4iaLfF3w9+lEEYAAgFBxYTYajzZPPDBVAykXRU+25prH8B4oBLxn6Up8TQGRwlc2yqi89tMMktQK9nySYG2UuVcQ17KQayeNewKN9MVvCzq8q8+oeoqBlZ8v/vyhGPr9t07qhFwgOw63Lnz5+mvE9O1m/Ei9oWt8r3yNQ/GXRDiDyA== 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)(10201501046)(3002001)(93006095)(93001095)(3231382)(944501410)(52105095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:TYAPR01MB3326; BCL:0; PCL:0; RULEID:; SRVR:TYAPR01MB3326; X-Forefront-PRVS: 08417837C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(366004)(376002)(136003)(346002)(39860400002)(199004)(189003)(5024004)(486006)(956004)(2616005)(476003)(14444005)(11346002)(446003)(47776003)(66066001)(2906002)(26005)(6486002)(36756003)(53936002)(86362001)(7736002)(305945005)(6116002)(3846002)(575784001)(50466002)(23726003)(58126008)(16586007)(81156014)(81166006)(8676002)(8936002)(68736007)(316002)(386003)(105586002)(4744004)(106356001)(7696005)(4326008)(52116002)(478600001)(97736004)(25786009)(6916009)(53416004)(69596002)(5660300001)(76176011)(16526019)(186003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYAPR01MB3326; 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; TYAPR01MB3326; 23:S4MObxSZpVyEwnRXYpoc61+jUHIzc6AnddGlCRfB3?= f5OBLMlrAPL6tYeiDxFP2oi08+EDqycY+CuDZe8mUeXptpgp0y09c7AOii2Lz/910D1b51dgvxn5wLmyAA7T4fLMdHRPMc8RUc/Ol8nevWoBGMA4NgZfVY9DGa6AZ/TRf2aNyMXWfN2TH1/FT/Q5sjI8CRQDqUIrLQ4Ct6jpibxf0hWOdr7ztg1Ile1N7L5KrXtM/Y7bk6rEZDNYajaGcQKWr/E4xyq/hYEyBsxGBnG4Tfof2zrsy6+zlMOvsQbA/Cznp8YlVVxR4AWx0li1FE1Nfn10DTpjMXj2RoWcS1Q0vuATs7Jvu3EdpQXZJScSHNlaJQ+4fDoijvUFNv/17T/xXwhP1dngfSeGDuybTZ8O7JhJ1AQj/VGFonf+DYcfKoY41CebyaR3xjzIj6alA1NB0k9eGpW2hKTSQsZe3FxvPhjoLloRJdIHxEjAlpX78+bWexAv+GnesEl7TOj+zFu7EIAKasCYOUzcTk268O+w9yCqlipjUWjPK8Iz8jlaNcCcHuDp6aXKZsP1uUEihScxVWQUFZdjG0+P3KzteGVsmcU1mQyMd9wYIUCM303RX45yZu81ucpQQOoEAZWLI3nYuCH86eED8VtcEbdMIIkhZ7LGyiMMqFuQkTIaTVDbsMtPalcZFIM6iGVBHVf2umnM9mbVgl9P17fiysUmEF6/+mOLCZz9UECjIP3xIP/jVIHbjpMWnZpbxgG1V6ANsG2rcZ7qNcETiAsWt/qdj12hEhFy08XrD77QDwZqu6cqx+hD628kuZwg4+9rqkVx9z4N4AuJxItYp4WcNmYZC1XfjeAeIIpcQPB7oPo29qFVlhwMFx81r3/YE7GgC87rvzb2kF/+px7E26wuUhM7k+8xDhN0dTddOrGOl/6BJ8yJiH+iLhlfrlv/OSJsn8/3OMqSW0+BLu0k0veMmktLI46vpaHA2hpVJjug2Taug3asIrJ2WZ00PMxbrWWjRqTmW90C6U89yx/80hSAr94vlpn2HZs3BGRzKMcJcktlEXWHufRw0J1c73Ahx3FDY/YoZ3hXTXmVSeKhaDlSohLx8STBnIo0gcDwTZBIpvU95rybcFDLGarDoleitxxhFJXJWk09ZWalSdcEwWhYvjNz/Uc/bLyfIjklK9sqZQ+1tMcxmglRz2rSHEWwsSc8e+DA1+IWgfHc6h5X0wv5snREr9+67ANXNnGFDE4BSLGHEKz8Xc= X-Microsoft-Antispam-Message-Info: 9TvBb+4KU/hdShwm9dhBsdoqilrpDxb2Mfmn5YWt2c3iMEkb4G+q2NAni+ZrhGsJlu9MjhsMPJDV2ai05k0Advg/C+LY1DmEYY0W1ehJ6F2A8hG9FuS6StiunHiqH/ONlZyfcbSJa4p9NW1CW9BHWyk0qbfgFfqXdbxVFSx2kIOxwValGjc6h1Z4VPEW/R52+3wG3/fJA/gixnKcQUEmmBzLaWeb+aIe1q3WaFkwz7LbGj16TB/nGBfl2yumhnqes2J7mA4OEhqO56jLcaAE8KmN/itiumg3MQnVg1hAU3ck+G5YaERBMofx6pmBKzhwauMYKxZYqt07mb/t9C0KXnCAqjZf/oDPAzGktEC06jI= X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB3326; 6:97jKtEx/b+2edBHoUYWDSZ8lstudrFbKwFjuIgAG/dAexkXntyHAtUs5yOc1XEb+aeDtWof0Ic1BiCrVDFAu2vBsQ/k/8871ebDmwQoAJUCjEqdBlY+NzI0dHg7fNhNxtdXLlKOJzMpCwzaYLLClfUQbJ2gH0BsbnfkX64agNoVs5sWlsukd2I10RQrCb8HudsfVib7XcmY15EIdaLenXoGoXHgRfEvTaZQk7of21mpe4UBSpsoRi6fWuOwde7G6gza7No0fDJZTdjcnnBFDCEJul1ZVq4qtpjwLoPwc8164DsAyaPhwZkuSvtBX45A8Ez37lQfIJbBmDaVR861Hy5BhaUkMm0xZk/RpgSEqYA+U1RrKIkLG5nr+dCP1WyMDKXm7QKMYBNVAw2iT7qarwqJZokXPzHw7nuFq0Ts15lRLCplAf6PYdYfvYsSlNq9m9OV4ZCVJSOuACDPVXaOG0A==; 5:ckftNVoiq7GtC6rG+MPU0HXyQdoZ6lRagMzvm8fJnyR2Gv0MXPA8bl3cUvdXUAXCIZQv27MtwoysseMObpZUbTYaiSU2UDlDswbydYm6YoCxoXnzctlUPyITZbj4HpRBqiq9YzOgFE2NWEDkIyedfCELZ/wcOIGzkoowMMD9Ubw=; 7:sEfgNBFnl6/DJh2BB6MH3rGZeUWexWyJHKwWo74IydpDaC5XtRhWcguLmynKoL+QNwNPsUSOxXvzPIffMAjcrkz5mPCay5cuG+CstEM/BV9A3uU/Erp9cyYaH9xD56eKcMEAwPGWepVt78wZ6SjCQYZcKwJeMNnuKgLRyU5vnW2Gy/PdPp7DzbzGOeTaECjkNEwgeSy+D3hF2vX2SF6UedQ9pqe3XOBOW6TI3skxl0NXFN5gGaH29hQZNyVjyIbe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB3326; 20:nQ3Vc7JMwXAoN7WR9E0aFD8Q1U01Fp1WefPXuU00mBy82kejwigKnw4Bi9e6OSw0VKb1PXi0iJxeqc5yACrOwnyMCRj57DWycIAQ2eY736ssJxUMFuMSZU28Z+/V0bYSDJzjF4TTIY6EzZw+4AkceShKWV//KJMQKRLPrRKKZm4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2018 07:47:50.2427 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4daa8b43-0878-48bb-b0be-08d63e3bfde0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB3326 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 3/3] ASoC: rsnd: rsnd_mod_name() handles both name and ID 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 is using "%s[%d]" for mod name and ID, but, this ID portion might confusable. For example currently, CTU ID is 0 to 7, but using 00 to 13 (= 00, 01, 02, 03, 10, 11, 12, 13) is very best matching to datasheet. In the future, we will support BUSIFn, but it will be more complicated numbering. To avoid future confusable code, this patch modify rsnd_mod_name() to return understandable name. To avoid using pointless memory, it uses static char and snprintf, thus, rsnd_mod_name() user should use it immediately, and shouldn't keep its pointer. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 41 ++++++++++++++++++++++++++++++++--------- sound/soc/sh/rcar/dma.c | 21 ++++++++------------- sound/soc/sh/rcar/gen.c | 12 ++++++------ sound/soc/sh/rcar/rsnd.h | 2 +- sound/soc/sh/rcar/src.c | 5 ++--- sound/soc/sh/rcar/ssi.c | 23 ++++++++--------------- 6 files changed, 57 insertions(+), 47 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 82d2234..5e10012 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -123,8 +123,8 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type) struct rsnd_priv *priv = rsnd_mod_to_priv(mod); struct device *dev = rsnd_priv_to_dev(priv); - dev_warn(dev, "%s[%d] is not your expected module\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + dev_warn(dev, "%s is not your expected module\n", + rsnd_mod_name(mod)); } } @@ -137,6 +137,30 @@ struct dma_chan *rsnd_mod_dma_req(struct rsnd_dai_stream *io, return mod->ops->dma_req(io, mod); } +#define MOD_NAME_SIZE 16 +char *rsnd_mod_name(struct rsnd_mod *mod) +{ + static char name[MOD_NAME_SIZE]; + + /* + * Let's use same char to avoid pointlessness memory + * Thus, rsnd_mod_name() should be used immediately + * Don't keep pointer + */ + if ((mod)->ops->id_sub) { + snprintf(name, MOD_NAME_SIZE, "%s[%d%d]", + mod->ops->name, + rsnd_mod_id(mod), + rsnd_mod_id_sub(mod)); + } else { + snprintf(name, MOD_NAME_SIZE, "%s[%d]", + mod->ops->name, + rsnd_mod_id(mod)); + } + + return name; +} + u32 *rsnd_mod_get_status(struct rsnd_mod *mod, struct rsnd_dai_stream *io, enum rsnd_mod_type type) @@ -494,15 +518,14 @@ static int rsnd_status_update(u32 *status, __rsnd_mod_shift_##fn, \ __rsnd_mod_add_##fn, \ __rsnd_mod_call_##fn); \ - rsnd_dbg_dai_call(dev, "%s[%d]\t0x%08x %s\n", \ - rsnd_mod_name(mod), rsnd_mod_id(mod), *status, \ + rsnd_dbg_dai_call(dev, "%s\t0x%08x %s\n", \ + rsnd_mod_name(mod), *status, \ (func_call && (mod)->ops->fn) ? #fn : ""); \ if (func_call && (mod)->ops->fn) \ tmp = (mod)->ops->fn(mod, io, param); \ if (tmp && (tmp != -EPROBE_DEFER)) \ - dev_err(dev, "%s[%d] : %s error %d\n", \ - rsnd_mod_name(mod), rsnd_mod_id(mod), \ - #fn, tmp); \ + dev_err(dev, "%s : %s error %d\n", \ + rsnd_mod_name(mod), #fn, tmp); \ ret |= tmp; \ } \ ret; \ @@ -529,8 +552,8 @@ int rsnd_dai_connect(struct rsnd_mod *mod, io->mod[type] = mod; - dev_dbg(dev, "%s[%d] is connected to io (%s)\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), + dev_dbg(dev, "%s is connected to io (%s)\n", + rsnd_mod_name(mod), rsnd_io_is_play(io) ? "Playback" : "Capture"); return 0; diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index e5c30ee..5daa6c9 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -174,8 +174,8 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod, cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - dev_dbg(dev, "%s[%d] %pad -> %pad\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), + dev_dbg(dev, "%s %pad -> %pad\n", + rsnd_mod_name(mod), &cfg.src_addr, &cfg.dst_addr); ret = dmaengine_slave_config(dmaen->chan, &cfg); @@ -369,8 +369,7 @@ static u32 rsnd_dmapp_get_id(struct rsnd_dai_stream *io, if ((!entry) || (size <= id)) { struct device *dev = rsnd_priv_to_dev(rsnd_io_to_priv(io)); - dev_err(dev, "unknown connection (%s[%d])\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + dev_err(dev, "unknown connection (%s)\n", rsnd_mod_name(mod)); /* use non-prohibited SRS number as error */ return 0x00; /* SSI00 */ @@ -692,12 +691,10 @@ static void rsnd_dma_of_path(struct rsnd_mod *this, *mod_to = mod[1]; } - dev_dbg(dev, "module connection (this is %s[%d])\n", - rsnd_mod_name(this), rsnd_mod_id(this)); + dev_dbg(dev, "module connection (this is %s)\n", rsnd_mod_name(this)); for (i = 0; i <= idx; i++) { - dev_dbg(dev, " %s[%d]%s\n", + dev_dbg(dev, " %s%s\n", rsnd_mod_name(mod[i] ? mod[i] : &mem), - rsnd_mod_id (mod[i] ? mod[i] : &mem), (mod[i] == *mod_from) ? " from" : (mod[i] == *mod_to) ? " to" : ""); } @@ -762,12 +759,10 @@ static int rsnd_dma_alloc(struct rsnd_dai_stream *io, struct rsnd_mod *mod, if (ret < 0) return ret; - dev_dbg(dev, "%s[%d] %s[%d] -> %s[%d]\n", - rsnd_mod_name(*dma_mod), rsnd_mod_id(*dma_mod), + dev_dbg(dev, "%s %s -> %s\n", + rsnd_mod_name(*dma_mod), rsnd_mod_name(mod_from ? mod_from : &mem), - rsnd_mod_id (mod_from ? mod_from : &mem), - rsnd_mod_name(mod_to ? mod_to : &mem), - rsnd_mod_id (mod_to ? mod_to : &mem)); + rsnd_mod_name(mod_to ? mod_to : &mem)); ret = attach(io, dma, mod_from, mod_to); if (ret < 0) diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 1f7881cc..ca63940 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -83,8 +83,8 @@ u32 rsnd_read(struct rsnd_priv *priv, regmap_fields_read(gen->regs[reg], rsnd_mod_id(mod), &val); - dev_dbg(dev, "r %s[%d] - %-18s (%4d) : %08x\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), + dev_dbg(dev, "r %s - %-18s (%4d) : %08x\n", + rsnd_mod_name(mod), rsnd_reg_name(gen, reg), reg, val); return val; @@ -102,8 +102,8 @@ void rsnd_write(struct rsnd_priv *priv, regmap_fields_force_write(gen->regs[reg], rsnd_mod_id(mod), data); - dev_dbg(dev, "w %s[%d] - %-18s (%4d) : %08x\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), + dev_dbg(dev, "w %s - %-18s (%4d) : %08x\n", + rsnd_mod_name(mod), rsnd_reg_name(gen, reg), reg, data); } @@ -119,8 +119,8 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, regmap_fields_force_update_bits(gen->regs[reg], rsnd_mod_id(mod), mask, data); - dev_dbg(dev, "b %s[%d] - %-18s (%4d) : %08x/%08x\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), + dev_dbg(dev, "b %s - %-18s (%4d) : %08x/%08x\n", + rsnd_mod_name(mod), rsnd_reg_name(gen, reg), reg, data, mask); } diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index fdf007a..28bd90a 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -377,7 +377,6 @@ struct rsnd_mod { #define __rsnd_mod_call_pointer 0 #define rsnd_mod_to_priv(mod) ((mod)->priv) -#define rsnd_mod_name(mod) ((mod)->ops->name) #define rsnd_mod_power_on(mod) clk_enable((mod)->clk) #define rsnd_mod_power_off(mod) clk_disable((mod)->clk) #define rsnd_mod_get(ip) (&(ip)->mod) @@ -400,6 +399,7 @@ u32 *rsnd_mod_get_status(struct rsnd_mod *mod, int rsnd_mod_id(struct rsnd_mod *mod); int rsnd_mod_id_raw(struct rsnd_mod *mod); int rsnd_mod_id_sub(struct rsnd_mod *mod); +char *rsnd_mod_name(struct rsnd_mod *mod); struct rsnd_mod *rsnd_mod_next(int *iterator, struct rsnd_dai_stream *io, enum rsnd_mod_type *array, diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 7de7afd..bdc0595 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -349,9 +349,8 @@ static bool rsnd_src_error_occurred(struct rsnd_mod *mod) status0 = rsnd_mod_read(mod, SCU_SYS_STATUS0); status1 = rsnd_mod_read(mod, SCU_SYS_STATUS1); if ((status0 & val0) || (status1 & val1)) { - rsnd_dbg_irq_status(dev, "%s[%d] err status : 0x%08x, 0x%08x\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), - status0, status1); + rsnd_dbg_irq_status(dev, "%s err status : 0x%08x, 0x%08x\n", + rsnd_mod_name(mod), status0, status1); ret = true; } diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index cb66986..a032819 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -181,8 +181,7 @@ static void rsnd_ssi_status_check(struct rsnd_mod *mod, udelay(5); } - dev_warn(dev, "%s[%d] status check failed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + dev_warn(dev, "%s status check failed\n", rsnd_mod_name(mod)); } static u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io) @@ -346,9 +345,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, ssi->rate = rate; ssi->chan = chan; - dev_dbg(dev, "%s[%d] outputs %u Hz\n", - rsnd_mod_name(mod), - rsnd_mod_id(mod), rate); + dev_dbg(dev, "%s outputs %u Hz\n", rsnd_mod_name(mod), rate); return 0; } @@ -494,8 +491,7 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod, return 0; if (!ssi->usrcnt) { - dev_err(dev, "%s[%d] usrcnt error\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + dev_err(dev, "%s usrcnt error\n", rsnd_mod_name(mod)); return -EIO; } @@ -654,8 +650,8 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, /* DMA only */ if (is_dma && (status & (UIRQ | OIRQ))) { - rsnd_dbg_irq_status(dev, "%s[%d] err status : 0x%08x\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), status); + rsnd_dbg_irq_status(dev, "%s err status : 0x%08x\n", + rsnd_mod_name(mod), status); stop = true; } @@ -964,8 +960,7 @@ static int rsnd_ssi_fallback(struct rsnd_mod *mod, */ mod->ops = &rsnd_ssi_pio_ops; - dev_info(dev, "%s[%d] fallback to PIO mode\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + dev_info(dev, "%s fallback to PIO mode\n", rsnd_mod_name(mod)); return 0; } @@ -1085,15 +1080,13 @@ static void __rsnd_ssi_parse_hdmi_connection(struct rsnd_priv *priv, /* HDMI0 */ if (strstr(remote_node->full_name, "hdmi@fead0000")) { rsnd_flags_set(ssi, RSND_SSI_HDMI0); - dev_dbg(dev, "%s[%d] connected to HDMI0\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + dev_dbg(dev, "%s connected to HDMI0\n", rsnd_mod_name(mod)); } /* HDMI1 */ if (strstr(remote_node->full_name, "hdmi@feae0000")) { rsnd_flags_set(ssi, RSND_SSI_HDMI1); - dev_dbg(dev, "%s[%d] connected to HDMI1\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + dev_dbg(dev, "%s connected to HDMI1\n", rsnd_mod_name(mod)); } }