charge_state: Delete EC_CMD_CHARGE_CONTROL v1

V1 is superseded by v2. All hosts are using v2 today. This CL deletes
v1.

BUG=b:278898714
TEST=make run-sbs_charging
LOW_COVERAGE_REASON=No new lines are added.

Change-Id: I06e349b76e53a4d8ddc33e5bc4ac57b74ae778a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4828144
Commit-Queue: Daisuke Nojiri <[email protected]>
Tested-by: Daisuke Nojiri <[email protected]>
Reviewed-by: Keith Short <[email protected]>
Auto-Submit: Daisuke Nojiri <[email protected]>
Code-Coverage: Daisuke Nojiri <[email protected]>

Author: dnojiri

common/charge_state.c

@@ -2085,28 +2085,25 @@ charge_command_charge_control(struct host_cmd_handler_args *args)
 	struct ec_response_charge_control *r = args->response;
 	int rv;
 
-	if (args->version >= 2) {
-		if (p->cmd == EC_CHARGE_CONTROL_CMD_SET) {
-			if (p->mode == CHARGE_CONTROL_NORMAL) {
-				rv = battery_sustainer_set(
-					p->sustain_soc.lower,
-					p->sustain_soc.upper);
-				if (rv == EC_RES_UNAVAILABLE)
-					return EC_RES_UNAVAILABLE;
-				if (rv)
-					return EC_RES_INVALID_PARAM;
-			} else {
-				battery_sustainer_disable();
-			}
-		} else if (p->cmd == EC_CHARGE_CONTROL_CMD_GET) {
-			r->mode = get_chg_ctrl_mode();
-			r->sustain_soc.lower = sustain_soc.lower;
-			r->sustain_soc.upper = sustain_soc.upper;
-			args->response_size = sizeof(*r);
-			return EC_RES_SUCCESS;
+	if (p->cmd == EC_CHARGE_CONTROL_CMD_SET) {
+		if (p->mode == CHARGE_CONTROL_NORMAL) {
+			rv = battery_sustainer_set(p->sustain_soc.lower,
+						   p->sustain_soc.upper);
+			if (rv == EC_RES_UNAVAILABLE)
+				return EC_RES_UNAVAILABLE;
+			if (rv)
+				return EC_RES_INVALID_PARAM;
 		} else {
-			return EC_RES_INVALID_PARAM;
+			battery_sustainer_disable();
 		}
+	} else if (p->cmd == EC_CHARGE_CONTROL_CMD_GET) {
+		r->mode = get_chg_ctrl_mode();
+		r->sustain_soc.lower = sustain_soc.lower;
+		r->sustain_soc.upper = sustain_soc.upper;
+		args->response_size = sizeof(*r);
+		return EC_RES_SUCCESS;
+	} else {
+		return EC_RES_INVALID_PARAM;
 	}
 
 	rv = set_chg_ctrl_mode(p->mode);
@@ -2116,7 +2113,7 @@ charge_command_charge_control(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 DECLARE_HOST_COMMAND(EC_CMD_CHARGE_CONTROL, charge_command_charge_control,
-		     EC_VER_MASK(1) | EC_VER_MASK(2));
+		     EC_VER_MASK(2));
 
 static enum ec_status
 charge_command_current_limit(struct host_cmd_handler_args *args)

util/ectool.cc

@@ -7666,15 +7666,14 @@ int cmd_charge_control(int argc, char *argv[])
 	char *e;
 	int rv;
 
-	if (!ec_cmd_version_supported(EC_CMD_CHARGE_CONTROL, 2))
-		version = 1;
+	if (!ec_cmd_version_supported(EC_CMD_CHARGE_CONTROL, 2)) {
+		fprintf(stderr,
+			"EC doesn't support V2+ of charge control command.\n"
+			"Consider firmware update.\n");
+		return -1;
+	}
 
 	if (argc == 1) {
-		if (version < 2) {
-			cmd_charge_control_help(argv[0],
-						"Old EC doesn't support GET.");
-			return -1;
-		}
 		p.cmd = EC_CHARGE_CONTROL_CMD_GET;
 		rv = ec_command(EC_CMD_CHARGE_CONTROL, version, &p, sizeof(p),
 				&r, sizeof(r));
@@ -7703,12 +7702,6 @@ int cmd_charge_control(int argc, char *argv[])
 			p.sustain_soc.lower = -1;
 			p.sustain_soc.upper = -1;
 		} else if (argc == 4) {
-			if (version < 2) {
-				cmd_charge_control_help(
-					argv[0],
-					"Old EC doesn't support sustainer.");
-				return -1;
-			}
 			p.sustain_soc.lower = strtol(argv[2], &e, 0);
 			if (e && *e) {
 				cmd_charge_control_help(