| Message ID | 20200205190028.183069-15-pmalani@chromium.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | None | expand |
On 05/02/2020 11:00:22-0800, Prashant Malani wrote: > Replace cros_ec_cmd_xfer_status() with cros_ec_cmd() which does the > message buffer setup and cleanup. > > Signed-off-by: Prashant Malani <pmalani@chromium.org> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > > Changes in v2: > - Updated to use new function name and parameter list. > > drivers/rtc/rtc-cros-ec.c | 27 ++++++++------------------- > 1 file changed, 8 insertions(+), 19 deletions(-) > > diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c > index f7343c289cab73..6886100ad0b8b7 100644 > --- a/drivers/rtc/rtc-cros-ec.c > +++ b/drivers/rtc/rtc-cros-ec.c > @@ -33,16 +33,11 @@ static int cros_ec_rtc_get(struct cros_ec_device *cros_ec, u32 command, > u32 *response) > { > int ret; > - struct { > - struct cros_ec_command msg; > - struct ec_response_rtc data; > - } __packed msg; > > - memset(&msg, 0, sizeof(msg)); > - msg.msg.command = command; > - msg.msg.insize = sizeof(msg.data); > + struct ec_response_rtc data = {0}; > > - ret = cros_ec_cmd_xfer_status(cros_ec, &msg.msg); > + ret = cros_ec_cmd(cros_ec, 0, command, NULL, 0, &data, sizeof(data), > + NULL); > if (ret < 0) { > dev_err(cros_ec->dev, > "error getting %s from EC: %d\n", > @@ -51,7 +46,7 @@ static int cros_ec_rtc_get(struct cros_ec_device *cros_ec, u32 command, > return ret; > } > > - *response = msg.data.time; > + *response = data.time; > > return 0; > } > @@ -60,17 +55,11 @@ static int cros_ec_rtc_set(struct cros_ec_device *cros_ec, u32 command, > u32 param) > { > int ret = 0; > - struct { > - struct cros_ec_command msg; > - struct ec_response_rtc data; > - } __packed msg; > + struct ec_response_rtc data; > > - memset(&msg, 0, sizeof(msg)); > - msg.msg.command = command; > - msg.msg.outsize = sizeof(msg.data); > - msg.data.time = param; > - > - ret = cros_ec_cmd_xfer_status(cros_ec, &msg.msg); > + data.time = param; > + ret = cros_ec_cmd(cros_ec, 0, command, &data, sizeof(data), NULL, 0, > + NULL); > if (ret < 0) { > dev_err(cros_ec->dev, "error setting %s on EC: %d\n", > command == EC_CMD_RTC_SET_VALUE ? "time" : "alarm", > -- > 2.25.0.341.g760bfbb309-goog >
diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c index f7343c289cab73..6886100ad0b8b7 100644 --- a/drivers/rtc/rtc-cros-ec.c +++ b/drivers/rtc/rtc-cros-ec.c @@ -33,16 +33,11 @@ static int cros_ec_rtc_get(struct cros_ec_device *cros_ec, u32 command, u32 *response) { int ret; - struct { - struct cros_ec_command msg; - struct ec_response_rtc data; - } __packed msg; - memset(&msg, 0, sizeof(msg)); - msg.msg.command = command; - msg.msg.insize = sizeof(msg.data); + struct ec_response_rtc data = {0}; - ret = cros_ec_cmd_xfer_status(cros_ec, &msg.msg); + ret = cros_ec_cmd(cros_ec, 0, command, NULL, 0, &data, sizeof(data), + NULL); if (ret < 0) { dev_err(cros_ec->dev, "error getting %s from EC: %d\n", @@ -51,7 +46,7 @@ static int cros_ec_rtc_get(struct cros_ec_device *cros_ec, u32 command, return ret; } - *response = msg.data.time; + *response = data.time; return 0; } @@ -60,17 +55,11 @@ static int cros_ec_rtc_set(struct cros_ec_device *cros_ec, u32 command, u32 param) { int ret = 0; - struct { - struct cros_ec_command msg; - struct ec_response_rtc data; - } __packed msg; + struct ec_response_rtc data; - memset(&msg, 0, sizeof(msg)); - msg.msg.command = command; - msg.msg.outsize = sizeof(msg.data); - msg.data.time = param; - - ret = cros_ec_cmd_xfer_status(cros_ec, &msg.msg); + data.time = param; + ret = cros_ec_cmd(cros_ec, 0, command, &data, sizeof(data), NULL, 0, + NULL); if (ret < 0) { dev_err(cros_ec->dev, "error setting %s on EC: %d\n", command == EC_CMD_RTC_SET_VALUE ? "time" : "alarm",
Replace cros_ec_cmd_xfer_status() with cros_ec_cmd() which does the message buffer setup and cleanup. Signed-off-by: Prashant Malani <pmalani@chromium.org> --- Changes in v2: - Updated to use new function name and parameter list. drivers/rtc/rtc-cros-ec.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)