From patchwork Wed Jul 15 07:10:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6793631 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 3E1FDC05AC for ; Wed, 15 Jul 2015 07:13:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 71F57205F4 for ; Wed, 15 Jul 2015 07:13:31 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4EBB7204E0 for ; Wed, 15 Jul 2015 07:13:30 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6DD592659A7; Wed, 15 Jul 2015 09:13:24 +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 C0FE3265862; Wed, 15 Jul 2015 09:11:18 +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 77764265862; Wed, 15 Jul 2015 09:11:17 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 4633326589D for ; Wed, 15 Jul 2015 09:10:08 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 15 Jul 2015 16:10:07 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 1779C44ABF; Wed, 15 Jul 2015 16:10:07 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 0F8A82806F; Wed, 15 Jul 2015 16:10:07 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 03C382806D; Wed, 15 Jul 2015 16:10:07 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id SAS24129; Wed, 15 Jul 2015 16:10:07 +0900 X-IronPort-AV: E=Sophos;i="5.15,477,1432566000"; d="scan'";a="190394343" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Jul 2015 16:10:06 +0900 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from morimoto-PC.renesas.com (211.11.155.144) by HK2PR06MB0595.apcprd06.prod.outlook.com (10.161.187.146) with Microsoft SMTP Server (TLS) id 15.1.213.14; Wed, 15 Jul 2015 07:10:04 +0000 Message-ID: <871tg9x5k2.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: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> References: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 15 Jul 2015 07:10:04 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0005.apcprd02.prod.outlook.com (25.164.90.143) To HK2PR06MB0595.apcprd06.prod.outlook.com (25.161.187.146) X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0595; 2:wTbvw93NH06RTrLfYQGSx5G4ClcetMSqBsri0W6nkc1D43MwyfX0sOP4d3lDUKVu; 3:QzHvGIoSfy4qMw+GeC9Gks9nZVm7eWjX7ubMOyH90ZNtH3OBoyFZJh4FpjMboCrnhPKb5b2C4McNhOlkhZyP4I9/8XHItB3GdKAT5BF+U9bd9zCvbaKOhRGvb8RTa4h0clVM93XQ7A+CLDqvIXITtA==; 25:ZzGIwPcGrHzgDKjNPwboSKxQt/lbtNb3K+BXRwdCuIoeqkkzIFB8WFFb4Nx6AcijXvJbsTKFx1AtFnBu02Foc6lu2aTdp4xcqX+IJJBZElOJ0NY7q1P1UXtPiw5DzYOpq6CHOzd9dqcjNS6AtWFUbJ3FHDVJvkHXew+xfy943Xp0/xk4TxfofNntWjjUB8Og55eOxJYQ4n+GzP9J2zvOU6hs+t0ICRf/XMUfX+YT1+VDvvd4hQFEBq6zCaz3/s1z X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB0595; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0595; 20:R6v6ByZkVoLxr6sxyAx+OjwsRgrgXNjH2aGgWMi8qkRLjah4i51LlREQhNI3WdSES0VWzq+VVdSEPXCv4tB+YN4BzT7rJh/UmSa8ZR5yw3Fre7x3Nha7rY3lF5mVvQESvwywnYTe9kYvtkpWUni5szs8LiTrfJVW4Z24WPJsfRriTJghFCg1D/TBIwwwtKLMkjIU9wUP5VP1iBaPGzpKG0JmhDrma5dYgJnCof/tQDXDzhjfVjLkLELHZzLoHrc5w3i2O9/lmURn1yi7RHqLm9XPMUktfVKjivAKSle04mxzqvVa4NdLT2ey7eak8YSs7vYPmWo3S7VDgp/Jsp227mE3StJL8t1C7O7zfehLIHrcbSjWmZzZypNcm/OI6xPj8c1NaE6GdRE6Bk0i1e5wAXe5TuHJwwjz2BKsHVV8RaSsR9i3awwx8qMpuuUWl/eLWw10HjB1LQ0agq0Q01WdX3eHKwEGYBEidW3xuo7Et4mqyGzhh4EMH2AZCbZsrp2i; 4:zhRVmEPh6Hu1MhFStuBPZXLAQmQfd0+7EvL4oeYNvYbsxkBDd0Up0/j5LaenJ4ND8t1QHd44Z2LjW04lmFwDr7F4h4Oc096s1G90m/QuzCBl/GsnAsDK2qknkEf5MHJ2rMSH7A+y1c2pDJWEq8pf7yJlOKSs+vAmqEyygdbs+EfQhPU3gK5lpvDwYZgRRSFuRS2zIMLxaEMPX+JWuwz4Yl+RjXdtMsfh4SnVEZKySUoto+NRIpBdYLFM4JlxITjDp6zOCS6JSIJsISx+H5MCPA0rMEhw2aiz0Uj9qxM9Zms= HK2PR06MB0595: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:HK2PR06MB0595; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB0595; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(53416004)(229853001)(4001350100001)(47776003)(86362001)(77096005)(23726002)(92566002)(66066001)(36756003)(50466002)(2950100001)(62966003)(33646002)(77156002)(87976001)(83506001)(46102003)(189998001)(122386002)(54356999)(19580395003)(40100003)(42186005)(19580405001)(110136002)(107886002)(5001920100001)(46406003)(76176999)(5001960100002)(50986999)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB0595; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0595; 23:CLSI10mk6O05r0LnWsOjsHIn2bCUYMR3mGN7jmprMM0d45z/MYw8soTdQYF6S+7UH8CVBQ2ZVdoAf6ZIjyQ2XWwcC+4llV0qZwqpsbDBdJi96oK8jZ4FXZY8Oq9+Vm/82UNvJ9yvFe+DTubV49UCUIvwbMsGtQJlcAf3rXJ0+F2To0l1zmY1kR9PePNi9YGXx/NPKAMnk0dKEArVP57cfB7p0mDU6/ZV1XNxaGtlzKuA0t73BWuWbeeSmh/oMGK6jrCBH+Nrb+WvxpGzmjdXp9ubjqU9jUn0WI5Xdekg8HX6dj3QPBB2DeUfAyn7qlf0/X6RF+1COVTdBIlO8IdIP3zHJzQw5O869TKHkR8D2VxsOscnhhl6FSYVFb/2czKZK//VeUvFK7u87MjkjRC0/ojvJC6rJLlvpQiAffC+sLhIRda5dgC08tGXXiZfaZ949UpJudEAfVhAZFuag3HPrviLMn2z9Y0U6xfsv9SfO4Ou5ispZ7lWr3YMTt6mIQzHg10gX6rR2pesb8Itwh5jzPuL+kpCxvP7xKy11WhmpxSp/A4q50EWl/R88FjMGHHdl9q3Vp1N7iJIy6wTLl7SYJAxOOkYuKccSLt5T4UHDaQ3L+prCOOiJAvtXhNwvYq/Uf9U0znyUPjCafV1hTTsCZy7rY9rLovGVXetp/2KHcR3NUF4dpRpauUKQHkXMeeNxSHQn1Z+gjAbgLO1n7fEgoR8Jay2hsU6Gen3V8O4DmIHlKsrS2u9QlGZpMdwZiOzafPyijTZsd54UL2wPLuTDVcQOWbaOaKFU3+upsRA0yNCVbZC0eSX1fGQg294IEO9bEIfxmMCj/vFFJ7gfVjiYHQZjXNyDp/joWcHDr/nNopCMISWgr/FFYqSINdgR05I0FqH85/Jf2nv1kYc6t07a/oHyS+dM+79OiHJ6Li2KTS8Tbna5mzsAabqk1fDM2R5 X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0595; 5:kqJkYTV86zX1uEmKTyi/esrllOhweAlPTkBn0Jb0aPdpalOX5zX68X/O/QASbmmwlE7oPH/iGIHXTfkWgQU4dSmcBbTgD82bGEzBc+9us2JArkVhvJx9Hu+21lNKD+I2hCY0DssIYmgkm1NR7eF2WQ==; 24:ExoJBUVxbg0aHOLThpg5Gm54BClTQONqq/Gvyp/1Yu0dhTvETCpGtv7T7fd/SD5gVGqcCUdD7kpZF8xntXRZN3DtQEEBu5azQRsseE5WHOw=; 20:T2fvDkdPztoG20i8WV3mki+LQHwb9MoznGfK5vaIURsK+fifYxLjc0H/hsMj5eyTykg2OBVjbpSksCZSJamYUacV1ose1PI4767xJYw51ZKG5VZNC8wbqPCsfxp6w+9MzkSGrszOLzLJcigTGUVgGj/FJBRaXz/4RTI6An5J880= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 07:10:04.7466 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB0595 Cc: Linux-ALSA , shiiba , Liam Girdwood , komatsu , kobayashi , Simon Subject: [alsa-devel] [PATCH 08/35] ASoC: rsnd: fixup each module counter on __rsnd_mod_call() 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 '5451ea443b ("ASoC: rsnd: count each mod (SSI/SRC/DVC)")' counts each module's callback status, but counts 1st callback only. This patch fixup it. Otherwise, multi-called function will be trouble Signed-off-by: Kuninori Morimoto Tested-by: Keita Kobayashi --- sound/soc/sh/rcar/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index f1e5920..d44bfb7 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -242,9 +242,9 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod, struct rsnd_dai_stream *io) if (val == __rsnd_mod_call_##func) { \ called = 1; \ ret = (mod)->ops->func(mod, io, param); \ - mod->status = (mod->status & ~mask) + \ - (add << __rsnd_mod_shift_##func); \ } \ + mod->status = (mod->status & ~mask) + \ + (add << __rsnd_mod_shift_##func); \ dev_dbg(dev, "%s[%d] 0x%08x %s\n", \ rsnd_mod_name(mod), rsnd_mod_id(mod), mod->status, \ called ? #func : ""); \