From patchwork Thu Nov 26 11:11:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7705941 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 ED3E1BF90C for ; Thu, 26 Nov 2015 11:13:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2794207BC for ; Thu, 26 Nov 2015 11:13:33 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 9DB35207B8 for ; Thu, 26 Nov 2015 11:13:32 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C5AAD261A34; Thu, 26 Nov 2015 12:13:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B99122666B7; Thu, 26 Nov 2015 12:12:42 +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 45F9D2666B7; Thu, 26 Nov 2015 12:12:41 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id C44A42666C8 for ; Thu, 26 Nov 2015 12:11:49 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 26 Nov 2015 20:11:47 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 9E5784BEF6; Thu, 26 Nov 2015 20:11:47 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 9D772480A3; Thu, 26 Nov 2015 20:11:47 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 798B3480A7; Thu, 26 Nov 2015 20:11:47 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id WAH15845; Thu, 26 Nov 2015 20:11:47 +0900 X-IronPort-AV: E=Sophos;i="5.20,346,1444662000"; d="scan'";a="199367520" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 26 Nov 2015 20:11:47 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HKXPR06MB1014.apcprd06.prod.outlook.com (10.161.178.156) with Microsoft SMTP Server (TLS) id 15.1.331.20; Thu, 26 Nov 2015 11:11:46 +0000 Message-ID: <878u5lc90h.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 26 Nov 2015 11:11:46 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0017.jpnprd01.prod.outlook.com (25.161.131.155) To HKXPR06MB1014.apcprd06.prod.outlook.com (25.161.178.156) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1014; 2:RTik7VydMEgkzwrMpFcOUM54zfqWeLrAMLI1TlmHCDsuBx0JiT1AM7MNGdgRzBbMM7a21Y1jmddwX4r/fz7rW2D0BGDMhHRug5wNwcJKraIdxovfpxNgc+F56RHA8+7udrS71XqJJQBxbD0iExZYJg==; 3:2kSRf5sAiZyLNuz0L7CzinPbU+lyjzNw+N4u/zOA+n4NluuiQu3IYbu7r7UwVH1gqVyGX/GetwK9JIj9z8O1dknv/qM8DaJgsa/lq3hbQA1J2ALt5yUqaBvM/UdaDW17; 25:hMtItZ/q3SOgigd9pIa3YA4ipitJvd2I2S4XH1lpHKFsDRO3kzXfbFFuw+PHS7DipMT2n0CC+c26x6g08U6vjfrU4irFtV232ukZJ5XOzXfWUw+NsVz9bar9vAm1GcHQu7uSS3+g9f28oGHR9rgvDjuIjNUg+5PHj+IJn7StTC6lfYDWV7/PZlsM5MjtUs+bUtxmRqX7ocZnJ61dS/q6ASMuBpansfkOlk8n5t47bd9W/xbWzBNvZg3dG/+NwzgLSwJ8PHAaamnYJShSEQMgOA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1014; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1014; 20:UG0tjs/DJAYMO3weLVI/s3P6yxLyyuRzVzR9LD05RGEO33qmLFy2DL5aMQv9Bdd6MCiPrc0IxeL1HWFbsrY/0uX9tSKIKCxmXglHMX2NRbRz4WjtkjOAf6lWrPHvt6K3tUqKDH0y7jhTqykE610byS2Ubcq5md9fVNpLAUv/xO9b2TRAofC4xCmBXmZtnZjXLTvFt6xu4lV5CHqnvIJVttFwKQI07PwTBXert1HXVVIn66yHrHfthJKjgBLfqe2n4WC12ZDFv7NiR2qr0gPOKZkDYJPNv9juMF8vuKSNDAFYAAy97mMAHyotXDpG3Xpj9koyB9lQHC+udg7UiSq6Sx4/zUvuMnAiZA/fSOoKODfSiU5/AhXK/afn59zgffWuwGgLGb5of3FkFQhMi2HJNgXCKVeqL4m5dlBX/toKC8f3BxSEV/4B4nuT1bhFjfPW+AElZV6xg6kH2IVCjFbXMnYOYm7V3aLYPBftazVJNqDlaTmD4F+OgN/vHJEhm9Fx; 4:p4b5dcx9Ft5BS1Hps/TqP/2KQOzqznfwklS8EjO++p2lt2hp+6o7F1AINXto9K4C+9+iHZwhxq1AVc3Du4ISSLfkK9ApRT36G2b1zpktSn78C3Vy5CKdYxUszq1eZv4rgpRVelhsCiYGklNMfSFtj4bFdDOOer1j+NnrzZICJfwT0B+JhOXqVjLDZMPTTm5nWimZ6b+6N+uJWbp7JzPPJNX/TPfi5Tze4LqDmZiiHgZAZb+AJSXg7rqaXTNpuUBMLi/TI1R2RKV/cwTTRiZsv7eI7/BrpPVyo0YQd5VIoWffHZTSMz9iGRCrbfO5CsiFtP+ZQICt34XHMSgXi3blxsUQYXgcxkRDSMF3iOB9nTM3uXMLajVHWOK00/252ZA5UlF273h2C4vtpet+/X1yDTbfGE5o3F5I+gsu5avh8gdBVXYfLJbWlvCcdgt4PEW3 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(10201501046)(3002001); SRVR:HKXPR06MB1014; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB1014; X-Forefront-PRVS: 0772E5DAD5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(19580405001)(53416004)(122386002)(77096005)(42186005)(33646002)(40100003)(86362001)(83506001)(47776003)(229853001)(105586002)(1096002)(87976001)(5001960100002)(66066001)(36756003)(189998001)(54356999)(3846002)(81156007)(97736004)(5008740100001)(106356001)(50986999)(110136002)(4001350100001)(586003)(69596002)(46406003)(23726003)(101416001)(6116002)(92566002)(5004730100002)(50466002)(19580395003); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB1014; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB1014; 23:XU8tLmfiQhI3aE1KZ4oUdb/HmAhT8+eDe9uZfWndU?= =?us-ascii?Q?3bQSBVOTSemZgblgjHdY+Z546CMgCLmWvDxDwj+l7GPoUbFjYrdUxvvo2uJG?= =?us-ascii?Q?st42VYf5mISqOuLOK15fXZW6ChvVkH7Zijlt1fG3iCrVQLqmq3wINYYvTb9l?= =?us-ascii?Q?9saQOOh3ogL0CdL4J6T2OhRMmR+4hwknA6K5zsemRO0/2686RHql9Y1mlMd4?= =?us-ascii?Q?48y5ernu+orgtrHqRaPYoD0lIlacjNF8XHQv3mbi/eVhw/VQpGsa9GHEjXy1?= =?us-ascii?Q?SFeB7ZK64FiK0KFIiS3L+ygy4B3xUldptk7wn6vjiY2a1kk0tLY4V2LKKyyr?= =?us-ascii?Q?T9BZ56YyhL6kQ35rrj4F6k7flsh1r6T32EX/fllQrL5n0eYOHyXvTzzjKe4U?= =?us-ascii?Q?odgYZB4kRLkZSwpBcfE4TwIlUqyzmj6HYDpZjJ4Gv7/00uhMLFnPlAufpiHQ?= =?us-ascii?Q?jeAQULx1a5ET7YeUdLX8qtmH+j9ZP8Qng1RAKsiRH6ydhk+o0GuCtUSs1eEn?= =?us-ascii?Q?Ct7Zxczs0QPCng+725SbdIvaicbkILrmNCEaPqSE4WjVj6HevcEYarJ34oop?= =?us-ascii?Q?14s9aFUrk78QF3o7wHQT+lLi5geF+sHR8mH0noSie9yDFclsnPCt45aBMo9i?= =?us-ascii?Q?WufQ109yQ+6s2f0jmvWHNzFp9/FjAqUiSRKjUZBJmF25jty2j4ahMrKDcW8E?= =?us-ascii?Q?v2GMl6zlsiPuwQrrtbGWV+9NTXymD+By/wSSPSAcJTcGu+4AEGQsKtpdQXZ+?= =?us-ascii?Q?ucosUgM6FrS0yrPYqWQNYvjFYp8Mk/oa9maFRs9TTYvrxlZ7ZFlGM3aT/JpR?= =?us-ascii?Q?ovII5LR68ae0B8luV+NbPSG8rN6+S0bz6RfF8PUfVpFtcFms4NvgC8I/iSJO?= =?us-ascii?Q?6WLjtw+Olg4GlvR5WP3WxfEqKJ/z2eEjRufqzVDzxvqmP+TKVQAaAZGswB3f?= =?us-ascii?Q?niLCZjuppVUmYPJLi7ehimPCl8YJA6qSnGXQMYkn7NzX+1F/fzyCs1TbDuj0?= =?us-ascii?Q?94qsmzaTHcOfJVxCaJayrZScnYOx4JnYx27RJFiCUwpj/MH5iTpYZdb1Aq3V?= =?us-ascii?Q?SjAnC8=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1014; 5:caCvCZEO0zCFrMfqiTdmJvRD17Xw+GyATGVHCbyJwmWjz0pNENzfz98S/ZsBQUhlU6SbMzr2PL1ZwxOvk0LF7ennihw1rh5iUp0WLp8fGT7Av8ReBCo8RKz4qeUsGPcPix59xyeM7QBMdN5Vqp1/9Q==; 24:VYARt/VxDJR7BF1/AYcW2oCL1MWwS5eILP7xc/o44QW/VAatuqB8PlomhSOhdWKJYQoit8OlqBFjKHGstzoB0j7jiY1i2xoFCAIqQt8msZQ=; 20:Ary2chZZHMTURlHnYP7dc00X4Lh9JWPG+l+DWwb4WO3ZPB/hOROFWrd4pmxQLGDGeCChdpfw6lknjfCH0Fx5gClWrAomNDpHlB26IiTfM1a1BijtoRV8qLOaXqQ0p1bDpHtMfh+bpBjW0wq/yc3kjlelIrw16nNwT+knCeQ8nnE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2015 11:11:46.1185 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1014 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH] ASoC: rsnd: tidyup semantics of rsnd_src_record_error() 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 rsnd_src_error_record() should recorde error, but it clears error too. this patch fixes up semantic of rsnd_src_error_record that it records error but doesn't clear error. And this patch renames rsnd_src_error_clear() to rsnd_src_status_clear() rsnd_src_error_record() to rsnd_src_record_error() Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/src.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index c103aa7..6d93c4e 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -300,7 +300,7 @@ static void rsnd_src_irq_ctrol(struct rsnd_mod *mod, int enable) rsnd_mod_bset(mod, SCU_SYS_INT_EN1, sys_int_mask, sys_int_val); } -static void rsnd_src_error_clear(struct rsnd_mod *mod) +static void rsnd_src_status_clear(struct rsnd_mod *mod) { u32 val = OUF_SRC(rsnd_mod_id(mod)); @@ -308,7 +308,7 @@ static void rsnd_src_error_clear(struct rsnd_mod *mod) rsnd_mod_bset(mod, SCU_SYS_STATUS1, val, val); } -static bool rsnd_src_error_record(struct rsnd_mod *mod) +static bool rsnd_src_record_error(struct rsnd_mod *mod) { struct rsnd_src *src = rsnd_mod_to_src(mod); u32 val0, val1; @@ -332,9 +332,6 @@ static bool rsnd_src_error_record(struct rsnd_mod *mod) ret = true; } - /* clear error static */ - rsnd_src_error_clear(mod); - return ret; } @@ -383,7 +380,7 @@ static int rsnd_src_init(struct rsnd_mod *mod, rsnd_src_set_convert_rate(io, mod); - rsnd_src_error_clear(mod); + rsnd_src_status_clear(mod); rsnd_src_irq_enable(mod); @@ -434,7 +431,7 @@ static void __rsnd_src_interrupt(struct rsnd_mod *mod, if (!rsnd_io_is_working(io)) goto rsnd_src_interrupt_out; - if (rsnd_src_error_record(mod)) { + if (rsnd_src_record_error(mod)) { dev_dbg(dev, "%s[%d] restart\n", rsnd_mod_name(mod), rsnd_mod_id(mod)); @@ -450,7 +447,9 @@ static void __rsnd_src_interrupt(struct rsnd_mod *mod, rsnd_mod_name(mod), rsnd_mod_id(mod)); } + rsnd_src_status_clear(mod); rsnd_src_interrupt_out: + spin_unlock(&priv->lock); }