2019-07-23 12:16:08

by Paul Cercueil

[permalink] [raw]
Subject: [PATCH] power/supply: ingenic-battery: Don't change scale if there's only one

The ADC in the JZ4740 can work either in high-precision mode with a 2.5V
range, or in low-precision mode with a 7.5V range. The code in place in
this driver will select the proper scale according to the maximum
voltage of the battery.

The JZ4770 however only has one mode, with a 6.6V range. If only one
scale is available, there's no need to change it (and nothing to change
it to), and trying to do so will fail with -EINVAL.

Fixes commit fb24ccfbe1e0 ("power: supply: add Ingenic JZ47xx battery
driver.")

Signed-off-by: Paul Cercueil <[email protected]>
Cc: [email protected]
---
drivers/power/supply/ingenic-battery.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/power/supply/ingenic-battery.c b/drivers/power/supply/ingenic-battery.c
index 35816d4b3012..5a53057b4f64 100644
--- a/drivers/power/supply/ingenic-battery.c
+++ b/drivers/power/supply/ingenic-battery.c
@@ -80,6 +80,10 @@ static int ingenic_battery_set_scale(struct ingenic_battery *bat)
if (ret != IIO_AVAIL_LIST || scale_type != IIO_VAL_FRACTIONAL_LOG2)
return -EINVAL;

+ /* Only one (fractional) entry - nothing to change */
+ if (scale_len == 2)
+ return 0;
+
max_mV = bat->info.voltage_max_design_uv / 1000;

for (i = 0; i < scale_len; i += 2) {
--
2.21.0.593.g511ec345e18


2019-09-02 18:58:57

by Sebastian Reichel

[permalink] [raw]
Subject: Re: [PATCH] power/supply: ingenic-battery: Don't change scale if there's only one

Hi,

On Mon, Jul 22, 2019 at 10:45:54PM -0400, Paul Cercueil wrote:
> The ADC in the JZ4740 can work either in high-precision mode with a 2.5V
> range, or in low-precision mode with a 7.5V range. The code in place in
> this driver will select the proper scale according to the maximum
> voltage of the battery.
>
> The JZ4770 however only has one mode, with a 6.6V range. If only one
> scale is available, there's no need to change it (and nothing to change
> it to), and trying to do so will fail with -EINVAL.
>
> Fixes commit fb24ccfbe1e0 ("power: supply: add Ingenic JZ47xx battery
> driver.")

There is a standard format for this. It should be

Fixes: fb24ccfbe1e0 ("power: supply: add Ingenic JZ47xx battery driver.")

> Signed-off-by: Paul Cercueil <[email protected]>
> Cc: [email protected]

Also it would be nice to have an Acked-by from Artur.

-- Sebastian

> drivers/power/supply/ingenic-battery.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/power/supply/ingenic-battery.c b/drivers/power/supply/ingenic-battery.c
> index 35816d4b3012..5a53057b4f64 100644
> --- a/drivers/power/supply/ingenic-battery.c
> +++ b/drivers/power/supply/ingenic-battery.c
> @@ -80,6 +80,10 @@ static int ingenic_battery_set_scale(struct ingenic_battery *bat)
> if (ret != IIO_AVAIL_LIST || scale_type != IIO_VAL_FRACTIONAL_LOG2)
> return -EINVAL;
>
> + /* Only one (fractional) entry - nothing to change */
> + if (scale_len == 2)
> + return 0;
> +
> max_mV = bat->info.voltage_max_design_uv / 1000;
>
> for (i = 0; i < scale_len; i += 2) {
> --
> 2.21.0.593.g511ec345e18
>


Attachments:
(No filename) (1.63 kB)
signature.asc (849.00 B)
Download all attachments