From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751589AbdJZFlW (ORCPT ); Thu, 26 Oct 2017 01:41:22 -0400 Received: from smtprelay0137.hostedemail.com ([216.40.44.137]:49932 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750884AbdJZFlV (ORCPT ); Thu, 26 Oct 2017 01:41:21 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::,RULES_HIT:41:355:379:541:560:599:960:973:982:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2828:3138:3139:3140:3141:3142:3151:3353:3622:3865:3866:3867:3868:3871:3872:4321:5007:6117:6119:7903:10004:10400:10848:11232:11658:11914:12043:12296:12555:12740:12760:12895:13439:14181:14659:14721:21080:21600:21611:21627:30034:30045:30054:30070:30075:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: loss40_45cc60f8aad27 X-Filterd-Recvd-Size: 2813 Message-ID: <1508996478.10651.28.camel@perches.com> Subject: Re: [PATCH] power: supply: 88pm860x_battery array_soc first number is in mV From: Joe Perches To: "winton.liu" <18502523564@163.com>, sre@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 25 Oct 2017 22:41:18 -0700 In-Reply-To: <1508995310-3834-1-git-send-email-18502523564@163.com> References: <1508995310-3834-1-git-send-email-18502523564@163.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.26.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2017-10-26 at 13:21 +0800, winton.liu wrote: > Fix wrong comments of array_soc description. > First number is mV not mAh. [] > diff --git a/drivers/power/supply/88pm860x_battery.c b/drivers/power/supply/88pm860x_battery.c [] > @@ -123,7 +123,7 @@ struct ccnt { > > /* > * State of Charge. > - * The first number is mAh(=3.6C), and the second number is percent point. > + * The first number is mV, and the second number is percent point. > */ > static int array_soc[][2] = { > {4170, 100}, {4154, 99}, {4136, 98}, {4122, 97}, {4107, 96}, OK, but why not change the declaration to a struct and make it obvious? Also, the array or struct should be const. Perhaps: --- drivers/power/supply/88pm860x_battery.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/power/supply/88pm860x_battery.c b/drivers/power/supply/88pm860x_battery.c index 63c57dc82ac1..973c5f7b07ba 100644 --- a/drivers/power/supply/88pm860x_battery.c +++ b/drivers/power/supply/88pm860x_battery.c @@ -123,9 +123,12 @@ struct ccnt { /* * State of Charge. - * The first number is mAh(=3.6C), and the second number is percent point. + * The first number is mV(=3.6C), and the second number is percent point. */ -static int array_soc[][2] = { +static const struct { + u16 mv; + u8 percent; +} array_soc[] = { {4170, 100}, {4154, 99}, {4136, 98}, {4122, 97}, {4107, 96}, {4102, 95}, {4088, 94}, {4081, 93}, {4070, 92}, {4060, 91}, {4053, 90}, {4044, 89}, {4035, 88}, {4028, 87}, {4019, 86}, @@ -388,14 +391,14 @@ static int calc_soc(struct pm860x_battery_info *info, int state, int *soc) return ret; count = ARRAY_SIZE(array_soc); - if (ocv < array_soc[count - 1][0]) { + if (ocv < array_soc[count - 1].mv) { *soc = 0; return 0; } for (i = 0; i < count; i++) { - if (ocv >= array_soc[i][0]) { - *soc = array_soc[i][1]; + if (ocv >= array_soc[i].mv) { + *soc = array_soc[i].percent; break; } }