]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
power: supply: axp20x_usb_power: Use scaled iio_read_channel
authorChris Morgan <macromorgan@hotmail.com>
Wed, 23 Oct 2024 18:47:59 +0000 (13:47 -0500)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Mon, 11 Nov 2024 21:55:49 +0000 (22:55 +0100)
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>
drivers/power/supply/axp20x_usb_power.c

index 2766352ab737da1dd913a1a019458fc41b456a49..9722912268fe8e33fa102f8998a96d7d4b041d2a 100644 (file)
@@ -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;
                }
 
@@ -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;
                }
 
@@ -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;
                }