From patchwork Mon Feb 15 05:24:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 8309811 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 5DDE1C02AA for ; Mon, 15 Feb 2016 05:29:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A348204DE for ; Mon, 15 Feb 2016 05:29:17 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 3B08420416 for ; Mon, 15 Feb 2016 05:29:16 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 67AA8261585; Mon, 15 Feb 2016 06:29:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 78C562619D8; Mon, 15 Feb 2016 06:26:17 +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 BE8A1262632; Mon, 15 Feb 2016 06:26:16 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id AD9EC261501 for ; Mon, 15 Feb 2016 06:24:37 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 15 Feb 2016 14:24:36 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 4EC284E40B; Mon, 15 Feb 2016 14:24:36 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 3B2C88002E; Mon, 15 Feb 2016 14:24:36 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 365718002D; Mon, 15 Feb 2016 14:24:36 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id QAK30173; Mon, 15 Feb 2016 14:24:36 +0900 X-IronPort-AV: E=Sophos;i="5.22,449,1449500400"; d="scan'";a="204324694" Received: from mail-hk2apc01lp0209.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.209]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Feb 2016 14:24:35 +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=tnO47HwIoiziNl3UDcHjMMm+gdbNsHIDU1o1vwlzMvU=; b=fUSkGi+VHmJI5PRTHZIkoPWmiCaFP9PbJ4hoCnawjY5BdUwEs3yjirNBS4AtGQ+MMnRl9vuercjOFCZLQeMD6ZpK8/N4QlfzYaS2GvsV/jGBOuo7Bzm2dKhRCiYL4HFs++T1lkDW88jF11pjhBoi2GMqwG+xqEbZhEH4BoeLNIQ= 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 SG2PR06MB1017.apcprd06.prod.outlook.com (10.161.9.25) with Microsoft SMTP Server (TLS) id 15.1.409.15; Mon, 15 Feb 2016 05:24:33 +0000 Message-ID: <871t8eim7d.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Mark Brown , Greg KH In-Reply-To: <87d1ryimdz.wl%kuninori.morimoto.gx@renesas.com> References: <87d1ryimdz.wl%kuninori.morimoto.gx@renesas.com> Date: Mon, 15 Feb 2016 05:24:33 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0032.apcprd02.prod.outlook.com (25.164.90.170) To SG2PR06MB1017.apcprd06.prod.outlook.com (25.161.9.25) X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1017; 2:LW3Qvu0+g55GvxBb5Yo07STPdMIU48T8TdtwN7E7iHEse9y0ZEPPtSFbRNb9CyoiDv0GrNCmYKKEeT5g28/ZmuxjDXkznuuEz0TB/aWxPX+BntM0dmS12KLchIhb/UMg1an2J35FQCWTL+Mwx0/C6Q==; 3:/Rh8B2fVzUfmJzZaSRstQ4tL67vt4sKk4x6/Ua5+lUls/VjBsKA2QxkuQGx7QGm9ai0ZvrJmHRLftIr9K/npF/kvygLVvkJnbb7B7U7s1NgXBpJKsILJcVjNIK4zPSu5; 25:F/+GphOvZ83LRoSpefBCraCrcc6r0gfQh62QdwwubxgalO2orClxcr3KDDoRj5Tvk65PTroirAjX1Y88Ldb4h04+ZSWScynCzPDU4hUfur8s2EZCWvmmVZ4kVjNPFplmv9n85PTccPMjG4RBdIT4dAGQhRgOF4XBE+wMSMnEMezKv1mDvmFSatKFfwJyS/Tc/mQKOgsBuYjhln1hoaDX2Syv3QmeRpOkwQIprjezflZunNkm8EyYNrPpX+aq4YfgHlELXaeiYB2yXasve66cKeLmMnM/32V3ZhfSyj92MQrHl2zpxCs20QUwPHPQGAsS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1017; X-MS-Office365-Filtering-Correlation-Id: 905965b7-4b21-4fa7-e0a2-08d335c84a3a X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1017; 20:yoPvvafpILdNRARqwG2PtOLXRMIIQ+ZacZf9J2j/Y0Zqh2IzjQTMnPxrQpL8v/q545qSp/Eh5DdlOxJPUN8YYijThYvfbk9tjf/NSZe/iUHInzM8VfUtAkH+M+abCwsCTT8qrmkKx2zITeMCsa5aMxAZJ9gj+HXTPpJ/0yYAnd3Pk3PhUblPuxkWeXVWkie43pyZt7dX8uNjLrTuXE0mwxKKEObyu1YZpg8T5nj7HXmovaQ3jkoxIxI+3gCQQU9AOFheOS7rkhX0hFJH/9O7YfTp7U2aHI884pXsbrKPpMUEbOZeH6NirSZ97s92IFGlVcZXqU/3XQWr0V77DJW9GJP0nnNX0+bXq/kpgqeduTMaFGCxm8X/N9CKqc5KsT/W2J1xSvpx4Y4atDOuC29VvcpCiIhIEyYBwIk09UVTvZiqXjr93rWOgcreYkWZYDt/uObSlEdG5vvtP3vJpEny3a7lIIY0j+PjpKP3tiGVEhu/xFDxGz7VmJZ53QVCGTSv; 4:S876XZH173m4uLUWhCniIxScjrFGaqkiwM5RaP519eU6kQqOCYLlCeFKcUQjx3k8zdf4xzYcJ3eaOLDSiVT3hH2XPGnYHBoftQI9Xq1LIGNOoJBLg2UVuc35CwVSQoOwJNHmFGOapypb6ZtI3foxJyFK33z2Cah9gMAMFJyk4xLHIwIQ7bUlvQYX7lKL4qCJXDc4R13YuM127SUQjWmO5xAdkTwOmOxnCZmnqnhBiWTeZA3ZV8/hk3DO4E4m8NpMWGY/0UBfXjeY8pucjEjaoVfl9+5ZTQFt628uIA6IoPZ6tytrvxfVF0DIUXjUoHWCpRwaMEBFN6QkGvJ2irX41kIzaDFbQved0B9cJlCKhv7EOS4iS+hex/4SvvKSFUbl X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:SG2PR06MB1017; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1017; X-Forefront-PRVS: 08534B37A7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(53416004)(46406003)(4001350100001)(19580405001)(19580395003)(36756003)(5004730100002)(50466002)(86362001)(5008740100001)(229853001)(87976001)(83506001)(189998001)(42186005)(5001770100001)(5001960100002)(23726003)(1096002)(3846002)(2906002)(2950100001)(92566002)(47776003)(122386002)(33646002)(77096005)(76176999)(50986999)(54356999)(586003)(6116002)(66066001)(4326007)(40100003); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1017; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1017; 23:3qGu/l4oQPvP7X9lnK64gNf0DSu+MJwFDVQPVdz6G?= =?us-ascii?Q?oKCuQ3uRWPxhpF+55f1vxGM8DxLQpf9mXXbKMoiSVFUsYCxq/ojqx9nepo8o?= =?us-ascii?Q?+Y2I0JTEWQOYj2wDwaiOEeqRJ3QWQGBO7ARvEcDtxkGewgUPHz2Yn6Ql1OSk?= =?us-ascii?Q?GdPKEJ5IvJmo8B8uxT6A65J2CmRrvBRB2psu20FMUYCPjeRlrydi9VooqYBN?= =?us-ascii?Q?OJY8Au9ntsVkAjTAFInya3nvN6juGX+hITd5Szl7qLIeD72U1iUN2pXf92x3?= =?us-ascii?Q?2K0BAKebNEMGZEGASVNT+3fXNvYdCvpXU7EcnZycVKKO6D2R1KFebf28Ibcp?= =?us-ascii?Q?xFI9oOrsfHYyak4PSl9u17oqjulfxO6dhAmffY6vyXSjl9k8TSJUBgAPgz9+?= =?us-ascii?Q?xKuVU3lH9M9u/XhK7fI7lkrAqk8yciqx1rbt0o/P5H4MgTjWdkJ7U4b8Sc2s?= =?us-ascii?Q?n6jBQetIcb0WHSDSz1EHWCOfUuhBRUKSNWTpyFizjLYbi6bv3FD2Ac2yGUXf?= =?us-ascii?Q?Il+Aba7v2C2HYkqTBRm3uqe2JlyxT4WWJLw7e+cE27W0SveW+/ITAj6Skpuj?= =?us-ascii?Q?oDLW754hRXKnoodbru458poiz2iZTNv6lyzzLIb//o9qLqzWIM4vsCayvwZZ?= =?us-ascii?Q?Pokteqgsq2ASMeBq+ciefe5N0iJHvrWqe/tDu5DsZP9U+cpLJGbOB/cP/gNw?= =?us-ascii?Q?v5Hk+CdRERhlbHCdGRg8xrjULf2K8Jq//vwonWhm4c5N+lgAOHHlbEK2/WAm?= =?us-ascii?Q?/hl0ne1DA/wbfDjhULTGQts1vaUZiP4XzBp+wuS/J8NP3ZiYOAaC+J3q1WZC?= =?us-ascii?Q?QQWc5k5bT+X2tyU9NVtEU+4X7ajWysyflo7vpaTfI6Y6UGJ0veDQsQyNpjmE?= =?us-ascii?Q?rzgTPlcl0z2dVhXdsdLNrwHFUuCjAPLn8FtnQ1C1TugXlA3nAAcSTlcPyYy1?= =?us-ascii?Q?LZrh5WSAQ/BV0CCAR+HdiTfqOPjTQ+MDXcriBYZZE0UHywvkmXaWImkKxTGv?= =?us-ascii?Q?BMl60eFkCVC+PzlN5dTLTFi?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1017; 5:HE2yUhuRcD+Py6G49UyWejxnDWSIUBrVmssa8XdrDs4KXLhqL3L64qsqcadXntMtZBCsNOyW82WKlUFHVSbC+LwgBfWm0dkIYvpx6kos/FJh4+0WnnSZJVd7NldI5939RaSYp3Cq8PwzXxQ5tqLWvQ==; 24:2nGx3EyYYvAVzgJswsOAMmLlMm1aMMXX78Aq5XaQQUXfchmPAw2sj77cvquYwG6ijOeK7U3/4ojHAJN1KaldjqC85uX8ToaDtO0G/InTIG4=; 20:aNGByT8GFrtWTl/rQUqkiez59+LPMpnBbmhvBuA3crskMM91xvUXG5JcLZc0zEAR1U1+kY178RZJVrNDefr7omYJGT24LTmn8ymj+XDuDZlktfxlDJ7Ot/smyU4uGAgcRQXNjKnFLCC4nhNTMLnO3z8VuwRyAH69QsHRmZAxKJs= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2016 05:24:33.9319 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1017 Cc: Linux-ALSA , Linux-Kernel Subject: [alsa-devel] [PATCH 08/15 v2][RFC] regmap: merge regmap_field_update_bits() into macro 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 This patch merges regmap_field_update_bits() into macro by using regmap_field_update_bits_base(). Signed-off-by: Kuninori Morimoto --- drivers/base/regmap/regmap.c | 20 -------------------- include/linux/regmap.h | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 228dce2..606c9b5 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1717,26 +1717,6 @@ int regmap_field_update_bits_base(struct regmap_field *field, EXPORT_SYMBOL_GPL(regmap_field_update_bits_base); /** - * regmap_field_update_bits(): Perform a read/modify/write cycle - * on the register field - * - * @field: Register field to write to - * @mask: Bitmask to change - * @val: Value to be written - * - * A value of zero will be returned on success, a negative errno will - * be returned in error cases. - */ -int regmap_field_update_bits(struct regmap_field *field, unsigned int mask, unsigned int val) -{ - mask = (mask << field->shift) & field->mask; - - return regmap_update_bits(field->regmap, field->reg, - mask, val << field->shift); -} -EXPORT_SYMBOL_GPL(regmap_field_update_bits); - -/** * regmap_fields_write(): Write a value to a single register field with port ID * * @field: Register field to write to diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 13e9ebd..e525bee 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -76,6 +76,8 @@ struct reg_sequence { #define regmap_field_write(field, val) \ regmap_field_update_bits_base(field, ~0, val, NULL, false, false) +#define regmap_field_update_bits(field, mask, val)\ + regmap_field_update_bits_base(field, mask, val, NULL, false, false) #ifdef CONFIG_REGMAP @@ -778,8 +780,6 @@ int regmap_field_read(struct regmap_field *field, unsigned int *val); int regmap_field_update_bits_base(struct regmap_field *field, unsigned int mask, unsigned int val, bool *change, bool async, bool force); -int regmap_field_update_bits(struct regmap_field *field, - unsigned int mask, unsigned int val); int regmap_fields_write(struct regmap_field *field, unsigned int id, unsigned int val); int regmap_fields_force_write(struct regmap_field *field, unsigned int id,