From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755890AbcCCAsj (ORCPT ); Wed, 2 Mar 2016 19:48:39 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:55442 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754943AbcCCAsh (ORCPT ); Wed, 2 Mar 2016 19:48:37 -0500 X-IronPort-AV: E=Sophos;i="5.22,531,1449500400"; d="scan'";a="206862926" Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=renesas.com; Message-ID: <87h9gobdbk.wl%kuninori.morimoto.gx@renesas.com> To: Mark Brown CC: Stephen Rothwell , Lee Jones , Liam Girdwood , , In-Reply-To: <20160302040000.GX18327@sirena.org.uk> References: <20160229145122.71636c6b@canb.auug.org.au> <87a8mjj8wc.wl%kuninori.morimoto.gx@renesas.com> <878u23j85t.wl%kuninori.morimoto.gx@renesas.com> <20160302040000.GX18327@sirena.org.uk> From: Kuninori Morimoto Subject: [PATCH] regmap: replace regmap_write_bits() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset="US-ASCII" Date: Thu, 3 Mar 2016 00:48:30 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0007.jpnprd01.prod.outlook.com (25.161.131.145) To HKXPR06MB1016.apcprd06.prod.outlook.com (25.161.181.156) X-Microsoft-Exchange-Diagnostics: 1;HKXPR06MB1016;2:lwLi0zJcrxW4ZB+xSKtBXnQR8ymiECpWtklU5jLlDSPMiZYIEL7TZ2ANsu4+u6czvTTjsxv5iDS9Bjp0KJVAjgsTBbb0BrzDq+chLG0hq+5/gX/EkuOL7CasA4xIWsNWkRp1Q+l+uMH3MM6cYND2DA==;3:Xb/1ySCyrx9hE55uH1wJ0WHYCCdUZ7hbmuksskcwjy2+XJ+6emkMTFtIN8eQ7DVFTA/kHH68oSupvQ46q0u04qOpu7AbkgUnl0HOp8grahqpMsODsjAvGBPYr+CKGdTW;25:aP+ubuA+sT+t9gSJxpljiK2nD3v5njGs79LVE+a4UIY5TwHpJrFb8KnarxOEonRQAiCwU1lbs8JyDppZ0b7wVTVMWhY4ApCqieANuQUm/b2Grth5tykeWjV/6qaEeD8sqJqSYSM2y+gLyO8oGNLrrQferOfUipunr4gnHxbkoYo6TH0k2g7Mrq1PftS3YngGLvhDdaKaXV6QPlmMxTzaskE6zR5a39tuq/mXye2T7E3WgZCMSNIyodWvSgmFyJWx3wsRfEi3VfF/3xbo0cpr/Me2i+Uq5JmyaTkZhDfpbp0xu6Ert6kjA1ihyReTLZ6zVsHdeGy46jewx3+hG8hazg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1016; X-MS-Office365-Filtering-Correlation-Id: cceb6d2a-cbbc-4330-7ca2-08d342fd8a82 X-Microsoft-Exchange-Diagnostics: 1;HKXPR06MB1016;20:/hZCMc4Q2P5YxzUhVo9ikCd8tKuL+t519heo1oYwuBNxLhwQogXStd7l2gSx2Pe+xFAPuqwGIROZ9x7ebahPnOBzA2JNfRwi6MEb9tYoiC2YsOY+s6vOvEDx8X2lnGg+Qx6wL8lhTMIB+ONQNwlRkABQnkwNos0r1Mwrb7te1uV/5xpHmUsAb09Kg4aEXeS96Cfpc5sNs+tTh6B99DK7DZrh1mUost11T4NRkJLhKB5acfAjEQby7w/7EPiUKzqesaioSGlQxE5qJA8fs5qyDn/RhkfWdnxMgva57Z9NAbe6wmKe3YKz18PA5RLfLfDpcE1emTpGIwRKRfUGML0AD/uCsasSZ3gkl1jqw1jcmzDJb0+oP366ImP+g+s7La6Cs0FrU+darQYmMALd9rYvb9OvN50wHGLczWN+G8e7OaY1p0r1voMSydsW0A/wWQNffleUqyWIHKM9dwicWrT4xwvN552rACxHT/eodVlU2AVwncIUl48tLFxm+NKicb8J;4:4vROPhFIoFAL8SWsCoNb6SU72ezyJ1+bZfvktJ2gBchAOd5pOC1N7gcBlIuVyIULuBj5++6qmSHmYTXyv5k6SF1ZGroKE+Mj66jRfNumciodV+Xkdfq0dLOwinnHqJTZuVrXMPH3Y34mvTMkglbTCSzPijxTlT03z6HQLFv8C4g2I6CpzkmUcBQJFqRMV6jCv4H++F9SFPDjsoeDGRaP/cLHxx/T+5JKVz+r25tm2B+ulq7EZYh6qJXVAtt4WytR0lEMwO+m1cr69EUoeEBthoouyS7TpgTU/oK8qwWp6dLxywWo1+Q7uE+PPrB24ERVGILOfSHbpN886y7olySK1SUbahH+8ntjDgYP+7tqQZWqZqX28gI4YedV7eG82KuH 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)(3002001)(10201501046);SRVR:HKXPR06MB1016;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1016; X-Forefront-PRVS: 0870212862 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(47776003)(66066001)(87976001)(54356999)(50986999)(76176999)(46406003)(2950100001)(122386002)(5008740100001)(229853001)(77096005)(40100003)(23726003)(1096002)(5001960100004)(2906002)(4326007)(6116002)(3846002)(586003)(110136002)(42186005)(189998001)(4001350100001)(50466002)(36756003)(93886004)(33646002)(53416004)(92566002)(86362001)(19580405001)(19580395003)(16060500001);DIR:OUT;SFP:1102;SCL:1;SRVR:HKXPR06MB1016;H:morimoto-PC.renesas.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HKXPR06MB1016;23:OMbK0XKFoeY8Wdaj/ENwJ75yqItH/6AcKQxaqACCj?= =?us-ascii?Q?DoIrB08t3K12hy3HMuZ6IblcrNTylC39jNHnJRDJ99dr6eurbP19b/gUmBPf?= =?us-ascii?Q?gftn48SE6cv38B2VtsOmj4VSVrLEzYK+eWwt15D7mAL8/dNlekQ38SwXiBNY?= =?us-ascii?Q?RxsTq+J6ijyaDSa01Lz2M82rQtm1NvFKMykXfVIW135erRIlbFORjzJrM5NL?= =?us-ascii?Q?76I506IzRx4y3EtnhwALy4ZeprZ4G3x5S3itiyqRc0Y3Q1TcmZiYHmWUAqsP?= =?us-ascii?Q?DDpRigdLWSW+rff8tvgZCKnF8GwoXBx6QnQmpEVkBy3l0Kvzd6TMcWTwRrxi?= =?us-ascii?Q?hXNpCDVLUMBnzVSMbx8HNMgN8gQsx9+Anbxzia0tK23Rp2HYMn14eRUa+s0V?= =?us-ascii?Q?cLK4LEuoqivMGd7YKGm62LUVzM76+YvSIWRWTfmRWdfK97z2h0NmEdiLEMoF?= =?us-ascii?Q?fdV20wLoZnJQXfWxqleZeEtkMyRDKWG92zY70HvhzartKU1pUfsrvQAgAHu9?= =?us-ascii?Q?hwbfwlz9GCeLZ95kBH1k/05sZfXBwVwY3zbpd2sMbn2M7/Uv0hxD2P56SWbm?= =?us-ascii?Q?RHojnj0J0/Nxx2/pWdIINK2Z8Gl2lP1A4OdxhQexOqp1lWBSAO+sXBd1HMp6?= =?us-ascii?Q?5+2CAUUbIQ81r+mMvMgyAmS2AeWvgpuM7HCVcB/VySSrIo6Su4RVvv4/H2wN?= =?us-ascii?Q?rl9mulb5wGRFQ0Tb2gf7hdsZpFdfsg058obX+flskrgKoLXuaSl56U50c/zj?= =?us-ascii?Q?r8U8DEaiQ3ZR9xdxUWoRylIehyr2EB+FB1sXhs3wR3xDU05Cm5x8y4fPjsmM?= =?us-ascii?Q?10xIby9FeXT6sZNyhx/vT3yrBIdD6UlDJn/nx9OON9HDpX3jmXka5qQ6v2Pc?= =?us-ascii?Q?Gv566v3XoAs0NTUfcAkg4YMMwgtalcpEnaAtAc7d0iOXtJkNmTm2EMMdMft8?= =?us-ascii?Q?FdmIlbdC+huTyvvLEuluLGhHaZIH3rVy5sHwqvVIvmtygXx4TeLonkgnJGhL?= =?us-ascii?Q?o5FNhRk03Qxvm/YRga4AKq3?= X-Microsoft-Exchange-Diagnostics: 1;HKXPR06MB1016;5:gT9d/T6B+WanApuyX7bSO+ZhQP2rC4nmZvJYNjLj/aI2OCCf8G/eJyw/vNg1zxkoTtSWKFqfXp7NpL0iEo3gMZZ7JQy/FJwp+rFrpdoN4tGeRc+Gb794udyFzXIqbM2C74xO/hGd2xEa/fdcXQK2Vw==;24:6HfsPaclwQM2qiawwXunGV5DHNMPhvQv+kIpIGI3vj3VHLLx2pTzHF9ikF8x/3MWNkh840VUf3v1LfgIf+2bxQBvKC/2ViZ/2wJ0ZH/I6UY=;20:OtbuEhW05HIoYnFBI2IQcN9K2AZ8su4KgC14KXmMBUCOXhxfMSpC1Oux/AJSZQBROD3Wdrxp7xBeovk8KYgixuTq/Gri4SWEwyHT6OYSUSbtasHM22WSAMup3NuBJea6hFDNadUiAZR2G86WFab8LllSFwivZNsLtfC0Foqajv0= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2016 00:48:30.1088 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1016 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kuninori Morimoto commit 23b92e4cf5fd ("regmap: remove regmap_write_bits()") removed regmap_write_bits(), but MFD driver was using it. So, commit e30fccd6771d ("regmap: Keep regmap_write_bits()") turns out it, but it is using original style. This patch uses regmap_update_bits_base() for regmap_write_bits() Signed-off-by: Kuninori Morimoto --- drivers/base/regmap/regmap.c | 23 ----------------------- include/linux/regmap.h | 12 +++--------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index c7d4a63..3fb04c3 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -2650,29 +2650,6 @@ int regmap_update_bits_base(struct regmap *map, unsigned int reg, } EXPORT_SYMBOL_GPL(regmap_update_bits_base); -/** - * regmap_write_bits: Perform a read/modify/write cycle on the register map - * - * @map: Register map to update - * @reg: Register to update - * @mask: Bitmask to change - * @val: New value for bitmask - * - * Returns zero for success, a negative number on error. - */ -int regmap_write_bits(struct regmap *map, unsigned int reg, - unsigned int mask, unsigned int val) -{ - int ret; - - map->lock(map->lock_arg); - ret = _regmap_update_bits(map, reg, mask, val, NULL, true); - map->unlock(map->lock_arg); - - return ret; -} -EXPORT_SYMBOL_GPL(regmap_write_bits); - void regmap_async_complete_cb(struct regmap_async *async, int ret) { struct regmap *map = async->map; diff --git a/include/linux/regmap.h b/include/linux/regmap.h index e0960b3..0744c9f 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -74,6 +74,9 @@ struct reg_sequence { #define regmap_update_bits_check_async(map, reg, mask, val, change)\ regmap_update_bits_base(map, reg, mask, val, change, true, false) +#define regmap_write_bits(map, reg, mask, val) \ + regmap_update_bits_base(map, reg, mask, val, NULL, false, true) + #define regmap_field_write(field, val) \ regmap_field_update_bits_base(field, ~0, val, NULL, false, false) #define regmap_field_force_write(field, val) \ @@ -721,8 +724,6 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, int regmap_update_bits_base(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val, bool *change, bool async, bool force); -int regmap_write_bits(struct regmap *map, unsigned int reg, - unsigned int mask, unsigned int val); int regmap_get_val_bytes(struct regmap *map); int regmap_get_max_register(struct regmap *map); int regmap_get_reg_stride(struct regmap *map); @@ -961,13 +962,6 @@ static inline int regmap_update_bits_base(struct regmap *map, unsigned int reg, return -EINVAL; } -static inline int regmap_write_bits(struct regmap *map, unsigned int reg, - unsigned int mask, unsigned int val) -{ - WARN_ONCE(1, "regmap API is disabled"); - return -EINVAL; -} - static inline int regmap_field_update_bits_base(struct regmap_field *field, unsigned int mask, unsigned int val, bool *change, bool async, bool force) -- 1.9.1