kernel:tro(CR) remove small charger
authorxuwei9 <xuwei9@lenovo.com>
Thu, 25 Apr 2019 04:29:25 +0000 (12:29 +0800)
committerlingsen1 <lingsen1@lenovo.com>
Sun, 7 Feb 2021 09:37:02 +0000 (17:37 +0800)
tro(CR) remove small
charger

Change-Id: Ib28693ebc3e6bfbd08c4917915a18b3d0ff0c3a7
Signed-off-by: xuwei9 <xuwei9@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1342502
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key

drivers/power/supply/s2mu00x_battery.c

index 866b19b688bb2edccb751ac58e4ebdc8a79b6755..0498a7f4a155589227a35bdff38bdbe4b07d7935 100644 (file)
@@ -3909,7 +3909,7 @@ static void set_max_allowed_current_ma(struct s2mu00x_battery_info *chip,
               chip->temp_allowed_fastchg_current_ma,
               chip->target_fastchg_current_ma);
 }
-
+#if defined(CONFIG_SMALL_CHARGER)
 static int set_property_on_smallcharger(struct s2mu00x_battery_info *chip,
                enum power_supply_property prop, int val)
 {
@@ -3935,6 +3935,7 @@ static int set_property_on_smallcharger(struct s2mu00x_battery_info *chip,
 
        return rc;
 }
+#endif
 
 #define HEARTBEAT_DELAY_MS 30000
 #define HEARTBEAT_HOLDOFF_MS 10000
@@ -4364,8 +4365,9 @@ static int s2mu00x_battery_probe(struct platform_device *pdev)
        battery->input_current = 0;
        battery->charging_current = 0;
        battery->topoff_current = 0;
+#if defined(CONFIG_SMALL_CHARGER)
        battery->small_input_flag = 0;
-
+#endif
        battery->max_input_current = battery->pdata->max_input_current;
        battery->max_charging_current = battery->pdata->max_charging_current;
 #if defined(CONFIG_USE_CCIC)