From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004AbcCABUI (ORCPT ); Mon, 29 Feb 2016 20:20:08 -0500 Received: from relmlor3.renesas.com ([210.160.252.173]:33191 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751098AbcCABUF (ORCPT ); Mon, 29 Feb 2016 20:20:05 -0500 X-IronPort-AV: E=Sophos;i="5.22,521,1449500400"; d="scan'";a="205430113" Authentication-Results: canb.auug.org.au; dkim=none (message not signed) header.d=none;canb.auug.org.au; dmarc=none action=none header.from=renesas.com; Message-ID: <87a8mjj8wc.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Stephen Rothwell CC: Lee Jones , Mark Brown , "Liam Girdwood" , , Subject: Re: linux-next: build failure after merge of the mfd tree In-Reply-To: <20160229145122.71636c6b@canb.auug.org.au> References: <20160229145122.71636c6b@canb.auug.org.au> 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: Tue, 1 Mar 2016 01:19:59 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0001.jpnprd01.prod.outlook.com (25.161.24.11) To HKXPR06MB1016.apcprd06.prod.outlook.com (25.161.181.156) X-Microsoft-Exchange-Diagnostics: 1;HKXPR06MB1016;2:yndXlAW+KVfENiAbu61UyiQkv+YOYURomiuga4S3SWX4k7iZnNeixhUcnlLBLyBQOZmHp6b7KoS3YpP4OaNBrOaDLXg0KKeQKfZiy/oOPfiy6IFP5JG3YtRIY6h0swg5icb6gVLnhb8AjzfWkGat/Q==;3:NKwIMPJFMymKXOHFE5b1y9yX2heNCjD6eCRCVg4V9dVHMHzr43q16BLJFTSrXnho3ssancjbopqO1q4sCx3oBLucUeqArswxt+6XBlA6/NKkacyKQNjaNZld03HdJ3XL;25:VPmLVs2eFZVByb191YLv7jWBBhenOfT5tNfCD2S9NbhoUkRrqecPlGejwtn/TsfoelpZgNy86xcpCoUGTPq33RYyxCkIR8AGVCqHm3HUbrPAKx9YDQYMvDGIjo6ErBQv39mU0WokY0jEny54UNEZmDd0CYgk3t+4ydlNpZLUGJD6IUEVF73EOqymnH/o2nHd9gdXWBzDTsXxABWCBjevH/llaEOu+uVAPefsee7jY64UJFGAsiwTaLrLSdY8OM07fEU4EwYHKxykkXowUfdM/iQ+1QpE0LoPtayyvnZKm3dqYK+Dfs07C0ay3WHhEIuVTcisG6W2R8WX/DCC2BwLvg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1016; X-MS-Office365-Filtering-Correlation-Id: 1d35da37-86ca-4119-48c1-08d3416f9bdb X-Microsoft-Exchange-Diagnostics: 1;HKXPR06MB1016;20:CNEMoO7tlnYVbucFkBhESty+cVkd2DgnrsxirYOc1wtUwOL9exvi+Qk+4JgNWAytkSRJ8RW/ZxhWSQ4I9Xq8C0TPUpVUAFqvs08iNCRBssv7u0UujC0xAX6+9rLBwM2KxX++v+AetgaEHLD77GeC99Z2gbBr8mFG9V32N76vq46g1gul/Arf6Z1xxxfWXAz05jHMQigpgqnhOdYOAd/AXfStofLETJq0gp5IOeNowKOb2g5Sdf85lCln/xq9wmjPw/LG5mOA1eGQ4MHDPPsYN1sTfRkIi0+hBhs74tXS3OVXQp0kNfO2lri/vA2VtHTOp4qKo7gP8D2DES/Kr1G1eDoyVZVMLXTTPLmHPEPMbLd9yuT68pxedLv9MtJZiP3+RvAamx6SDzast8VVrBZLdaVSsHg2kB2ZyX7+AKMZVal/Gxv5YGeU8E5RxFi3roFgFO00/VgZMHMBUs5PSjLvs5IYTY3mmcHO7vLjuv4pch9JM3tOVrc1rr3LBfiUvbY/;4:iqy8LvpqIL6OlQRA1/WJwVfO1todTkMT1sg9PpWSxZF/WVg6TmOgTL2F4Pazy6dQB1tWvjMic5DL1IxWlBSQVT7MXeL6kA2W3cCs7GGbCxmECt2vNu6Dzdh+5qPc8oWZ3ft447AfqUZTg1eRoKXKejKs3hjAZb1TDypM25iGPyyh0ln/Ymaw4vrC+jTYx2Wb2ZbT4N8XfAU4MlFb3lBIfOrTY7jU/7/Bi8xOSTlLOaiisL6jnUpghGeFRKh84uniiZ6zuKPBOZQEbn8z3Ro+j9RtfAk7lIF2AnW8EqEnLLCNVt/6jexUcks9k78D8BMoVIuflAoSPAKURiJTJ027hJWhGVseCMKw5+5DFMEevF6IGhpkjc7YNrK8A8Q9Dyeb 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: 086831DFB4 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(33646002)(189998001)(87976001)(86362001)(76176999)(50986999)(66066001)(54356999)(50466002)(92566002)(4001350100001)(46406003)(36756003)(19580395003)(42186005)(110136002)(53416004)(1096002)(3846002)(23726003)(586003)(77096005)(40100003)(83506001)(5008740100001)(2950100001)(122386002)(4326007)(2906002)(5004730100002)(6116002)(81156008)(5001960100003)(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:glknhxvzPm4QhVY8SBJqFZ3g04N0M3onp7h1qQPbe?= =?us-ascii?Q?uf9kamoKo3hkc5cn+dQzaAY2wxOfw7JhaWh+W1GjTu70wBaDPtaWqXlhWA6H?= =?us-ascii?Q?xHPEyQ+a74UBZE6PFF4AzvI9ccrPdU6nPhR+G+SZjQLvD8RmjdcvFIsm/rDb?= =?us-ascii?Q?kabycjaSZj3nZ3HnRTsKKEumQ7BqNWquntoIDG9F6nN0I7S3x5/wbDG7sImj?= =?us-ascii?Q?I3rEPSoaC0Zdv95PaY6WJhyagbRxaO2j1yEamB2y9eop6qrWORwJiz1m0YFj?= =?us-ascii?Q?RJjHF+bowBE1yyY/tdm0BE38fteB19P+QJ+kAre+b16hbMD+8a7qyLp4qF+D?= =?us-ascii?Q?2JwPFK4NRj66swCwMnFvggklXRIIhyqjtIaaUATmCBVFFpt+MC5mR5xvbN+C?= =?us-ascii?Q?vU66KLk5kV2Ow257L08CPfXEo6M2KBs2L9ZG5CvKZ927FcKMtXS0C7ufMu0g?= =?us-ascii?Q?KqA6Ihdcv1dHOCivF/VOah29eg1h4AK8pLrnerTBBHEldp/FglpA+zm2b5hK?= =?us-ascii?Q?l77I4FNPatHo7Zusf0pFE39C57pY8JBuXwJfTctEi1eLTWuvK7ZED8Qt2UZZ?= =?us-ascii?Q?VY9diFvl0T8PSXSCMP+pQnvgxzGFXqt6UrAYACUV4LHZK4NfaJZi41pKFgTe?= =?us-ascii?Q?BUALY3A6ZAE50CivWIAFd2e4bi2VQ3Ryu9nrz8FwkDFqm+oojMaNN9oom8Vm?= =?us-ascii?Q?nAPJnV1xyEYu0oj0DNIUXEJ6K9rrwcUqtrqW4h/Z+i0eqndFeI9YmUc2nrFp?= =?us-ascii?Q?KXiVNk2m6Qp9pFIdK2FKWXSoBvy3gMSBhRItEigmIBcxKeQywLaDznr9ob0z?= =?us-ascii?Q?IU0BKXIAaOAU1a1CnRrYCG6FfyMoKQewiDjFb0b0IPnmHVDHwyIAudv6Pb7F?= =?us-ascii?Q?95COOoVPp+nZ5NQD3SXgvAB8WaS+n2gtpTAJdy/hfnjJ8KLt+s4IPRlRy3G4?= =?us-ascii?Q?RH0Ub1ZU5gmLs/xq7QN5nAKbSGUgDSbEtt1nADHOYQ/VZRP23IX4NPUgsnAo?= =?us-ascii?Q?cc=3D?= X-Microsoft-Exchange-Diagnostics: 1;HKXPR06MB1016;5:hn8HSW23BXBkLeV6KXaV95snieB9RjgiDbjBbKC18dS4Y1wdQ9T2EGOvI8Uotn6IVU20oldlIAxmFQZLoUTa9GPuiDFl6wX+kIJLwmSWrFq1LGKlRTHPxV3uKpKKXROsNog2jTfIusoHy2EHbC5DxQ==;24:phfFGv7KJQ6hHP+X6LtvCTyaF8cLKdEylLCVEVWkW0H+39p5jaBNf5w+60Dfn1fMnypC2EDsU/Fc0cPNpIvWC9jWSpXtQLB8RzFOy7MOhiQ=;20:Wq3EOSbiJcfkUGmv0vp3J0L4jE03mHytxOcl6TtJfTeMjkZEJmCE+MeVL3Fbhr+tUkrZyNMBIQaxih0qrUWDdCMXTIHVCr1m0INNqgo0DZTc7vWIdDkCj40k+l/lcndp+PD3IJcvSNbAZsMOVft6B/GMly6/ugDhG9pFmPJ0JMc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2016 01:19:59.6230 (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 Hi Stephen, Lee > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/regulator/tps65086-regulator.c:194:9: error: implicit declaration of function 'regmap_write_bits' [-Werror=implicit-function-declaration] > ret = regmap_write_bits(config->regmap, > ^ > > Caused by commit > > 23b92e4cf5fd ("regmap: remove regmap_write_bits()") > > from the sound-asoc & regmap trees. > > I am not sure why this is suddenly exposed by the mfd tree, but grep > would have been useful when the regmap tree patch was applied. > > I have reverted that regmap commit for today. Oops, it is my fault. Can you check/test this patch ? ---------------- From: Kuninori Morimoto Date: Tue, 1 Mar 2016 10:12:20 +0900 Subject: [PATCH] regmap: add regmap_force_update_bits() commit 23b92e4c ("regmap: remove regmap_write_bits()") removed regmap_write_bits(), we can use regmap_force_update_bits() instead of it. Signed-off-by: Kuninori Morimoto --- drivers/regulator/tps65086-regulator.c | 2 +- include/linux/regmap.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c index 33f389d..e78b688 100644 --- a/drivers/regulator/tps65086-regulator.c +++ b/drivers/regulator/tps65086-regulator.c @@ -191,7 +191,7 @@ static int tps65086_of_parse_cb(struct device_node *dev, /* Check for decay mode */ if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) { - ret = regmap_write_bits(config->regmap, + ret = regmap_force_update_bits(config->regmap, regulators[desc->id].decay_reg, regulators[desc->id].decay_mask, regulators[desc->id].decay_mask); diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 7449792..d6cde49 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -67,6 +67,8 @@ struct reg_sequence { #define regmap_update_bits(map, reg, mask, val) \ regmap_update_bits_base(map, reg, mask, val, NULL, false, false) +#define regmap_force_update_bits(map, reg, mask, val) \ + regmap_update_bits_base(map, reg, mask, val, NULL, false, true) #define regmap_update_bits_async(map, reg, mask, val)\ regmap_update_bits_base(map, reg, mask, val, NULL, true, false) #define regmap_update_bits_check(map, reg, mask, val, change)\ -- ---------------- Best regards --- Kuninori Morimoto