Skip to content

Commit

Permalink
power: supply: axp20x_usb_power: Use scaled iio_read_channel
Browse files Browse the repository at this point in the history
Change iio_read_channel_processed to iio_read_channel_processed_scale
where appropriate.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Link: https://lore.kernel.org/r/20241023184800.109376-2-macroalpha82@gmail.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  • Loading branch information
Chris Morgan authored and Sebastian Reichel committed Nov 11, 2024
1 parent c0f3a01 commit 9fdd97d
Showing 1 changed file with 15 additions and 18 deletions.
33 changes: 15 additions & 18 deletions drivers/power/supply/axp20x_usb_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,15 @@ static int axp20x_usb_power_get_property(struct power_supply *psy,
return 0;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
if (IS_ENABLED(CONFIG_AXP20X_ADC)) {
ret = iio_read_channel_processed(power->vbus_v,
&val->intval);
if (ret)
return ret;

/*
* IIO framework gives mV but Power Supply framework
* gives uV.
*/
val->intval *= 1000;
ret = iio_read_channel_processed_scale(power->vbus_v,
&val->intval, 1000);
if (ret)
return ret;

return 0;
}

Expand All @@ -253,16 +252,15 @@ static int axp20x_usb_power_get_property(struct power_supply *psy,
return 0;
case POWER_SUPPLY_PROP_CURRENT_NOW:
if (IS_ENABLED(CONFIG_AXP20X_ADC)) {
ret = iio_read_channel_processed(power->vbus_i,
&val->intval);
if (ret)
return ret;

/*
* IIO framework gives mA but Power Supply framework
* gives uA.
*/
val->intval *= 1000;
ret = iio_read_channel_processed_scale(power->vbus_i,
&val->intval, 1000);
if (ret)
return ret;

return 0;
}

Expand Down Expand Up @@ -374,16 +372,15 @@ static int axp717_usb_power_get_property(struct power_supply *psy,
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
if (IS_ENABLED(CONFIG_AXP20X_ADC)) {
ret = iio_read_channel_processed(power->vbus_v,
&val->intval);
if (ret)
return ret;

/*
* IIO framework gives mV but Power Supply framework
* gives uV.
*/
val->intval *= 1000;
ret = iio_read_channel_processed_scale(power->vbus_v,
&val->intval, 1000);
if (ret)
return ret;

return 0;
}

Expand Down

0 comments on commit 9fdd97d

Please sign in to comment.