From c5bdb8464b905bd2e9ce65db8d99132512ba7e48 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 24 Feb 2020 14:40:49 -0800 Subject: [PATCH] ANDROID: GKI: power: supply: Remove "Wipower" PSY type Remove "Wipower" PSY type as it is not used by any driver. Change-Id: Ib198b38a22c275ff1c390f1e5eac12a4e914b66b Signed-off-by: Guru Das Srinagesh (cherry picked from commit 5573bd8e6fb4b03d105f32dc0a5dee3b8b8f60f9) Signed-off-by: Mark Salyzyn Bug: 150789066 --- drivers/power/supply/power_supply_sysfs.c | 2 +- include/linux/power_supply.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 0a11e23126c5..06438b10c5c6 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -45,7 +45,7 @@ static const char * const power_supply_type_text[] = { "USB_DCP", "USB_CDP", "USB_ACA", "USB_C", "USB_PD", "USB_PD_DRP", "BrickID", "USB_HVDCP", "USB_HVDCP_3", "USB_HVDCP_3P5", "Wireless", "USB_FLOAT", - "BMS", "Parallel", "Main", "Wipower", "USB_C_UFP", "USB_C_DFP", + "BMS", "Parallel", "Main", "USB_C_UFP", "USB_C_DFP", "Charge_Pump", }; diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 7249e9ca13ad..a9a0b32353c8 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -419,7 +419,6 @@ enum power_supply_type { POWER_SUPPLY_TYPE_BMS, /* Battery Monitor System */ POWER_SUPPLY_TYPE_PARALLEL, /* Parallel Path */ POWER_SUPPLY_TYPE_MAIN, /* Main Path */ - POWER_SUPPLY_TYPE_WIPOWER, /* Wipower */ POWER_SUPPLY_TYPE_UFP, /* Type-C UFP */ POWER_SUPPLY_TYPE_DFP, /* Type-C DFP */ POWER_SUPPLY_TYPE_CHARGE_PUMP, /* Charge Pump */