Merge "power: qpnp-smbcharger: Remove current limit vote on charger removal"

	if (!chip->skip_usb_notification)

		power_supply_set_supply_type(chip->usb_psy, type);

	/* otherwise if it is unknown, set type after the vote */

	if (type == POWER_SUPPLY_TYPE_UNKNOWN)

	/*

	 * otherwise if it is unknown, remove vote

	 * and set type after the vote

	 */

	if (type == POWER_SUPPLY_TYPE_UNKNOWN) {

		rc = vote(chip->usb_icl_votable, PSY_ICL_VOTER, false,

				current_limit_ma);

		if (rc < 0)

			pr_err("Couldn't remove ICL vote rc=%d\n", rc);

		chip->usb_supply_type = type;

	}

	/* set the correct buck switching frequency */

	rc = smbchg_set_optimal_charging_mode(chip, type);