From 4b1cef88f28e4fd66895c164af2b7c3717fbaeed Mon Sep 17 00:00:00 2001 From: mahj8 Date: Thu, 24 Mar 2022 09:54:34 +0800 Subject: [PATCH] charging: delete redundant code delete redundant code for compatible with multiple charger pump charging solution Change-Id: Id5b779b4ab4a6c3c9656432b3b63b57cfdbff8cb Signed-off-by: mahj8 Reviewed-on: https://gerrit.mot.com/2224637 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../mmi_discrete_turbo_charger/mmi_charger_core.c | 12 +----------- .../mmi_discrete_turbo_charger/mmi_charger_core.h | 2 -- .../mmi_discrete_turbo_charger/qpnp_pmic_charger.c | 9 ++------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.c b/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.c index 6ef64744a0e2..e1053233892f 100644 --- a/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.c +++ b/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.c @@ -1612,11 +1612,7 @@ static int mmi_chrg_manager_probe(struct platform_device *pdev) chip->name = "mmi_chrg_manager"; chip->debug_mask = &__debug_mask; chip->suspended = false; - chip->qcom_psy = power_supply_get_by_name("mmi_battery"); - if (!chip->qcom_psy) { - mmi_chrg_err(chip, "Could not get mmi_battery power_supply\n"); - return -EPROBE_DEFER; - } + chip->batt_psy = power_supply_get_by_name("battery"); if (!chip->batt_psy) { mmi_chrg_err(chip, "Could not get battery power_supply\n"); @@ -1635,12 +1631,6 @@ static int mmi_chrg_manager_probe(struct platform_device *pdev) return -EPROBE_DEFER; } - chip->cp_psy = power_supply_get_by_name("cp-standalone"); - if (!chip->cp_psy) { - mmi_chrg_err(chip, "Could not get charger power_supply\n"); - return -EPROBE_DEFER; - } - chip->usb_psy = power_supply_get_by_name("usb"); if (!chip->usb_psy) { mmi_chrg_err(chip, "Could not get USB power_supply\n"); diff --git a/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.h b/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.h index 97c39513545b..dd13cfd3b8a1 100644 --- a/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.h +++ b/drivers/power/mmi_discrete_turbo_charger/mmi_charger_core.h @@ -183,7 +183,6 @@ struct mmi_charger_manager { const char *name; struct device *dev; struct power_supply *batt_psy; - struct power_supply *qcom_psy; struct power_supply *usb_psy; struct power_supply *mmi_chrg_mgr_psy; struct usbpd *pd_handle; @@ -291,7 +290,6 @@ struct mmi_charger_manager { int qc3p_volt_max; struct power_supply *bms_psy; struct power_supply *charger_psy; - struct power_supply *cp_psy; }; #define PPS_INIT_VOLT_COMP 500000 diff --git a/drivers/power/mmi_discrete_turbo_charger/qpnp_pmic_charger.c b/drivers/power/mmi_discrete_turbo_charger/qpnp_pmic_charger.c index 5ba953223360..340ba4e3730a 100644 --- a/drivers/power/mmi_discrete_turbo_charger/qpnp_pmic_charger.c +++ b/drivers/power/mmi_discrete_turbo_charger/qpnp_pmic_charger.c @@ -174,9 +174,6 @@ static int qpnp_pmic_update_charger_status(struct mmi_charger_device *chrg) if (!chip->usb_psy) return -ENODEV; - if (!chip->cp_psy) - return -ENODEV; - rc = power_supply_get_property(chrg->chrg_psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &prop); if (!rc) @@ -197,10 +194,8 @@ static int qpnp_pmic_update_charger_status(struct mmi_charger_device *chrg) if (!rc) chrg->charger_data.vbus_volt = prop.intval; - rc = power_supply_get_property(chip->cp_psy, - POWER_SUPPLY_PROP_CURRENT_NOW, &prop); - if (!rc) - chrg->charger_data.ibus_curr = CP_ENABLED_MAIN_INPUT_LIMIT; + /*main charger of discrete IC don't support detecting input current.*/ + chrg->charger_data.ibus_curr = CP_ENABLED_MAIN_INPUT_LIMIT; rc = power_supply_get_property(chip->usb_psy, POWER_SUPPLY_PROP_PRESENT, &prop);