power: supply: sysfs: Move power_supply_show_enum_with_available() up

Move power_supply_show_enum_with_available() higher up in
the power_supply_sysfs.c file.

This is a preparation patch to avoid needing a forward declaration
when replacing power_supply_show_usb_type() with it later on.

This commit only moves the function, there are no changes to it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240831142039.28830-6-hdegoede@redhat.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
index 9f21b0b54caf76097031b24451600012246ba2ba..c98a6de59d3b7392271ef9847c0b6ebbb2b34894 100644 (file)
--- a/drivers/power/supply/power_supply_sysfs.c
+++ b/drivers/power/supply/power_supply_sysfs.c
@@ -237,6 +237,37 @@ static enum power_supply_property dev_attr_psp(struct device_attribute *attr)
        return  to_ps_attr(attr) - power_supply_attrs;
 }
 
+static ssize_t power_supply_show_enum_with_available(
+                       struct device *dev, const char * const labels[], int label_count,
+                       unsigned int available_values, int value, char *buf)
+{
+       bool match = false, available, active;
+       ssize_t count = 0;
+       int i;
+
+       for (i = 0; i < label_count; i++) {
+               available = available_values & BIT(i);
+               active = i == value;
+
+               if (available && active) {
+                       count += sysfs_emit_at(buf, count, "[%s] ", labels[i]);
+                       match = true;
+               } else if (available) {
+                       count += sysfs_emit_at(buf, count, "%s ", labels[i]);
+               }
+       }
+
+       if (!match) {
+               dev_warn(dev, "driver reporting unavailable enum value %d\n", value);
+               return -EINVAL;
+       }
+
+       if (count)
+               buf[count - 1] = '\n';
+
+       return count;
+}
+
 static ssize_t power_supply_show_usb_type(struct device *dev,
                                          const struct power_supply_desc *desc,
                                          union power_supply_propval *value,
@@ -518,37 +549,6 @@ out:
        return ret;
 }
 
-static ssize_t power_supply_show_enum_with_available(
-                       struct device *dev, const char * const labels[], int label_count,
-                       unsigned int available_values, int value, char *buf)
-{
-       bool match = false, available, active;
-       ssize_t count = 0;
-       int i;
-
-       for (i = 0; i < label_count; i++) {
-               available = available_values & BIT(i);
-               active = i == value;
-
-               if (available && active) {
-                       count += sysfs_emit_at(buf, count, "[%s] ", labels[i]);
-                       match = true;
-               } else if (available) {
-                       count += sysfs_emit_at(buf, count, "%s ", labels[i]);
-               }
-       }
-
-       if (!match) {
-               dev_warn(dev, "driver reporting unavailable enum value %d\n", value);
-               return -EINVAL;
-       }
-
-       if (count)
-               buf[count - 1] = '\n';
-
-       return count;
-}
-
 ssize_t power_supply_charge_behaviour_show(struct device *dev,
                                           unsigned int available_behaviours,
                                           enum power_supply_charge_behaviour current_behaviour,