diff --git a/drivers/power/mmi-smbcharger-iio/mmi-smbcharger-iio.c b/drivers/power/mmi-smbcharger-iio/mmi-smbcharger-iio.c index 51bbb18d6238..9ee218b9d06e 100755 --- a/drivers/power/mmi-smbcharger-iio/mmi-smbcharger-iio.c +++ b/drivers/power/mmi-smbcharger-iio/mmi-smbcharger-iio.c @@ -371,7 +371,6 @@ struct smb_mmi_charger { int max_chrg_temp; int last_iusb_ua; bool factory_kill_armed; - int gen_log_rate_s; bool demo_mode_usb_suspend; unsigned long flags; @@ -1486,17 +1485,12 @@ static void mmi_charger_power_support(struct smb_mmi_charger *chg) static enum power_supply_property smb_mmi_battery_props[] = { POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_CURRENT_MAX, - /*MMI_STOPSHIP: PMIC: change by IIO*/ - //POWER_SUPPLY_PROP_UPDATE_NOW, - //POWER_SUPPLY_PROP_USB_OTG, }; static int smb_mmi_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) { - //struct smb_mmi_charger *chip = power_supply_get_drvdata(psy); - switch (psp) { case POWER_SUPPLY_PROP_PRESENT: val->intval = 1; @@ -1504,17 +1498,6 @@ static int smb_mmi_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_CURRENT_MAX: val->intval = -EINVAL; break; - /*case POWER_SUPPLY_PROP_UPDATE_NOW: - val->intval = chip->gen_log_rate_s; - break; - case POWER_SUPPLY_PROP_USB_OTG: - if (chip->vbus && - regulator_is_enabled(chip->vbus) && - chip->vbus_enabled) - val->intval = 1; - else - val->intval = 0; - break;*/ default: return -EINVAL; } @@ -1548,36 +1531,6 @@ static int smb_mmi_set_property(struct power_supply *psy, mmi_err(chip, "Couldn't set USBIN_CMD_ICL_OVERRIDE rc=%d\n", rc); break; - /*case POWER_SUPPLY_PROP_UPDATE_NOW: - chip->gen_log_rate_s = val->intval; - power_supply_changed(psy); - break; - case POWER_SUPPLY_PROP_USB_OTG: - if (!chip->vbus) { - chip->vbus = devm_regulator_get(chip->dev, "vbus"); - if (IS_ERR(chip->vbus)) { - mmi_err(chip, "Unable to get vbus\n"); - return -EINVAL; - } - } - - if (val->intval) { - rc = regulator_enable(chip->vbus); - mmi_info(chip, "VBUS Enable\n"); - } else if (chip->vbus_enabled) { - rc = regulator_disable(chip->vbus); - mmi_info(chip, "VBUS Disable\n"); - } - - if (rc) - mmi_err(chip, "Unable to %s vbus (%d)\n", - val->intval ? "enable" : "disable", rc); - else if (val->intval) - chip->vbus_enabled = true; - else - chip->vbus_enabled = false; - - break;*/ default: rc = -EINVAL; }