Skip to content

Commit c73cc44

Browse files
charmitrosre
charmitro
authored and
sre
committed
power: supply: Fix indentation and some other warnings
These were mentioned by checkpatch: Errors: (1) code indent should use tabs where possible (2) switch and case should be at the same indent Warnings: (1) Missing a blank line after declarations Signed-off-by: Charalampos Mitrodimas <charmitro@posteo.net> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent c04c4eb commit c73cc44

1 file changed

Lines changed: 81 additions & 80 deletions

File tree

‎drivers/power/supply/power_supply_core.c‎

Lines changed: 81 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -861,44 +861,44 @@ const size_t power_supply_battery_info_properties_size = ARRAY_SIZE(power_supply
861861
EXPORT_SYMBOL_GPL(power_supply_battery_info_properties_size);
862862

863863
bool power_supply_battery_info_has_prop(struct power_supply_battery_info *info,
864-
enum power_supply_property psp)
864+
enum power_supply_property psp)
865865
{
866866
if (!info)
867867
return false;
868868

869869
switch (psp) {
870-
case POWER_SUPPLY_PROP_TECHNOLOGY:
871-
return info->technology != POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
872-
case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
873-
return info->energy_full_design_uwh >= 0;
874-
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
875-
return info->charge_full_design_uah >= 0;
876-
case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
877-
return info->voltage_min_design_uv >= 0;
878-
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
879-
return info->voltage_max_design_uv >= 0;
880-
case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
881-
return info->precharge_current_ua >= 0;
882-
case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
883-
return info->charge_term_current_ua >= 0;
884-
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
885-
return info->constant_charge_current_max_ua >= 0;
886-
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
887-
return info->constant_charge_voltage_max_uv >= 0;
888-
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
889-
return info->temp_ambient_alert_min > INT_MIN;
890-
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
891-
return info->temp_ambient_alert_max < INT_MAX;
892-
case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
893-
return info->temp_alert_min > INT_MIN;
894-
case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
895-
return info->temp_alert_max < INT_MAX;
896-
case POWER_SUPPLY_PROP_TEMP_MIN:
897-
return info->temp_min > INT_MIN;
898-
case POWER_SUPPLY_PROP_TEMP_MAX:
899-
return info->temp_max < INT_MAX;
900-
default:
901-
return false;
870+
case POWER_SUPPLY_PROP_TECHNOLOGY:
871+
return info->technology != POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
872+
case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
873+
return info->energy_full_design_uwh >= 0;
874+
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
875+
return info->charge_full_design_uah >= 0;
876+
case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
877+
return info->voltage_min_design_uv >= 0;
878+
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
879+
return info->voltage_max_design_uv >= 0;
880+
case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
881+
return info->precharge_current_ua >= 0;
882+
case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
883+
return info->charge_term_current_ua >= 0;
884+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
885+
return info->constant_charge_current_max_ua >= 0;
886+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
887+
return info->constant_charge_voltage_max_uv >= 0;
888+
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
889+
return info->temp_ambient_alert_min > INT_MIN;
890+
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
891+
return info->temp_ambient_alert_max < INT_MAX;
892+
case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
893+
return info->temp_alert_min > INT_MIN;
894+
case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
895+
return info->temp_alert_max < INT_MAX;
896+
case POWER_SUPPLY_PROP_TEMP_MIN:
897+
return info->temp_min > INT_MIN;
898+
case POWER_SUPPLY_PROP_TEMP_MAX:
899+
return info->temp_max < INT_MAX;
900+
default:
901+
return false;
902902
}
903903
}
904904
EXPORT_SYMBOL_GPL(power_supply_battery_info_has_prop);
@@ -914,53 +914,53 @@ int power_supply_battery_info_get_prop(struct power_supply_battery_info *info,
914914
return -EINVAL;
915915

916916
switch (psp) {
917-
case POWER_SUPPLY_PROP_TECHNOLOGY:
918-
val->intval = info->technology;
919-
return 0;
920-
case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
921-
val->intval = info->energy_full_design_uwh;
922-
return 0;
923-
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
924-
val->intval = info->charge_full_design_uah;
925-
return 0;
926-
case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
927-
val->intval = info->voltage_min_design_uv;
928-
return 0;
929-
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
930-
val->intval = info->voltage_max_design_uv;
931-
return 0;
932-
case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
933-
val->intval = info->precharge_current_ua;
934-
return 0;
935-
case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
936-
val->intval = info->charge_term_current_ua;
937-
return 0;
938-
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
939-
val->intval = info->constant_charge_current_max_ua;
940-
return 0;
941-
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
942-
val->intval = info->constant_charge_voltage_max_uv;
943-
return 0;
944-
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
945-
val->intval = info->temp_ambient_alert_min;
946-
return 0;
947-
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
948-
val->intval = info->temp_ambient_alert_max;
949-
return 0;
950-
case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
951-
val->intval = info->temp_alert_min;
952-
return 0;
953-
case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
954-
val->intval = info->temp_alert_max;
955-
return 0;
956-
case POWER_SUPPLY_PROP_TEMP_MIN:
957-
val->intval = info->temp_min;
958-
return 0;
959-
case POWER_SUPPLY_PROP_TEMP_MAX:
960-
val->intval = info->temp_max;
961-
return 0;
962-
default:
963-
return -EINVAL;
917+
case POWER_SUPPLY_PROP_TECHNOLOGY:
918+
val->intval = info->technology;
919+
return 0;
920+
case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
921+
val->intval = info->energy_full_design_uwh;
922+
return 0;
923+
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
924+
val->intval = info->charge_full_design_uah;
925+
return 0;
926+
case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
927+
val->intval = info->voltage_min_design_uv;
928+
return 0;
929+
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
930+
val->intval = info->voltage_max_design_uv;
931+
return 0;
932+
case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
933+
val->intval = info->precharge_current_ua;
934+
return 0;
935+
case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
936+
val->intval = info->charge_term_current_ua;
937+
return 0;
938+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
939+
val->intval = info->constant_charge_current_max_ua;
940+
return 0;
941+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
942+
val->intval = info->constant_charge_voltage_max_uv;
943+
return 0;
944+
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
945+
val->intval = info->temp_ambient_alert_min;
946+
return 0;
947+
case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
948+
val->intval = info->temp_ambient_alert_max;
949+
return 0;
950+
case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
951+
val->intval = info->temp_alert_min;
952+
return 0;
953+
case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
954+
val->intval = info->temp_alert_max;
955+
return 0;
956+
case POWER_SUPPLY_PROP_TEMP_MIN:
957+
val->intval = info->temp_min;
958+
return 0;
959+
case POWER_SUPPLY_PROP_TEMP_MAX:
960+
val->intval = info->temp_max;
961+
return 0;
962+
default:
963+
return -EINVAL;
964964
}
965965
}
966966
EXPORT_SYMBOL_GPL(power_supply_battery_info_get_prop);
@@ -1255,6 +1255,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
12551255
static void power_supply_dev_release(struct device *dev)
12561256
{
12571257
struct power_supply *psy = to_power_supply(dev);
1258+
12581259
dev_dbg(dev, "%s\n", __func__);
12591260
kfree(psy);
12601261
}

0 commit comments

Comments
 (0)