From f50320a9841e9e3f51e602fdc6cdc5d4f4be3f22 Mon Sep 17 00:00:00 2001 From: Wasb Liu Date: Tue, 3 Nov 2020 16:49:53 +0800 Subject: [PATCH] ANDROID: power_supply: Update power_supply enums Rename POWER_SUPPLY_CHARGE_TYPE_TAPER to POWER_SUPPLY_CHARGE_TYPE_TAPER_EXT Bug: 168244640 Signed-off-by: Wasb Liu Change-Id: I1ebd3daf79902c873212b9ba8de7a5930d648bae Signed-off-by: Will McVicker --- drivers/power/supply/power_supply_sysfs.c | 2 +- include/linux/power_supply.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 640c709a5839..15b08dbbf090 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -89,7 +89,7 @@ static const char * const POWER_SUPPLY_CHARGE_TYPE_TEXT[] = { [POWER_SUPPLY_CHARGE_TYPE_ADAPTIVE] = "Adaptive", [POWER_SUPPLY_CHARGE_TYPE_CUSTOM] = "Custom", [POWER_SUPPLY_CHARGE_TYPE_LONGLIFE] = "Long Life", - [POWER_SUPPLY_CHARGE_TYPE_TAPER] = "Taper", + [POWER_SUPPLY_CHARGE_TYPE_TAPER_EXT] = "Taper", }; static const char * const POWER_SUPPLY_HEALTH_TEXT[] = { diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index aa61744b2b77..444599e3d645 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -54,7 +54,7 @@ enum { * force to 50 to minimize the chances of userspace binary * incompatibility on newer upstream kernels */ - POWER_SUPPLY_CHARGE_TYPE_TAPER = 50, /* charging in CV phase */ + POWER_SUPPLY_CHARGE_TYPE_TAPER_EXT = 50, /* charging in CV phase */ }; enum {