From 728e13583398d07241ba372f96d0ac1263acbfde Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Sat, 29 Sep 2018 10:03:27 +0200 Subject: [PATCH] UPSTREAM: power: supply: gpio-charger: Do not use deprecated POWER_SUPPLY_TYPE_USB_* Signed-off-by: Sebastian Reichel (cherry picked from commit fb4d49448026bf1aee917426f74dc1f5342ba908) Signed-off-by: Ziyuan Xu Change-Id: I9fe3f6fe5faaff718921bb44f4528cc3480a5d81 --- drivers/power/supply/gpio-charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/gpio-charger.c b/drivers/power/supply/gpio-charger.c index c3f2a9479468..7e4f11d5a230 100644 --- a/drivers/power/supply/gpio-charger.c +++ b/drivers/power/supply/gpio-charger.c @@ -82,11 +82,11 @@ static enum power_supply_type gpio_charger_get_type(struct device *dev) if (!strcmp("usb-sdp", chargetype)) return POWER_SUPPLY_TYPE_USB; if (!strcmp("usb-dcp", chargetype)) - return POWER_SUPPLY_TYPE_USB_DCP; + return POWER_SUPPLY_TYPE_USB; if (!strcmp("usb-cdp", chargetype)) - return POWER_SUPPLY_TYPE_USB_CDP; + return POWER_SUPPLY_TYPE_USB; if (!strcmp("usb-aca", chargetype)) - return POWER_SUPPLY_TYPE_USB_ACA; + return POWER_SUPPLY_TYPE_USB; } dev_warn(dev, "unknown charger type %s\n", chargetype);